Fix compile after COMMENT problem.

bmomjian · bmomjian · commit d426869b8979 · 1999-10-26T16:32:46.000Z
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.19 1999/10/26 03:12:34 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.20 1999/10/26 16:32:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,6 +33,9 @@ SUBSYS.o: $(OBJS)
 
 comment.o: ../parse.h
 
+../parse.h:
+	$(MAKE) -C .. parse.h
+
 depend dep:
 	$(CC) -MM $(CFLAGS) *.c >depend
 
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.110 1999/10/26 03:12:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.111 1999/10/26 16:32:46 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -242,7 +242,7 @@ Oid	param_type(int t); /* used in parse_expr.c */
 %type <boolean>	opt_varying, opt_timezone
 
 %type <ival>	Iconst
-%type <str>		Sconst
+%type <str>		Sconst, comment_text
 %type <str>		UserId, var_value, zone_value
 %type <str>		ColId, ColLabel
 %type <str>		TypeId
@@ -1554,7 +1554,7 @@ TruncateStmt:  TRUNCATE TABLE relation_name
  *
  *****************************************************************************/
  
-CommentStmt:	COMMENT ON comment_type name IS Sconst
+CommentStmt:	COMMENT ON comment_type name IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1564,7 +1564,7 @@ CommentStmt:	COMMENT ON comment_type name IS Sconst
 				n->comment = $6;
 				$$ = (Node *) n;
 			}
-		| COMMENT ON comment_cl relation_name '.' attr_name IS Sconst
+		| COMMENT ON comment_cl relation_name '.' attr_name IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1574,7 +1574,7 @@ CommentStmt:	COMMENT ON comment_type name IS Sconst
 				n->comment = $8;
 				$$ = (Node *) n;
 			}
-		| COMMENT ON comment_ag name aggr_argtype IS Sconst
+		| COMMENT ON comment_ag name aggr_argtype IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1584,7 +1584,7 @@ CommentStmt:	COMMENT ON comment_type name IS Sconst
 				n->comment = $7;
 				$$ = (Node *) n;
 			}
-		| COMMENT ON comment_fn func_name func_args IS Sconst
+		| COMMENT ON comment_fn func_name func_args IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1594,7 +1594,7 @@ CommentStmt:	COMMENT ON comment_type name IS Sconst
 				n->comment = $7;
 				$$ = (Node *) n;
 			}
-		| COMMENT ON comment_op all_Op '(' oper_argtypes ')' IS Sconst
+		| COMMENT ON comment_op all_Op '(' oper_argtypes ')' IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1604,7 +1604,7 @@ CommentStmt:	COMMENT ON comment_type name IS Sconst
 				n->comment = $9;
 				$$ = (Node *) n;
 			}
