diff options
| author | Bruce Momjian <bruce@momjian.us> | 1996-12-11 23:06:40 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1996-12-11 23:06:40 +0000 |
| commit | 89348533b3451a3411077eb343809a1fcec1dd36 (patch) | |
| tree | c275cc7eeb3b788a17b7f65180cb4b40d7dde9cc | |
| parent | 4cecf0b2d16beab359dc2e77bfceb0318467852d (diff) | |
| download | postgresql-89348533b3451a3411077eb343809a1fcec1dd36.tar.gz | |
Require seimcolons between statements.
| -rw-r--r-- | src/backend/parser/gram.y | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 8889bb456e..7f817c7c46 100644 --- 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 1.20 1996/11/30 03:38:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.20.2.1 1996/12/11 23:06:40 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -98,7 +98,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); AppendStmt *astmt; } -%type <node> query, stmt, AddAttrStmt, ClosePortalStmt, +%type <node> stmt, AddAttrStmt, ClosePortalStmt, CopyStmt, CreateStmt, DefineStmt, DestroyStmt, ExtendStmt, FetchStmt, GrantStmt, IndexStmt, MoveStmt, ListenStmt, OptimizableStmt, @@ -121,7 +121,7 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); %type <str> privileges, operation_commalist, grantee %type <chr> operation -%type <list> queryblock, relation_name_list, OptTableElementList, +%type <list> stmtblock, relation_name_list, OptTableElementList, tableElementList, OptInherit, definition, opt_with, def_args, def_name_list, func_argtypes, oper_argtypes, OptStmtList, OptStmtBlock, opt_column_list, columnList, @@ -218,14 +218,12 @@ static Node *makeA_Expr(int oper, char *opname, Node *lexpr, Node *rexpr); %nonassoc REDUCE %% -queryblock: query queryblock +stmtblock: stmt ';' stmtblock { parsetree = lcons($1, parsetree); } - | query + | stmt ';' + { parsetree = lcons($1, NIL); } + | stmt { parsetree = lcons($1, NIL); } - ; - -query: stmt - | stmt ';' { $$ = $1; } ; stmt : AddAttrStmt |