clean parser

Author: lighttiger2505

parser/parser.go

@@ -20,11 +20,13 @@ type (
 func parsePrefixGroup(reader *astutil.NodeReader, matcher astutil.NodeMatcher, fn prefixParseFn) ast.TokenList {
 	var replaceNodes []ast.Node
 	for reader.NextNode(false) {
+		if list, ok := reader.CurNode.(ast.TokenList); ok {
+			newReader := astutil.NewNodeReader(list)
+			replaceNode := parsePrefixGroup(newReader, matcher, fn)
+			reader.Replace(replaceNode, reader.Index-1)
+		}
 		if reader.CurNodeIs(matcher) {
 			replaceNodes = append(replaceNodes, fn(reader))
-		} else if list, ok := reader.CurNode.(ast.TokenList); ok {
-			newReader := astutil.NewNodeReader(list)
-			replaceNodes = append(replaceNodes, parsePrefixGroup(newReader, matcher, fn))
 		} else {
 			replaceNodes = append(replaceNodes, reader.CurNode)
 		}
@@ -36,11 +38,13 @@ func parsePrefixGroup(reader *astutil.NodeReader, matcher astutil.NodeMatcher, f
 func parseInfixGroup(reader *astutil.NodeReader, matcher astutil.NodeMatcher, ignoreWhiteSpace bool, fn infixParseFn) ast.TokenList {
 	var replaceNodes []ast.Node
 	for reader.NextNode(false) {
+		if list, ok := reader.CurNode.(ast.TokenList); ok {
+			newReader := astutil.NewNodeReader(list)
+			replaceNode := parseInfixGroup(newReader, matcher, ignoreWhiteSpace, fn)
+			reader.Replace(replaceNode, reader.Index-1)
+		}
 		if reader.PeekNodeIs(ignoreWhiteSpace, matcher) {
 			replaceNodes = append(replaceNodes, fn(reader))
-		} else if list, ok := reader.CurNode.(ast.TokenList); ok {
-			newReader := astutil.NewNodeReader(list)
-			replaceNodes = append(replaceNodes, parseInfixGroup(newReader, matcher, ignoreWhiteSpace, fn))
 		} else {
 			replaceNodes = append(replaceNodes, reader.CurNode)
 		}
@@ -480,15 +484,6 @@ var aliasRecursionMatcher = astutil.NodeMatcher{
 }
 
 func parseAliasedWithoutAs(reader *astutil.NodeReader) ast.Node {
-	if reader.CurNodeIs(aliasRecursionMatcher) {
-		if list, ok := reader.CurNode.(ast.TokenList); ok {
-			// FIXME: more simplity
-			// For sub query
-			parenthesis := parsePrefixGroup(astutil.NewNodeReader(list), aliasLeftMatcher, parseAliasedWithoutAs)
-			reader.Replace(parenthesis, reader.Index-1)
-		}
-	}
-
 	if !reader.PeekNodeIs(true, aliasRightMatcher) {
 		return reader.CurNode
 	}
@@ -510,14 +505,6 @@ func parseAliased(reader *astutil.NodeReader) ast.Node {
 	if !reader.CurNodeIs(aliasLeftMatcher) {
 		return reader.CurNode
 	}
-	if reader.CurNodeIs(aliasRecursionMatcher) {
-		if list, ok := reader.CurNode.(ast.TokenList); ok {
-			// FIXME: more simplity
-			// For sub query
-			parenthesis := parseInfixGroup(astutil.NewNodeReader(list), aliasInfixMatcher, true, parseAliased)
-			reader.Replace(parenthesis, reader.Index-1)
-		}
-	}
 
 	realName := reader.CurNode
 	_, as := reader.PeekNode(true)
@@ -657,8 +644,6 @@ func parseExpressionInParenthesis(reader *astutil.NodeReader) ast.Node {
 	if list, ok := reader.CurNode.(ast.TokenList); ok {
 		list = parseInfixGroup(astutil.NewNodeReader(list), operatorInfixMatcher, true, parseOperator)
 		list = parseInfixGroup(astutil.NewNodeReader(list), comparisonInfixMatcher, true, parseComparison)
-		list = parseInfixGroup(astutil.NewNodeReader(list), aliasInfixMatcher, true, parseAliased)
-		list = parseInfixGroup(astutil.NewNodeReader(list), identifierListInfixMatcher, true, parseIdentifierList)
 		return list
 	}
 	return reader.CurNode

parser/parser_test.go

@@ -1066,11 +1066,17 @@ func TestParseIdentifierList(t *testing.T) {
 			checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
 				testStatement(t, stmts[0], 4, input)
 				list := stmts[0].GetTokens()
-				testParenthesis(t, list[0], "(foo, bar, foobar)")
-				parenthesis := list[0].(*ast.Parenthesis)
-				tokens := parenthesis.Inner().GetTokens()
-				testIdentifierList(t, tokens[0], "foo, bar, foobar")
-				// il := testIdentifierList(t, tokens[0], "foo, bar, foobar")
+
+				parenthesis1 := testParenthesis(t, list[0], "(foo, bar, foobar)")
+				tokens1 := parenthesis1.Inner().GetTokens()
+				testIdentifierList(t, tokens1[0], "foo, bar, foobar")
+
+				testItem(t, list[1], ",")
+				testItem(t, list[2], " ")
+
+				parenthesis2 := testParenthesis(t, list[3], "(fooo, barr, fooobarr)")
+				tokens2 := parenthesis2.Inner().GetTokens()
+				testIdentifierList(t, tokens2[0], "fooo, barr, fooobarr")
 			},
 		},
 		{