Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit40ce3a9

Browse files
committed
Remove 294 reduce/reduce conflicts.
1 parent22d9e91 commit40ce3a9

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ opt_boolean: TRUE_P { $$ = make_str("true"); }
838838
* - an integer or floating point number
839839
* - a time interval per SQL99
840840
*/
841-
zone_value:StringConst{$$ =$1; }
841+
zone_value:AllConst{$$ =$1; }
842842
|ConstIntervalStringConstopt_interval
843843
{
844844
$$ = cat_str(3,$1,$2,$3);
@@ -847,7 +847,6 @@ zone_value: StringConst{ $$ = $1; }
847847
{
848848
$$ = cat_str(6,$1, make_str("("),$3, make_str(")"),$5,$6);
849849
}
850-
|NumConst{$$ =$1; }
851850
|DEFAULT{$$ = make_str("default"); }
852851
|LOCAL{$$ = make_str("local"); }
853852
;
@@ -5156,9 +5155,6 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
51565155
|FREEZE{$$ = make_str("freeze"); }
51575156
|FROM{$$ = make_str("from"); }
51585157
|FULL{$$ = make_str("full"); }
5159-
|IN {$$ = make_str("in"); }
5160-
|IS {$$ = make_str("is"); }
5161-
|ISNULL {$$ = make_str("isnull"); }
51625158
|GLOBAL{$$ = make_str("global"); }
51635159
|GROUP{$$ = make_str("group"); }
51645160
|HAVING{$$ = make_str("having"); }
@@ -5170,6 +5166,8 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
51705166
|INTERSECT{$$ = make_str("intersect"); }
51715167
|INTERVAL{$$ = make_str("interval"); }
51725168
|INTO{$$ = make_str("into"); }
5169+
|IS{$$ = make_str("is"); }
5170+
|ISNULL{$$ = make_str("isnull"); }
51735171
|JOIN{$$ = make_str("join"); }
51745172
|LEADING{$$ = make_str("leading"); }
51755173
|LEFT{$$ = make_str("left"); }

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp