diff options
| author | Michael Meskes <meskes@postgresql.org> | 2010-03-20 18:53:00 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2010-03-20 18:53:00 +0000 |
| commit | 1dff2a0f25badf7fc15a654172bf4e0bce964008 (patch) | |
| tree | 6449c4a65589c62cc6652f9514690d5ce2f131a5 | |
| parent | 4a12e98c4672def5e06ec946715dddd92e4a14e8 (diff) | |
| download | postgresql-1dff2a0f25badf7fc15a654172bf4e0bce964008.tar.gz postgresql-1dff2a0f25badf7fc15a654172bf4e0bce964008.zip | |
Fixed ecpg parser to allow more than one C preprocessor command inside a declare section.
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.trailer | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 5c09cbbd8e6..e9bc9e7ae03 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.21 2010/03/09 11:09:45 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.22 2010/03/20 18:53:00 meskes Exp $ */ statements: /*EMPTY*/ | statements statement @@ -387,13 +387,11 @@ sql_enddeclare: ecpgstart END_P DECLARE SQL_SECTION ';' {}; var_type_declarations: /*EMPTY*/ { $$ = EMPTY; } | vt_declarations { $$ = $1; } - | CPP_LINE { $$ = $1; } ; -vt_declarations: var_declaration { $$ = $1; } - | type_declaration { $$ = $1; } - | vt_declarations var_declaration { $$ = cat2_str($1, $2); } - | vt_declarations type_declaration { $$ = cat2_str($1, $2); } +vt_declarations: single_vt_declaration { $$ = $1; } + | CPP_LINE { $$ = $1; } + | vt_declarations single_vt_declaration { $$ = cat2_str($1, $2); } | vt_declarations CPP_LINE { $$ = cat2_str($1, $2); } ; |