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

Commit353f71a

Browse files
author
Michael Meskes
committed
Synced preproc.y with gram.y.
1 parent8eed998 commit353f71a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,5 +1034,9 @@ Fri Dec 22 13:33:31 CET 2000
10341034

10351035
- Fixed bug in a connect statement using varchars.
10361036
- Synced gram.y and preproc.y.
1037+
1038+
Tue Jan 9 20:24:56 CET 2001
1039+
1040+
- Synced gram.y.
10371041
- Set ecpg version to 2.8.0.
10381042
- Set library version to 3.2.0.

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ make_name(void)
294294
%type<str>opt_indirectionexpr_listextract_listextract_arg
295295
%type<str>position_listsubstr_listsubstr_fromalter_column_action
296296
%type<str>trim_listin_exprsubstr_forattrattrsdrop_behavior
297-
%type<str>TypenameSimpleTypenameGenericNumericgenericopt_floatopt_numeric
297+
%type<str>TypenameSimpleTypenameGenericTypeNumericopt_floatopt_numeric
298298
%type<str>opt_decimalCharactercharacteropt_varyingopt_charset
299299
%type<str>opt_collatedatetimeopt_timezoneopt_intervaltable_ref
300300
%type<str>row_exprrow_descriptorrow_listConstDatetimeopt_chain
@@ -2928,22 +2928,15 @@ SimpleTypename: ConstTypename{ $$ = $1; }
29282928
|ConstInterval{$$ =$1; }
29292929
;
29302930

2931-
ConstTypename:Generic{$$ =$1; }
2931+
ConstTypename:GenericType{$$ =$1; }
29322932
|ConstDatetime{$$ =$1; }
29332933
|Numeric{$$ =$1; }
29342934
|Geometric{$$ =$1; }
29352935
|Bit{$$ =$1; }
29362936
|Character{$$ =$1; }
29372937
;
29382938

2939-
Generic:generic
2940-
{
2941-
$$ =$1;
2942-
}
2943-
;
2944-
2945-
generic:ident{$$ =$1; }
2946-
|TYPE_P{$$ = make_str("type"); }
2939+
GenericType:ident{$$ =$1; }
29472940
|ECPGKeywords{$$ =$1; }
29482941
|ECPGTypeName{$$ =$1; }
29492942
;
@@ -5076,6 +5069,7 @@ TokenId: ABSOLUTE{ $$ = make_str("absolute"); }
50765069
|TRIGGER{$$ = make_str("trigger"); }
50775070
|TRUNCATE{$$ = make_str("truncate"); }
50785071
|TRUSTED{$$ = make_str("trusted"); }
5072+
|TYPE_P{$$ = make_str("type"); }
50795073
|UNLISTEN{$$ = make_str("unlisten"); }
50805074
|UNTIL{$$ = make_str("until"); }
50815075
|UPDATE{$$ = make_str("update"); }
@@ -5109,6 +5103,7 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
51095103
|ALL{$$ = make_str("all"); }
51105104
|ANALYSE {$$ = make_str("analyse"); }
51115105
|ANALYZE {$$ = make_str("analyze"); }
5106+
|AND{$$ = make_str("and"); }
51125107
|ANY{$$ = make_str("any"); }
51135108
|ASC{$$ = make_str("asc"); }
51145109
|BETWEEN {$$ = make_str("between"); }
@@ -5203,6 +5198,7 @@ ECPGColLabel: ECPGColId{ $$ = $1; }
52035198
|TABLE{$$ = make_str("table"); }
52045199
|THEN {$$ = make_str("then"); }
52055200
|TO{$$ = make_str("to"); }
5201+
|TRAILING{$$ = make_str("trailing"); }
52065202
|TRANSACTION{$$ = make_str("transaction"); }
52075203
|TRIM{$$ = make_str("trim"); }
52085204
|TRUE_P{$$ = make_str("true"); }

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp