refactoring

scramble-suit · May 30, 2016 · 510a175 · 510a175
1 parent 2d73328
commit 510a175
Show file tree

Hide file tree

Showing 16 changed files with 1,184 additions and 1,171 deletions.
diff --git a/compiler.go → compiler/compiler.go b/compiler.go → compiler/compiler.go
diff --git a/compiler/compiler_test.go b/compiler/compiler_test.go
diff --git a/compiler_test.go b/compiler_test.go
diff --git a/glob.go b/glob.go
@@ -1,5 +1,10 @@
 package glob
 
+import (
+	"github.com/gobwas/glob/parser"
+	"github.com/gobwas/glob/syntax"
+)
+
 // Glob represents compiled glob pattern.
 type Glob interface {
 	Match(string) bool
@@ -32,7 +37,7 @@ type Glob interface {
 //                    comma-separated (without spaces) patterns
 //
 func Compile(pattern string, separators ...rune) (Glob, error) {
-	ast, err := parse(newLexer(pattern))
+	ast, err := syntax.Parse(pattern)
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +68,7 @@ func QuoteMeta(s string) string {
 	// a byte loop is correct because all meta characters are ASCII
 	j := 0
 	for i := 0; i < len(s); i++ {
-		if special(s[i]) {
+		if syntax.Special(s[i]) {
 			b[j] = '\\'
 			j++
 		}

diff --git a/match/any.go b/match/any.go
@@ -2,7 +2,7 @@ package match
 
 import (
 	"fmt"
-	"github.com/gobwas/glob/strings"
+	"github.com/gobwas/glob/util/strings"
 )
 
 type Any struct {

diff --git a/match/list.go b/match/list.go
@@ -2,7 +2,7 @@ package match
 
 import (
 	"fmt"
-	"github.com/gobwas/glob/runes"
+	"github.com/gobwas/glob/util/runes"
 	"unicode/utf8"
 )
 

diff --git a/match/single.go b/match/single.go
@@ -2,7 +2,7 @@ package match
 
 import (
 	"fmt"
-	"github.com/gobwas/glob/runes"
+	"github.com/gobwas/glob/util/runes"
 	"unicode/utf8"
 )
 

diff --git a/parser/ast.go b/parser/ast.go