added tests for nextEnd method

store.go

@@ -121,7 +121,7 @@ func lookupNextToken(in string, offset int, parent *node, res *[]Token, numParam
 			// -- -- {END}
 
 			if offset+child.Token.Len <= len(in) {
-				if nextEnd(in, offset, child) && offset+child.Token.Len != len(in) {
+				if child.nextEnd() && offset+child.Token.Len != len(in) {
 					continue
 				}
 				if in[offset:offset+child.Token.Len] == child.Token.Raw {
@@ -223,13 +223,6 @@ func rightPath(in string, offset int, node *node) (*node, int) {
 	return nil, 0
 }
 
-func nextEnd(in string, offset int, node *node) bool {
-	if len(node.Childs) != 1 {
-		return false
-	}
-	return node.Childs[0].Token.Mode == END
-}
-
 // TODO: cover with tests as the tree is filled
 func appendChild(parent *node, i int, tokens []Token) {
 	if i >= len(tokens) {
@@ -299,6 +292,13 @@ func (n *node) lengthConstOrZero() int {
 	return len(n.Token.Raw)
 }
 
+func (n *node) nextEnd() bool {
+	if len(n.Childs) != 1 {
+		return false
+	}
+	return n.Childs[0].Token.Mode == END
+}
+
 // Less returns true if
 // - left token type is CONST
 // - more length of value of token (type is CONST) on the left than right

store_test.go

@@ -301,3 +301,16 @@ func Test_PatternWithSeparator(t *testing.T) {
 		t.Log(params)
 	})
 }
+
+func Test_nextEnd(t *testing.T) {
+	n := &node{}
+	assert.False(t, n.nextEnd())
+	n = &node{Childs: []*node{{Token: ConstToken("!")}}}
+	assert.False(t, n.nextEnd())
+	n = &node{Childs: []*node{{Token: SeparatorToken("a")}}}
+	assert.False(t, n.nextEnd())
+	n = &node{Childs: []*node{{Token: EndToken}}}
+	assert.True(t, n.nextEnd())
+	n = &node{Childs: []*node{{Token: NamedEndToken("abc")}}}
+	assert.True(t, n.nextEnd())
+}