|
11 | 11 | * |
12 | 12 | * |
13 | 13 | * IDENTIFICATION |
14 | | - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.330 2002/06/18 17:56:41 momjian Exp $ |
| 14 | + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.331 2002/06/19 15:40:58 momjian Exp $ |
15 | 15 | * |
16 | 16 | * HISTORY |
17 | 17 | * AUTHORDATEMAJOR EVENT |
@@ -161,7 +161,6 @@ static void doNegateFloat(Value *v); |
161 | 161 |
|
162 | 162 | %type<list>createdb_opt_list |
163 | 163 | %type<defelt>createdb_opt_item |
164 | | -%type<boolean>opt_equal |
165 | 164 |
|
166 | 165 | %type<ival>opt_lock,lock_type |
167 | 166 | %type<boolean>opt_force,opt_or_replace |
@@ -224,12 +223,10 @@ static void doNegateFloat(Value *v); |
224 | 223 | %type<defelt>createfunc_opt_item |
225 | 224 | %type<typnam>func_arg,func_return,func_type,aggr_argtype |
226 | 225 |
|
227 | | -%type<boolean>opt_arg,TriggerForOpt,TriggerForType,OptTemp,OptWithOids |
| 226 | +%type<boolean>opt_arg,TriggerForType,OptTemp,OptWithOids |
228 | 227 |
|
229 | 228 | %type<list>for_update_clause,opt_for_update_clause,update_list |
230 | 229 | %type<boolean>opt_all |
231 | | -%type<boolean>opt_table |
232 | | -%type<boolean>opt_chain |
233 | 230 |
|
234 | 231 | %type<node>join_outer,join_qual |
235 | 232 | %type<jtype>join_type |
@@ -310,8 +307,6 @@ static void doNegateFloat(Value *v); |
310 | 307 | %type<list>constraints_set_list |
311 | 308 | %type<boolean>constraints_set_mode |
312 | 309 |
|
313 | | -%type<boolean>opt_as |
314 | | - |
315 | 310 |
|
316 | 311 | /* |
317 | 312 | * If you make any token changes, update the keyword table in |
@@ -2044,8 +2039,8 @@ TriggerForSpec: |
2044 | 2039 | ; |
2045 | 2040 |
|
2046 | 2041 | TriggerForOpt: |
2047 | | -EACH{$$ =TRUE;} |
2048 | | -|/*EMPTY*/{$$ =FALSE;} |
| 2042 | +EACH{} |
| 2043 | +|/*EMPTY*/{} |
2049 | 2044 | ; |
2050 | 2045 |
|
2051 | 2046 | TriggerForType: |
@@ -3360,15 +3355,14 @@ opt_trans:WORK{} |
3360 | 3355 | |/*EMPTY*/{} |
3361 | 3356 | ; |
3362 | 3357 |
|
3363 | | -opt_chain:ANDNOCHAIN{$$ =FALSE;} |
| 3358 | +opt_chain:ANDNOCHAIN{} |
3364 | 3359 | |ANDCHAIN |
3365 | 3360 | { |
3366 | 3361 | /* SQL99 asks that conforming dbs reject AND CHAIN |
3367 | 3362 | * if they don't support it. So we can't just ignore it. |
3368 | 3363 | * - thomas 2000-08-06 |
3369 | 3364 | */ |
3370 | 3365 | elog(ERROR,"COMMIT / CHAIN not yet supported"); |
3371 | | -$$ =TRUE; |
3372 | 3366 | } |
3373 | 3367 | ; |
3374 | 3368 |
|
@@ -3511,8 +3505,8 @@ createdb_opt_item: |
3511 | 3505 | *equals for backward compability, and it doesn't seem worth removing it. |
3512 | 3506 | *2002-02-25 |
3513 | 3507 | */ |
3514 | | -opt_equal:'='{$$ =TRUE;} |
3515 | | -|/*EMPTY*/{$$ =FALSE;} |
| 3508 | +opt_equal:'='{} |
| 3509 | +|/*EMPTY*/{} |
3516 | 3510 | ; |
3517 | 3511 |
|
3518 | 3512 |
|
@@ -3578,8 +3572,8 @@ CreateDomainStmt: |
3578 | 3572 | } |
3579 | 3573 | ; |
3580 | 3574 |
|
3581 | | -opt_as:AS{$$ =TRUE;} |
3582 | | -|/* EMPTY*/{$$ =FALSE;} |
| 3575 | +opt_as:AS{} |
| 3576 | +|/* EMPTY*/{} |
3583 | 3577 | ; |
3584 | 3578 |
|
3585 | 3579 |
|
@@ -4088,8 +4082,8 @@ OptTempTableName: |
4088 | 4082 | } |
4089 | 4083 | ; |
4090 | 4084 |
|
4091 | | -opt_table:TABLE{$$ =TRUE;} |
4092 | | -|/*EMPTY*/{$$ =FALSE;} |
| 4085 | +opt_table:TABLE{} |
| 4086 | +|/*EMPTY*/{} |
4093 | 4087 | ; |
4094 | 4088 |
|
4095 | 4089 | opt_all:ALL{$$ =TRUE; } |
|