1010 *
1111 *
1212 * IDENTIFICATION
13- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.20 1996/11/30 03:38:05 momjian Exp $
13+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.20.2.1 1996/12/11 23:06:40 momjian Exp $
1414 *
1515 * HISTORY
1616 * AUTHORDATEMAJOR EVENT
@@ -98,7 +98,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
9898 AppendStmt*astmt;
9999}
100100
101- %type <node>query, stmt, AddAttrStmt, ClosePortalStmt,
101+ %type <node>stmt, AddAttrStmt, ClosePortalStmt,
102102CopyStmt, CreateStmt, DefineStmt, DestroyStmt,
103103ExtendStmt, FetchStmt,GrantStmt,
104104IndexStmt, MoveStmt, ListenStmt, OptimizableStmt,
@@ -121,7 +121,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
121121%type <str>privileges, operation_commalist, grantee
122122%type <chr>operation
123123
124- %type <list>queryblock , relation_name_list, OptTableElementList,
124+ %type <list>stmtblock , relation_name_list, OptTableElementList,
125125tableElementList, OptInherit, definition,
126126opt_with, def_args, def_name_list, func_argtypes,
127127oper_argtypes, OptStmtList, OptStmtBlock, opt_column_list, columnList,
@@ -218,14 +218,12 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr);
218218%nonassoc REDUCE
219219%%
220220
221- queryblock :query queryblock
221+ stmtblock :stmt ';' stmtblock
222222{ parsetree = lcons($1, parsetree); }
223- | query
223+ | stmt ';'
224+ { parsetree = lcons($1, NIL); }
225+ | stmt
224226{ parsetree = lcons($1, NIL); }
225- ;
226-
227- query: stmt
228- | stmt ';'{ $$ = $1; }
229227;
230228
231229stmt : AddAttrStmt