-		| COMMENT ON comment_tg name ON relation_name IS Sconst
+		| COMMENT ON comment_tg name ON relation_name IS comment_text
 			{
 				CommentStmt *n = makeNode(CommentStmt);
 				n->objtype = $3;
@@ -1638,8 +1638,12 @@ comment_op:	OPERATOR { $$ = OPERATOR; }
 		;
 
 comment_tg:	TRIGGER { $$ = TRIGGER; }
-		;
+		; 
 
+comment_text:	Sconst { $$ = $1; }
+		| NULL_P { $$ = 0; }
+		;
+		
 /*****************************************************************************
  *
  *		QUERY:

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for commands`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.19 1999/10/26 03:12:34 momjian Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.20 1999/10/26 16:32:46 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -33,6 +33,9 @@ SUBSYS.o: $(OBJS)`
`33`	`33`
`34`	`34`	`comment.o: ../parse.h`
`35`	`35`
	`36`	`+../parse.h:`
	`37`	`+ $(MAKE) -C .. parse.h`
	`38`	`+`
`36`	`39`	`depend dep:`
`37`	`40`	`$(CC) -MM $(CFLAGS) *.c >depend`
`38`	`41`
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.110 1999/10/26 03:12:34 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.111 1999/10/26 16:32:46 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHOR DATE MAJOR EVENT`
`@@ -242,7 +242,7 @@ Oid param_type(int t); /* used in parse_expr.c */`
`242`	`242`	`%type <boolean> opt_varying, opt_timezone`
`243`	`243`
`244`	`244`	`%type <ival> Iconst`
`245`		`-%type <str> Sconst`
	`245`	`+%type <str> Sconst, comment_text`
`246`	`246`	`%type <str> UserId, var_value, zone_value`
`247`	`247`	`%type <str> ColId, ColLabel`
`248`	`248`	`%type <str> TypeId`
`@@ -1554,7 +1554,7 @@ TruncateStmt: TRUNCATE TABLE relation_name`
`1554`	`1554`	`*`
`1555`	`1555`	`*****************************************************************************/`
`1556`	`1556`
`1557`		`-CommentStmt: COMMENT ON comment_type name IS Sconst`
	`1557`	`+CommentStmt: COMMENT ON comment_type name IS comment_text`
`1558`	`1558`	`{`
`1559`	`1559`	`CommentStmt *n = makeNode(CommentStmt);`
`1560`	`1560`	`n->objtype = $3;`
`@@ -1564,7 +1564,7 @@ CommentStmt: COMMENT ON comment_type name IS Sconst`
`1564`	`1564`	`n->comment = $6;`
`1565`	`1565`	`$$ = (Node *) n;`
`1566`	`1566`	`}`
`1567`		`- \| COMMENT ON comment_cl relation_name '.' attr_name IS Sconst`
	`1567`	`+ \| COMMENT ON comment_cl relation_name '.' attr_name IS comment_text`
`1568`	`1568`	`{`
`1569`	`1569`	`CommentStmt *n = makeNode(CommentStmt);`
`1570`	`1570`	`n->objtype = $3;`
`@@ -1574,7 +1574,7 @@ CommentStmt: COMMENT ON comment_type name IS Sconst`
`1574`	`1574`	`n->comment = $8;`
`1575`	`1575`	`$$ = (Node *) n;`
`1576`	`1576`	`}`
`1577`		`- \| COMMENT ON comment_ag name aggr_argtype IS Sconst`
	`1577`	`+ \| COMMENT ON comment_ag name aggr_argtype IS comment_text`
`1578`	`1578`	`{`
`1579`	`1579`	`CommentStmt *n = makeNode(CommentStmt);`
`1580`	`1580`	`n->objtype = $3;`
`@@ -1584,7 +1584,7 @@ CommentStmt: COMMENT ON comment_type name IS Sconst`
`1584`	`1584`	`n->comment = $7;`
`1585`	`1585`	`$$ = (Node *) n;`
`1586`	`1586`	`}`
`1587`		`- \| COMMENT ON comment_fn func_name func_args IS Sconst`
	`1587`	`+ \| COMMENT ON comment_fn func_name func_args IS comment_text`
`1588`	`1588`	`{`
`1589`	`1589`	`CommentStmt *n = makeNode(CommentStmt);`
`1590`	`1590`	`n->objtype = $3;`
`@@ -1594,7 +1594,7 @@ CommentStmt: COMMENT ON comment_type name IS Sconst`
`1594`	`1594`	`n->comment = $7;`
`1595`	`1595`	`$$ = (Node *) n;`
`1596`	`1596`	`}`
`1597`		`- \| COMMENT ON comment_op all_Op '(' oper_argtypes ')' IS Sconst`
	`1597`	`+ \| COMMENT ON comment_op all_Op '(' oper_argtypes ')' IS comment_text`
`1598`	`1598`	`{`
`1599`	`1599`	`CommentStmt *n = makeNode(CommentStmt);`
`1600`	`1600`	`n->objtype = $3;`
`@@ -1604,7 +1604,7 @@ CommentStmt: COMMENT ON comment_type name IS Sconst`
`1604`	`1604`	`n->comment = $9;`
`1605`	`1605`	`$$ = (Node *) n;`
`1606`	`1606`	`}`
`1607`		`- \| COMMENT ON comment_tg name ON relation_name IS Sconst`
	`1607`	`+ \| COMMENT ON comment_tg name ON relation_name IS comment_text`
`1608`	`1608`	`{`
`1609`	`1609`	`CommentStmt *n = makeNode(CommentStmt);`
`1610`	`1610`	`n->objtype = $3;`
`@@ -1638,8 +1638,12 @@ comment_op: OPERATOR { $$ = OPERATOR; }`
`1638`	`1638`	`;`
`1639`	`1639`
`1640`	`1640`	`comment_tg: TRIGGER { $$ = TRIGGER; }`
`1641`		`- ;`
	`1641`	`+ ;`
`1642`	`1642`
	`1643`	`+comment_text: Sconst { $$ = $1; }`
	`1644`	`+ \| NULL_P { $$ = 0; }`
	`1645`	`+ ;`
	`1646`	`+`
`1643`	`1647`	`/*****************************************************************************`
`1644`	`1648`	`*`
`1645`	`1649`	`* QUERY:`