Added just another test case.

 Fixed missing continuation line character.
 Do not translate $-quoting.
 Bit field notation belongs to a variable not a variable list.
 Output of line number only done by one function.

Author: Michael Meskes

src/interfaces/ecpg/ChangeLog

@@ -1982,6 +1982,17 @@ Sa Feb  4 21:35:03 CET 2006
 	- Added C bit fields to ecpg parser.
 	- Added some default rules to lexer.
 	- Added log output to prepare statement.
+	
+Mo Feb  6 21:21:19 CET 2006
+
+	- Added just another test case.
+	- Fixed missing continuation line character.
+	- Do not translate $-quoting.
+	
+Tu Feb  7 18:48:14 CET 2006
+
+	- Bit field notation belongs to a variable not a variable list.
+	- Output of line number only done by one function.
 	- Set ecpg library version to 5.2.
 	- Set ecpg version to 4.2.1.
 

src/interfaces/ecpg/preproc/ecpg.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.93 2005/10/15 02:49:47 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.94 2006/02/08 09:10:04 meskes Exp $ */
 
 /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
 /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@@ -418,7 +418,7 @@ main(int argc, char *const argv[])
 					fprintf(yyout, "/* End of automatic include section */\n");
 				}
 
-				fprintf(yyout, "#line 1 \"%s\"\n", input_filename);
+				output_line_number();
 
 				/* and parse the source */
 				yyparse();

src/interfaces/ecpg/preproc/output.c

@@ -2,19 +2,22 @@
 
 #include "extern.h"
 
-static void ouput_escaped_str(char *cmd);
+static void output_escaped_str(char *cmd);
 
 void
 output_line_number(void)
 {
-	if (input_filename)
-		fprintf(yyout, "\n#line %d \"%s\"\n", yylineno, input_filename);
+	char *line = hashline_number();
+	
+	/* output_escaped_str(line); */
+	fprintf(yyout, "%s", line);
+	free(line);
 }
 
 void
 output_simple_statement(char *stmt)
 {
-	ouput_escaped_str(stmt);
+	output_escaped_str(stmt);
 	output_line_number();
 	free(stmt);
 }
@@ -83,7 +86,8 @@ whenever_action(int mode)
 char *
 hashline_number(void)
 {
-	if (input_filename)
+	/* do not print line numbers if we are in debug mode */
+	if (input_filename && !yydebug)
 	{
 		char	   *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + 21 + strlen(input_filename));
 
@@ -99,7 +103,7 @@ void
 output_statement(char *stmt, int mode, char *con)
 {
 	fprintf(yyout, "{ ECPGdo(__LINE__, %d, %d, %s, \"", compat, force_indicator, con ? con : "NULL");
-	ouput_escaped_str(stmt);
+	output_escaped_str(stmt);
 	fputs("\", ", yyout);
 
 	/* dump variables to C file */
@@ -118,7 +122,7 @@ output_statement(char *stmt, int mode, char *con)
 
 
 static void
-ouput_escaped_str(char *str)
+output_escaped_str(char *str)
 {
 	int			i, len = strlen(str);
 
@@ -128,7 +132,8 @@ ouput_escaped_str(char *str)
 		if (str[i] == '"')
 			fputs("\\\"", yyout);
 		else if (str[i] == '\n')
-			fputs("\\n\\\n", yyout);
+			//fputs("\\n\\\n", yyout);
+			fputs("\\\n", yyout);
 		else
 			fputc(str[i], yyout);
 	}

src/interfaces/ecpg/preproc/pgc.l

@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.142 2006/02/04 20:54:42 meskes Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.143 2006/02/08 09:10:04 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -152,7 +152,7 @@ dolq_start		[A-Za-z\200-\377_]
 dolq_cont		[A-Za-z\200-\377_0-9]
 dolqdelim		\$({dolq_start}{dolq_cont}*)?\$
 dolqfailed		\${dolq_start}{dolq_cont}*
-dolqinside		[^$']+
+dolqinside		[^$]+
 
 /* Double quote
  * Allows embedded spaces and other special characters into identifiers.
@@ -437,7 +437,7 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 				addlit(yytext, yyleng);
 			}
 <xq>{quotecontinue}	{ /* ignore */ }
-<xq>.		{
+<xq>{other}		{
 			   /* This is only needed for \ just before EOF */
 			   addlitchar(yytext[0]);
 			}
@@ -453,14 +453,16 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 				dolqstart = mm_strdup(yytext);
 				BEGIN(xdolq);
 				startlit();
+				addlit(yytext, yyleng);
 			}
 <xdolq>{dolqdelim}      {
 				if (strcmp(yytext, dolqstart) == 0)
 				{
+					addlit(yytext, yyleng);
 					free(dolqstart);
 					BEGIN(SQL);
 					yylval.str = mm_strdup(literalbuf);
-					return SCONST;
+					return DOLCONST;
 				}
 				else
 				{
@@ -475,15 +477,11 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 			}
 <xdolq>{dolqinside} 	{ addlit(yytext, yyleng); }
 <xdolq>{dolqfailed}	{ addlit(yytext, yyleng); }
-<xdolq>.	{
-				/* $$ is implemented as a single-quoted string, so double it? */
-				if (yytext[0] == '\'')
-					addlitchar(yytext[0]);
+<xdolq>{other}		{
 				/* single quote or dollar sign */
 				addlitchar(yytext[0]);
 			}
-<xdolq><<EOF>> { yyerror("unterminated dollar-quoted string"); }
-
+<xdolq><<EOF>> 		{ yyerror("unterminated dollar-quoted string"); }
 <SQL>{xdstart}		{
 						state_before = YYSTATE;
 						BEGIN(xd);
@@ -625,8 +623,8 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 <SQL>{ip}			{
 						yylval.str = mm_strdup(yytext);
 						return IP;
-					}
-{decimal}			{
+				}
+<C,SQL>{decimal}	{
 						yylval.str = mm_strdup(yytext);
 						return FCONST;
 			}
@@ -797,7 +795,7 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 <C>"-"				{ return('-'); }
 <C>"("				{ return('('); }
 <C>")"				{ return(')'); }
-<C,xskip>{space}	{ ECHO; }
+<C,xskip>{space}		{ ECHO; }
 <C>\{				{ return('{'); }
 <C>\}				{ return('}'); }
 <C>\[				{ return('['); }
@@ -1037,7 +1035,6 @@ cppline			{space}*#(.*\\{space})*.*{newline}
 							 if (strcmp(old, ptr->old) == 0)
 							 {
 								free(ptr->new);
-								/* ptr->new = mm_strdup(scanstr(literalbuf));*/
 								ptr->new = mm_strdup(literalbuf);
 							 }
 						}