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

Commit61dd8b6

Browse files
committed
Remove shift/reduce conflicts introduced by last change.
1 parent9c9a72b commit61dd8b6

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ make_name(void)
350350
%type<str>blockendvariable_listvariablec_thingc_term
351351
%type<str>opt_pointerECPGDisconnectdis_namestorage_modifier
352352
%type<str>stmtECPGReleaseexecstringserver_name
353-
%type<str>connection_objectopt_serveropt_portc_stuffopt_reference
354-
%type<str>user_nameopt_userchar_variableora_userident
353+
%type<str>connection_objectopt_serveropt_portc_stuffc_stuff_item
354+
%type<str>user_nameopt_userchar_variableora_useridentopt_reference
355355
%type<str>quoted_ident_stringvar
356356
%type<str>db_prefixserveropt_optionsopt_connection_namec_list
357357
%type<str>ECPGSetConnectioncpp_lineECPGTypedefc_argsECPGKeywords
@@ -5376,26 +5376,18 @@ quoted_ident_stringvar: IDENT{ $$ = make3_str(make_str("\""), $1, make_str("\""
53765376

53775377
cpp_line:CPP_LINE{$$ =$1; };
53785378

5379-
c_stuff:c_anything {$$ =$1; }
5380-
|c_stuffc_anything
5381-
{
5382-
$$ = cat2_str($1,$2);
5383-
}
5384-
|c_stuff'('c_stuff')'
5385-
{
5386-
$$ = cat_str(4,$1, make_str("("),$3, make_str(")"));
5387-
}
5388-
|c_stuff'('')'
5389-
{
5390-
$$ = cat_str(3,$1, make_str("("), make_str(")"));
5391-
}
5379+
c_stuff_item:c_anything {$$ =$1; }
5380+
|'('')'{$$ = make_str("()"); }
53925381
|'('c_stuff')'
53935382
{
53945383
$$ = cat_str(3, make_str("("),$2, make_str(")"));
53955384
}
5396-
|'('c_stuff')'c_stuff
5385+
;
5386+
5387+
c_stuff:c_stuff_item {$$ =$1; }
5388+
|c_stuffc_stuff_item
53975389
{
5398-
$$ =cat_str(4, make_str("("),$2, make_str(")"),$4);
5390+
$$ =cat2_str($1,$2);
53995391
}
54005392
;
54015393

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp