*** empty log message ***

Michael Meskes · Michael Meskes · commit 7cf0f634d52e · 1999-12-08T09:52:29.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -730,3 +730,10 @@ Fri Dec  3 16:35:07 CET 1999
 
 	- Fixed memory leak in ecpglib.
 	- Set library version to 3.0.8.
+
+Wed Dec  8 08:26:13 CET 1999
+
+	- Synced preproc.y with gram.y.
+	- Clean up error handling.
+        - Set ecpg version to 2.6.11.
+
diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
@@ -10,6 +10,9 @@ DESCRIPTOR statement will be ignored.
 If a NOTICE message is given by the backend it should not be printed to
 stderr. Instead it should be listed as a warning.
 
+The error handling has to be improved by adding additional error-rules to
+the parser.
+
 it would be nice to be able to use :var[:index] as cvariable
 
 support for dynamic SQL with unknown number of variables with DESCRIPTORS
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -3,11 +3,11 @@ include $(SRCDIR)/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=6
-PATCHLEVEL=10
+PATCHLEVEL=11
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-	-DINCLUDE_PATH=\"$(HEADERDIR)\"
+	-DINCLUDE_PATH=\"$(HEADERDIR)\" -g
 
 OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o \
     keywords.o c_keywords.o ../lib/typename.o
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
@@ -12,7 +12,7 @@
 #include "extern.h"
 
 struct _include_path *include_paths;
-int			autocommit = 0;
+int		ret_value = OK, autocommit = 0;
 struct cursor *cur = NULL;
 struct typedefs *types = NULL;
 
@@ -215,5 +215,5 @@ main(int argc, char *const argv[])
 			free(input_filename);
 		}
 	}
-	return OK;
+	return ret_value;
 }
diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h
@@ -5,8 +5,9 @@
 /* variables */
 
 extern int	braces_open,
-			autocommit,
-			struct_level;
+		autocommit,
+		ret_value,
+		struct_level;
 extern char *yytext,
 			errortext[128];
 extern int	yylineno,
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.19 1999/10/15 19:02:08 meskes Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.20 1999/12/08 09:52:29 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -220,6 +220,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"stdin", STDIN},
 	{"stdout", STDOUT},
 	{"substring", SUBSTRING},
+	{"sysid", SYSID},
 	{"table", TABLE},
 	{"temp", TEMP},
 	{"temporary", TEMPORARY},
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include "extern.h"`
`13`	`13`
`14`	`14`	`struct _include_path *include_paths;`
`15`		`-int autocommit = 0;`
	`15`	`+int ret_value = OK, autocommit = 0;`
`16`	`16`	`struct cursor *cur = NULL;`
`17`	`17`	`struct typedefs *types = NULL;`
`18`	`18`
`@@ -215,5 +215,5 @@ main(int argc, char *const argv[])`
`215`	`215`	`free(input_filename);`
`216`	`216`	`}`
`217`	`217`	`}`
`218`		`- return OK;`
	`218`	`+ return ret_value;`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.19 1999/10/15 19:02:08 meskes Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.20 1999/12/08 09:52:29 meskes Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -220,6 +220,7 @@ static ScanKeyword ScanKeywords[] = {`
`220`	`220`	`{"stdin", STDIN},`
`221`	`221`	`{"stdout", STDOUT},`
`222`	`222`	`{"substring", SUBSTRING},`
	`223`	`+ {"sysid", SYSID},`
`223`	`224`	`{"table", TABLE},`
`224`	`225`	`{"temp", TEMP},`
`225`	`226`	`{"temporary", TEMPORARY},`