Fixed parser bug concerning octal numbers in single quotes.

Michael Meskes · Michael Meskes · commit 2fabb9938813 · 2002-06-17T13:23:27.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1265,6 +1265,11 @@ Wed Jun 12 14:04:11 CEST 2002
 
 	- Applied Lee Kindness' patch to fix one of memory allocation with
 	  floating point numbers.
+	
+Mon Jun 17 15:23:51 CEST 2002
+
+	- Fixed parser bug in pgc.l. Octal numbers in single quotes are now
+	  correctly handled.
 	- Set ecpg version to 2.10.0.
 	- Set library version to 3.4.0.
 
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.92 2002/05/20 09:29:41 meskes Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.93 2002/06/17 13:23:27 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -372,13 +372,13 @@ cppline			{space}*#(.*\\{space})*.*
 <xq>{xqstop}		{
 						BEGIN(state_before);
 						yylval.str = mm_strdup(literalbuf);
+						printf("MM: %s\n", yylval.str);
 						return SCONST;
 					}
 <xq>{xqdouble}		{ addlitchar('\''); }
 <xq>{xqinside}		{ addlit(yytext, yyleng); }
 <xq>{xqescape}  	{ addlit(yytext, yyleng); }
-<xq>{xqoctesc}		{ unsigned char c = strtoul(yytext+1, NULL, 8);
-                          addlitchar(c); }
+<xq>{xqoctesc}          { addlit(yytext, yyleng); }
 <xq>{xqcat}			{ /* ignore */ }
 
 <xq><<EOF>>			{ mmerror(PARSE_ERROR, ET_ERROR, "Unterminated quoted string"); }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.92 2002/05/20 09:29:41 meskes Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.93 2002/06/17 13:23:27 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -372,13 +372,13 @@ cppline {space}#(.\\{space}).`
`372`	`372`	`<xq>{xqstop} {`
`373`	`373`	`BEGIN(state_before);`
`374`	`374`	`yylval.str = mm_strdup(literalbuf);`
	`375`	`+ printf("MM: %s\n", yylval.str);`
`375`	`376`	`return SCONST;`
`376`	`377`	`}`
`377`	`378`	`<xq>{xqdouble} { addlitchar('\''); }`
`378`	`379`	`<xq>{xqinside} { addlit(yytext, yyleng); }`
`379`	`380`	`<xq>{xqescape} { addlit(yytext, yyleng); }`
`380`		`-<xq>{xqoctesc} { unsigned char c = strtoul(yytext+1, NULL, 8);`
`381`		`- addlitchar(c); }`
	`381`	`+<xq>{xqoctesc} { addlit(yytext, yyleng); }`
`382`	`382`	`<xq>{xqcat} { /* ignore */ }`
`383`	`383`
`384`	`384`	`<xq><<EOF>> { mmerror(PARSE_ERROR, ET_ERROR, "Unterminated quoted string"); }`