Remove unneeded action.

bmomjian · bmomjian · commit ecba5d308ca9 · 1999-12-10T05:17:13.000Z
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.119 1999/12/10 03:55:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.120 1999/12/10 05:17:13 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -246,7 +246,7 @@ static Node *doNegate(Node *n);
 %type <str>		TypeId
 
 %type <node>	TableConstraint
-%type <list>	ColPrimaryKey, ColQualList, ColQualifier
+%type <list>	ColPrimaryKey, ColQualifier
 %type <node>	ColConstraint, ColConstraintElem
 %type <ival>	key_actions, key_action, key_reference
 %type <str>		key_match
@@ -939,24 +939,14 @@ columnDef:  ColId Typename ColQualifier
 				}
 		;
 
-ColQualifier:  ColQualList						{ $$ = $1; }
-			| /*EMPTY*/							{ $$ = NULL; }
-		;
-
-ColQualList:  ColQualList ColConstraint
+ColQualifier:  ColQualifier ColConstraint
 				{
 					if ($2 != NULL)
 						$$ = lappend($1, $2);
 					else
 						$$ = $1;
 				}
-			| ColConstraint
-				{
-					if ($1 != NULL)
-						$$ = lcons($1, NIL);
-					else
-						$$ = NULL;
-				}
+			| /*EMPTY*/							{ $$ = NULL; }
 		;
 
 ColPrimaryKey:  PRIMARY KEY

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.119 1999/12/10 03:55:54 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.120 1999/12/10 05:17:13 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHOR DATE MAJOR EVENT`
`@@ -246,7 +246,7 @@ static Node doNegate(Node n);`
`246`	`246`	`%type <str> TypeId`
`247`	`247`
`248`	`248`	`%type <node> TableConstraint`
`249`		`-%type <list> ColPrimaryKey, ColQualList, ColQualifier`
	`249`	`+%type <list> ColPrimaryKey, ColQualifier`
`250`	`250`	`%type <node> ColConstraint, ColConstraintElem`
`251`	`251`	`%type <ival> key_actions, key_action, key_reference`
`252`	`252`	`%type <str> key_match`
`@@ -939,24 +939,14 @@ columnDef: ColId Typename ColQualifier`
`939`	`939`	`}`
`940`	`940`	`;`
`941`	`941`
`942`		`-ColQualifier: ColQualList { $$ = $1; }`
`943`		`- \| /EMPTY/ { $$ = NULL; }`
`944`		`- ;`
`945`		`-`
`946`		`-ColQualList: ColQualList ColConstraint`
	`942`	`+ColQualifier: ColQualifier ColConstraint`
`947`	`943`	`{`
`948`	`944`	`if ($2 != NULL)`
`949`	`945`	`$$ = lappend($1, $2);`
`950`	`946`	`else`
`951`	`947`	`$$ = $1;`
`952`	`948`	`}`
`953`		`- \| ColConstraint`
`954`		`- {`
`955`		`- if ($1 != NULL)`
`956`		`- $$ = lcons($1, NIL);`
`957`		`- else`
`958`		`- $$ = NULL;`
`959`		`- }`
	`949`	`+ \| /EMPTY/ { $$ = NULL; }`
`960`	`950`	`;`
`961`	`951`
`962`	`952`	`ColPrimaryKey: PRIMARY KEY`