提交 e25f9e4f 编写于 作者: B Bruce Momjian

Mark noise keyword actions with {} rather than returning TRUE, like

opt_with and from_in.
上级 42423c71
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.326 2002/06/17 20:27:43 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.327 2002/06/17 20:38:04 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -171,7 +171,7 @@ static void doNegateFloat(Value *v); ...@@ -171,7 +171,7 @@ static void doNegateFloat(Value *v);
%type <str> OptSchemaName %type <str> OptSchemaName
%type <list> OptSchemaEltList %type <list> OptSchemaEltList
%type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted, opt_procedural %type <boolean> TriggerActionTime, TriggerForSpec, opt_trusted
%type <str> opt_lancompiler %type <str> opt_lancompiler
%type <str> TriggerEvents %type <str> TriggerEvents
...@@ -223,7 +223,7 @@ static void doNegateFloat(Value *v); ...@@ -223,7 +223,7 @@ static void doNegateFloat(Value *v);
%type <list> for_update_clause, opt_for_update_clause, update_list %type <list> for_update_clause, opt_for_update_clause, update_list
%type <boolean> opt_all %type <boolean> opt_all
%type <boolean> opt_table %type <boolean> opt_table
%type <boolean> opt_chain, opt_trans %type <boolean> opt_chain
%type <node> join_outer, join_qual %type <node> join_outer, join_qual
%type <jtype> join_type %type <jtype> join_type
...@@ -233,9 +233,9 @@ static void doNegateFloat(Value *v); ...@@ -233,9 +233,9 @@ static void doNegateFloat(Value *v);
%type <ival> opt_interval %type <ival> opt_interval
%type <node> overlay_placing, substr_from, substr_for %type <node> overlay_placing, substr_from, substr_for
%type <boolean> opt_binary, opt_using, opt_instead, opt_cursor, opt_with %type <boolean> opt_binary, opt_instead, opt_cursor
%type <boolean> opt_with_copy, index_opt_unique, opt_verbose, opt_full %type <boolean> opt_with_copy, index_opt_unique, opt_verbose, opt_full
%type <boolean> opt_freeze, analyze_keyword %type <boolean> opt_freeze
%type <ival> copy_dirn, direction, reindex_type, drop_type, %type <ival> copy_dirn, direction, reindex_type, drop_type,
opt_column, event, comment_type opt_column, event, comment_type
...@@ -530,8 +530,8 @@ CreateUserStmt: ...@@ -530,8 +530,8 @@ CreateUserStmt:
; ;
opt_with: WITH { $$ = TRUE; } opt_with: WITH {}
| /*EMPTY*/ { $$ = TRUE; } | /*EMPTY*/ {}
; ;
/***************************************************************************** /*****************************************************************************
...@@ -1318,8 +1318,8 @@ copy_delimiter: ...@@ -1318,8 +1318,8 @@ copy_delimiter:
| /*EMPTY*/ { $$ = "\t"; } | /*EMPTY*/ { $$ = "\t"; }
; ;
opt_using: USING { $$ = TRUE; } opt_using: USING {}
| /*EMPTY*/ { $$ = TRUE; } | /*EMPTY*/ {}
; ;
copy_null: WITH NULL_P AS Sconst { $$ = $4; } copy_null: WITH NULL_P AS Sconst { $$ = $4; }
...@@ -1902,8 +1902,8 @@ DropPLangStmt: ...@@ -1902,8 +1902,8 @@ DropPLangStmt:
; ;
opt_procedural: opt_procedural:
PROCEDURAL { $$ = TRUE; } PROCEDURAL {}
| /*EMPTY*/ { $$ = TRUE; } | /*EMPTY*/ {}
; ;
/***************************************************************************** /*****************************************************************************
...@@ -2498,8 +2498,8 @@ fetch_how_many: ...@@ -2498,8 +2498,8 @@ fetch_how_many:
| PRIOR { $$ = -1; } | PRIOR { $$ = -1; }
; ;
from_in: IN_P { } from_in: IN_P {}
| FROM { } | FROM {}
; ;
...@@ -3296,9 +3296,9 @@ TransactionStmt: ...@@ -3296,9 +3296,9 @@ TransactionStmt:
} }
; ;
opt_trans: WORK { $$ = TRUE; } opt_trans: WORK {}
| TRANSACTION { $$ = TRUE; } | TRANSACTION {}
| /*EMPTY*/ { $$ = TRUE; } | /*EMPTY*/ {}
; ;
opt_chain: AND NO CHAIN { $$ = FALSE; } opt_chain: AND NO CHAIN { $$ = FALSE; }
...@@ -3631,8 +3631,8 @@ AnalyzeStmt: ...@@ -3631,8 +3631,8 @@ AnalyzeStmt:
; ;
analyze_keyword: analyze_keyword:
ANALYZE { $$ = TRUE; } ANALYZE {}
| ANALYSE /* British */ { $$ = TRUE; } | ANALYSE /* British */ {}
; ;
opt_verbose: opt_verbose:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册