rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 19:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ecpg parsing of sizeof().

Browse Source 
The last fix used the wrong non-terminal to define valid types.
This commit is contained in:
Michael Meskes 2013-11-25 15:11:39 +01:00
parent 559d535819
commit ef8b3b00b5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -1856,20 +1856,20 @@ DeallocateStmt: DEALLOCATE prepared_name { $$ = $2; }
| DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); } | DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); }
; ;
Iresult: Iconst { $$ = $1; } Iresult: Iconst { $$ = $1; }
| '(' Iresult ')' { $$ = cat_str(3, mm_strdup("("), $2, mm_strdup(")")); } | '(' Iresult ')' { $$ = cat_str(3, mm_strdup("("), $2, mm_strdup(")")); }
| Iresult '+' Iresult { $$ = cat_str(3, $1, mm_strdup("+"), $3); } | Iresult '+' Iresult { $$ = cat_str(3, $1, mm_strdup("+"), $3); }
| Iresult '-' Iresult { $$ = cat_str(3, $1, mm_strdup("-"), $3); } | Iresult '-' Iresult { $$ = cat_str(3, $1, mm_strdup("-"), $3); }
| Iresult '*' Iresult { $$ = cat_str(3, $1, mm_strdup("*"), $3); } | Iresult '*' Iresult { $$ = cat_str(3, $1, mm_strdup("*"), $3); }
| Iresult '/' Iresult { $$ = cat_str(3, $1, mm_strdup("/"), $3); } | Iresult '/' Iresult { $$ = cat_str(3, $1, mm_strdup("/"), $3); }
| Iresult '%' Iresult { $$ = cat_str(3, $1, mm_strdup("%"), $3); } | Iresult '%' Iresult { $$ = cat_str(3, $1, mm_strdup("%"), $3); }
| ecpg_sconst { $$ = $1; } | ecpg_sconst { $$ = $1; }
| ColId { $$ = $1; } | ColId { $$ = $1; }
| ColId '(' ColId ')' { if (pg_strcasecmp($1, "sizeof") != 0) | ColId '(' var_type ')' { if (pg_strcasecmp($1, "sizeof") != 0)
mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition"); mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
else else
$$ = cat_str(4,$1, mm_strdup("("), $3, mm_strdup(")")); $$ = cat_str(4, $1, mm_strdup("("), $3.type_str, mm_strdup(")"));
} }
; ;
execute_rest: /* EMPTY */ { $$ = EMPTY; } execute_rest: /* EMPTY */ { $$ = EMPTY; }