parser/parser.y: S/R conflicts 1->0.

liqingrikeiikyeong · Sep 11, 2015 · ee84db6 · ee84db6
1 parent 00ba6dc
commit ee84db6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/parser/parser.y b/parser/parser.y
@@ -493,6 +493,8 @@ import (
 %precedence '('
 %precedence lowerThanQuick
 %precedence quick
+%precedence lowerThanComma
+%precedence ','
 
 %start	Start
 
@@ -1047,7 +1049,7 @@ CreateSpecificationList:
  *      )
  *******************************************************************/
 CreateTableStmt:
-	"CREATE" "TABLE" IfNotExists TableIdent '(' TableElementListOpt ')' TableOptListOpt CommaOpt
+	"CREATE" "TABLE" IfNotExists TableIdent '(' TableElementListOpt ')' TableOptListOpt
 	{
 		tes := $6.([]interface {})
 		var columnDefs []*coldef.ColumnDef
@@ -2841,7 +2843,7 @@ TableOptListOpt:
 	{
 		$$ = []*coldef.TableOpt{}
 	}
-|	TableOptList
+|	TableOptList %prec lowerThanComma
 
 TableOptList:
 	TableOpt