From 1dff2a0f25badf7fc15a654172bf4e0bce964008 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Sat, 20 Mar 2010 18:53:00 +0000 Subject: [PATCH] Fixed ecpg parser to allow more than one C preprocessor command inside a declare section. --- src/interfaces/ecpg/preproc/ecpg.trailer | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 5c09cbbd8e..e9bc9e7ae0 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); } ; -- 2.40.0