Cleanup

.gitignore

@@ -1,2 +1,5 @@
 glob.iml
 .idea
+*.cpu
+*.mem
+*.test

match/any.go

@@ -39,10 +39,6 @@ func (self Any) Len() int {
 	return lenNo
 }
 
-func (self Any) Kind() Kind {
-	return KindAny
-}
-
 func (self Any) String() string {
 	return fmt.Sprintf("<any:![%s]>", self.Separators)
 }

match/any_of.go

@@ -79,10 +79,6 @@ func (self AnyOf) Len() (l int) {
 	return
 }
 
-func (self AnyOf) Kind() Kind {
-	return KindAnyOf
-}
-
 func (self AnyOf) String() string {
 	return fmt.Sprintf("<any_of:[%s]>", self.Matchers)
 }

match/btree.go

@@ -42,10 +42,6 @@ func NewBTree(Value, Left, Right Matcher) (tree BTree) {
 	return tree
 }
 
-func (self BTree) Kind() Kind {
-	return KindBTree
-}
-
 func (self BTree) Len() int {
 	return self.Length
 }

match/contains.go

@@ -56,10 +56,6 @@ func (self Contains) Len() int {
 	return lenNo
 }
 
-func (self Contains) Kind() Kind {
-	return KindContains
-}
-
 func (self Contains) String() string {
 	var not string
 	if self.Not {

match/every_of.go

@@ -74,10 +74,6 @@ func (self EveryOf) Match(s string) bool {
 	return true
 }
 
-func (self EveryOf) Kind() Kind {
-	return KindEveryOf
-}
-
 func (self EveryOf) String() string {
 	return fmt.Sprintf("<every_of:[%s]>", self.Matchers)
 }

match/list.go

@@ -11,10 +11,6 @@ type List struct {
 	Not  bool
 }
 
-func (self List) Kind() Kind {
-	return KindList
-}
-
 func (self List) Match(s string) bool {
 	inList := strings.Index(self.List, s) != -1
 	return inList == !self.Not

match/match.go

@@ -5,28 +5,6 @@ import (
 	"strings"
 )
 
-type Kind int
-
-// todo use String for Kind, and self.Kind() in every matcher.String()
-const (
-	KindRaw Kind = iota
-	KindEveryOf
-	KindAnyOf
-	KindAny
-	KindSuper
-	KindSingle
-	KindComposition
-	KindPrefix
-	KindSuffix
-	KindPrefixSuffix
-	KindRange
-	KindList
-	KindMin
-	KindMax
-	KindBTree
-	KindContains
-)
-
 const lenOne = 1
 const lenNo = -1
 

match/max.go

@@ -44,14 +44,6 @@ func (self Max) Len() int {
 	return lenNo
 }
 
-func (self Max) Search(s string) (int, int, bool) {
-	return 0, 0, false
-}
-
-func (self Max) Kind() Kind {
-	return KindMax
-}
-
 func (self Max) String() string {
 	return fmt.Sprintf("<max:%d>", self.Limit)
 }

match/min.go

@@ -44,14 +44,6 @@ func (self Min) Len() int {
 	return lenNo
 }
 
-func (self Min) Search(s string) (int, int, bool) {
-	return 0, 0, false
-}
-
-func (self Min) Kind() Kind {
-	return KindMin
-}
-
 func (self Min) String() string {
 	return fmt.Sprintf("<min:%d>", self.Limit)
 }

match/prefix.go

@@ -10,10 +10,6 @@ type Prefix struct {
 	Prefix string
 }
 
-func (self Prefix) Kind() Kind {
-	return KindPrefix
-}
-
 func (self Prefix) Index(s string) (int, []int) {
 	idx := strings.Index(s, self.Prefix)
 	if idx == -1 {
@@ -41,14 +37,6 @@ func (self Prefix) Len() int {
 	return lenNo
 }
 
-func (self Prefix) Search(s string) (i int, l int, ok bool) {
-	if self.Match(s) {
-		return 0, len(s), true
-	}
-
-	return
-}
-
 func (self Prefix) Match(s string) bool {
 	return strings.HasPrefix(s, self.Prefix)
 }

match/prefix_suffix.go

@@ -9,10 +9,6 @@ type PrefixSuffix struct {
 	Prefix, Suffix string
 }
 
-func (self PrefixSuffix) Kind() Kind {
-	return KindPrefixSuffix
-}
-
 func (self PrefixSuffix) Index(s string) (int, []int) {
 	prefixIdx := strings.Index(s, self.Prefix)
 	if prefixIdx == -1 {
@@ -47,14 +43,6 @@ func (self PrefixSuffix) Len() int {
 	return lenNo
 }
 
-func (self PrefixSuffix) Search(s string) (i int, l int, ok bool) {
-	if self.Match(s) {
-		return 0, len(s), true
-	}
-
-	return
-}
-
 func (self PrefixSuffix) Match(s string) bool {
 	return strings.HasPrefix(s, self.Prefix) && strings.HasSuffix(s, self.Suffix)
 }

match/range.go

@@ -10,10 +10,6 @@ type Range struct {
 	Not    bool
 }
 
-func (self Range) Kind() Kind {
-	return KindRange
-}
-
 func (self Range) Len() int {
 	return lenOne
 }

match/raw.go

@@ -27,10 +27,6 @@ func (self Raw) Len() int {
 	return self.Length
 }
 
-func (self Raw) Kind() Kind {
-	return KindRaw
-}
-
 func (self Raw) Index(s string) (index int, segments []int) {
 	index = strings.Index(s, self.Str)
 	if index == -1 {

match/row.go

@@ -57,10 +57,6 @@ func (self Row) Index(s string) (int, []int) {
 	return -1, nil
 }
 
-func (self Row) Kind() Kind {
-	return KindMin
-}
-
 func (self Row) String() string {
 	return fmt.Sprintf("<row_%d:[%s]>", self.Length, self.Matchers)
 }

match/single.go

@@ -29,10 +29,6 @@ func (self Single) Index(s string) (int, []int) {
 	return -1, nil
 }
 
-func (self Single) Kind() Kind {
-	return KindSingle
-}
-
 func (self Single) String() string {
 	return fmt.Sprintf("<single:![%s]>", self.Separators)
 }

match/suffix.go

@@ -9,10 +9,6 @@ type Suffix struct {
 	Suffix string
 }
 
-func (self Suffix) Kind() Kind {
-	return KindSuffix
-}
-
 func (self Suffix) Index(s string) (int, []int) {
 	idx := strings.Index(s, self.Suffix)
 	if idx == -1 {
@@ -26,14 +22,6 @@ func (self Suffix) Len() int {
 	return lenNo
 }
 
-func (self Suffix) Search(s string) (i int, l int, ok bool) {
-	if self.Match(s) {
-		return 0, len(s), true
-	}
-
-	return
-}
-
 func (self Suffix) Match(s string) bool {
 	return strings.HasSuffix(s, self.Suffix)
 }

match/super.go

@@ -26,10 +26,6 @@ func (self Super) Index(s string) (int, []int) {
 	return 0, segments
 }
 
-func (self Super) Kind() Kind {
-	return KindSuper
-}
-
 func (self Super) String() string {
 	return fmt.Sprintf("<super>")
 }