Properly mark rules that return no value.

This commit is contained in:
Bruce Momjian 2002-06-19 15:40:58 +00:00
parent 5fa77c2570
commit e136986afb
1 changed files with 11 additions and 17 deletions

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.330 2002/06/18 17:56:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.331 2002/06/19 15:40:58 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -161,7 +161,6 @@ static void doNegateFloat(Value *v);
%type <list> createdb_opt_list %type <list> createdb_opt_list
%type <defelt> createdb_opt_item %type <defelt> createdb_opt_item
%type <boolean> opt_equal
%type <ival> opt_lock, lock_type %type <ival> opt_lock, lock_type
%type <boolean> opt_force, opt_or_replace %type <boolean> opt_force, opt_or_replace
@ -224,12 +223,10 @@ static void doNegateFloat(Value *v);
%type <defelt> createfunc_opt_item %type <defelt> createfunc_opt_item
%type <typnam> func_arg, func_return, func_type, aggr_argtype %type <typnam> func_arg, func_return, func_type, aggr_argtype
%type <boolean> opt_arg, TriggerForOpt, TriggerForType, OptTemp, OptWithOids %type <boolean> opt_arg, TriggerForType, OptTemp, OptWithOids
%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_chain
%type <node> join_outer, join_qual %type <node> join_outer, join_qual
%type <jtype> join_type %type <jtype> join_type
@ -310,8 +307,6 @@ static void doNegateFloat(Value *v);
%type <list> constraints_set_list %type <list> constraints_set_list
%type <boolean> constraints_set_mode %type <boolean> constraints_set_mode
%type <boolean> opt_as
/* /*
* If you make any token changes, update the keyword table in * If you make any token changes, update the keyword table in
@ -2044,8 +2039,8 @@ TriggerForSpec:
; ;
TriggerForOpt: TriggerForOpt:
EACH { $$ = TRUE; } EACH {}
| /*EMPTY*/ { $$ = FALSE; } | /*EMPTY*/ {}
; ;
TriggerForType: TriggerForType:
@ -3360,7 +3355,7 @@ opt_trans: WORK {}
| /*EMPTY*/ {} | /*EMPTY*/ {}
; ;
opt_chain: AND NO CHAIN { $$ = FALSE; } opt_chain: AND NO CHAIN {}
| AND CHAIN | AND CHAIN
{ {
/* SQL99 asks that conforming dbs reject AND CHAIN /* SQL99 asks that conforming dbs reject AND CHAIN
@ -3368,7 +3363,6 @@ opt_chain: AND NO CHAIN { $$ = FALSE; }
* - thomas 2000-08-06 * - thomas 2000-08-06
*/ */
elog(ERROR, "COMMIT / CHAIN not yet supported"); elog(ERROR, "COMMIT / CHAIN not yet supported");
$$ = TRUE;
} }
; ;
@ -3511,8 +3505,8 @@ createdb_opt_item:
* equals for backward compability, and it doesn't seem worth removing it. * equals for backward compability, and it doesn't seem worth removing it.
* 2002-02-25 * 2002-02-25
*/ */
opt_equal: '=' { $$ = TRUE; } opt_equal: '=' {}
| /*EMPTY*/ { $$ = FALSE; } | /*EMPTY*/ {}
; ;
@ -3578,8 +3572,8 @@ CreateDomainStmt:
} }
; ;
opt_as: AS {$$ = TRUE; } opt_as: AS {}
| /* EMPTY */ {$$ = FALSE; } | /* EMPTY */ {}
; ;
@ -4088,8 +4082,8 @@ OptTempTableName:
} }
; ;
opt_table: TABLE { $$ = TRUE; } opt_table: TABLE {}
| /*EMPTY*/ { $$ = FALSE; } | /*EMPTY*/ {}
; ;
opt_all: ALL { $$ = TRUE; } opt_all: ALL { $$ = TRUE; }