diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-25 20:56:53 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-25 20:56:53 +0000 |
| commit | 40ce3a93f19f0c7922b125a7b44939d61eb5c707 (patch) | |
| tree | 71e3439044e97f7be4ab8ee419feed52aa58124a | |
| parent | 22d9e912199dc2436d7a24bbfb82bcd768973020 (diff) | |
| download | postgresql-40ce3a93f19f0c7922b125a7b44939d61eb5c707.tar.gz postgresql-40ce3a93f19f0c7922b125a7b44939d61eb5c707.zip | |
Remove 294 reduce/reduce conflicts.
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 4451ee8ca85..c5cf4d19211 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -838,7 +838,7 @@ opt_boolean: TRUE_P { $$ = make_str("true"); } * - an integer or floating point number * - a time interval per SQL99 */ -zone_value: StringConst { $$ = $1; } +zone_value: AllConst { $$ = $1; } | ConstInterval StringConst opt_interval { $$ = cat_str(3, $1, $2, $3); @@ -847,7 +847,6 @@ zone_value: StringConst { $$ = $1; } { $$ = cat_str(6, $1, make_str("("), $3, make_str(")"), $5, $6); } - | NumConst { $$ = $1; } | DEFAULT { $$ = make_str("default"); } | LOCAL { $$ = make_str("local"); } ; @@ -5156,9 +5155,6 @@ ECPGColLabel: ECPGColId { $$ = $1; } | FREEZE { $$ = make_str("freeze"); } | FROM { $$ = make_str("from"); } | FULL { $$ = make_str("full"); } - | IN { $$ = make_str("in"); } - | IS { $$ = make_str("is"); } - | ISNULL { $$ = make_str("isnull"); } | GLOBAL { $$ = make_str("global"); } | GROUP { $$ = make_str("group"); } | HAVING { $$ = make_str("having"); } @@ -5170,6 +5166,8 @@ ECPGColLabel: ECPGColId { $$ = $1; } | INTERSECT { $$ = make_str("intersect"); } | INTERVAL { $$ = make_str("interval"); } | INTO { $$ = make_str("into"); } + | IS { $$ = make_str("is"); } + | ISNULL { $$ = make_str("isnull"); } | JOIN { $$ = make_str("join"); } | LEADING { $$ = make_str("leading"); } | LEFT { $$ = make_str("left"); } |