Fixed two small bugs.

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index ce390f7461bc9da0d58988265d95f5b7730b3a3f..fc3c9440321e18defa921acbbe28e3a74ea38db8 100644 (file)
--- 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.114 2003/05/30 08:39:01 meskes Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.115 2003/06/16 16:58:10 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -618,7 +618,7 @@ cppline                     {space}*#(.*\\{space})+.*
                                                char* endptr;
 
                                                errno = 0;
-                                               yylval.ival = strtol((char *)yytext,&endptr,16);
+                                               yylval.ival = strtoul((char *)yytext,&endptr,16);
                                                if (*endptr != '\0' || errno == ERANGE)
                                                {
                                                        errno = 0;

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index fa622f314bdfeffd46879d207052f9844a4cee33..0bb41459031fce687dcce77bb7e650491a2a6a6d 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.231 2003/06/13 10:50:57 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.232 2003/06/16 16:58:11 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -630,15 +630,15 @@ stmt:  AlterDatabaseSetStmt               { output_statement($1, 0, connection); }
                | ECPGDeallocate
                {
                        if (connection)
-                               mmerror(PARSE_ERROR, ET_ERROR, "no at option for connect statement.\n");
-
-                       fputc('{', yyout);
-                       fputs($1, yyout);
+                               mmerror(PARSE_ERROR, ET_ERROR, "no at option for deallocate statement.\n");
+                       fprintf(yyout, "{ ECPGdeallocate(__LINE__, \"%s\");", $1);
                        whenever_action(2);
                        free($1);
                }
                | ECPGDeallocateDescr
                {
+                       if (connection)
+                               mmerror(PARSE_ERROR, ET_ERROR, "no at option for deallocate statement.\n");
                        fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
                        whenever_action(0);
                        free($1);
@@ -4294,9 +4294,9 @@ ECPGCursorStmt:  DECLARE name cursor_options CURSOR opt_hold FOR ident
  * prepared statement
  */
 ECPGDeallocate: DEALLOCATE PREPARE ident
-                       { $$ = cat_str(3, make_str("ECPGdeallocate(__LINE__, \""), $3, make_str("\");")); }
+                       { $$ = $3; }
                | DEALLOCATE ident
-                       { $$ = cat_str(2, make_str("ECPGdeallocate(__LINE__, \""), $2, make_str("\");")); }
+                       { $$ = $2; }
                ;
 
 /*