Commit4b56bd8

Michael Meskes

committed

Fixed bug in parsing of #line statement in declare section.

1 parentcde6056 commit4b56bd8Copy full SHA for 4b56bd8

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1898,5 +1898,9 @@ Mon Jan 10 13:55:32 CET 2005`
`1898`	`1898`	`Tue Jan 25 13:47:45 CET 2005`
`1899`	`1899`
`1900`	`1900`	`- Fixed segfault in preprocessor due to free a struct twice.`
	`1901`	`+`
	`1902`	`+Wed Feb 2 16:35:27 CET 2005`
	`1903`	`+`
	`1904`	`+- Fixed bug in parsing of #line statement in declare section.`
`1901`	`1905`	`- Set ecpg version to 3.2.1.`
`1902`	`1906`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.134 2004/12/31 22:03:48 pgsql Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.135 2005/02/02 15:37:43 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -288,8 +288,8 @@ ip{ipdigit}\.{ipdigit}\.{ipdigit}\.{ipdigit}`
`288`	`288`	`/* we might want to parse all cpp include files */`
`289`	`289`	`cppinclude {space}#{include}{space}`
`290`	`290`
`291`		`-/* Take care of cppcontinuationlines */`
`292`		`-cppline{space}#(.\\{space})+.*`
	`291`	`+/* Take care of cpp lines, they may also be continuated */`
	`292`	`+cppline{space}#(.\\{space}).{newline}`
`293`	`293`
`294`	`294`	`/*`
`295`	`295`	`* Dollar quoted strings are totally opaque, and no escaping is done on them.`
`@@ -685,7 +685,7 @@ cppline{space}#(.\\{space})+.*`
`685`	`685`	`return(CPP_LINE);`
`686`	`686`	`}`
`687`	`687`	`}`
`688`		`-<C>{cppline}{`
	`688`	`+<C,SQL>{cppline}{`
`689`	`689`	`yylval.str =mm_strdup(yytext);`
`690`	`690`	`return(CPP_LINE);`
`691`	`691`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.304 2005/01/25 12:51:31 meskes Exp $*/`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.305 2005/02/02 15:37:43 meskes Exp $*/`
`2`	`2`
`3`	`3`	`/* Copyright comment*/`
`4`	`4`	`%{`
`@@ -4635,12 +4635,14 @@ sql_enddeclare: ecpgstart END_P DECLARE SQL_SECTION ';' {};`
`4635`	`4635`
`4636`	`4636`	`var_type_declarations:/EMPTY/{$$ = EMPTY; }`
`4637`	`4637`	`\|vt_declarations{$$ =$1; }`
	`4638`	`+\|CPP_LINE{$$ =$1; }`
`4638`	`4639`	`;`
`4639`	`4640`
`4640`	`4641`	`vt_declarations:var_declaration{$$ =$1; }`
`4641`	`4642`	`\|type_declaration{$$ =$1; }`
`4642`	`4643`	`\|vt_declarationsvar_declaration{$$ = cat2_str($1,$2); }`
`4643`	`4644`	`\|vt_declarationstype_declaration{$$ = cat2_str($1,$2); }`
	`4645`	`+\|vt_declarationsCPP_LINE{$$ = cat2_str($1,$2); }`
`4644`	`4646`	`;`
`4645`	`4647`
`4646`	`4648`	`variable_declarations:var_declaration {$$ =$1; }`

Comments

(0)