Commit5cbbdd2

Michael Meskes

committed

Applied yet another patch by Christof. Thanks Cristof!

Synced parser.

1 parentb0299c5 commit5cbbdd2Copy full SHA for 5cbbdd2

File tree

+147

-66

lines changed

+147

-66

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1013,5 +1013,11 @@ Fri Nov 3 11:34:43 CET 2000`
`1013`	`1013`	`Sat Nov 4 17:42:43 CET 2000`
`1014`	`1014`
`1015`	`1015`	`- Added patch by Christof Petig to fix several small bugs.`
	`1016`	`+`
	`1017`	`+Thu Nov 9 14:40:18 CET 2000`
	`1018`	`+`
	`1019`	`+- Synced gram.y and preproc.y.`
	`1020`	`+- Synced keyword.c.`
	`1021`	`+- Added just another patch by Christof Petig.`
`1016`	`1022`	`- Set ecpg version to 2.8.0.`
`1017`	`1023`	`- Set library version to 3.2.0.`

Lines changed: 27 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,30 @@`
`1`		`-#include"postgres.h"`
`2`		`-#include"libpq-fe.h"`
	`1`	`+/*`
	`2`	`+ * this is a small part of c.h since we don't want to leak all postgres`
	`3`	`+ * definitions into ecpg programs`
	`4`	`+ */`
	`5`	`+`
	`6`	`+#ifndef__BEOS__`
	`7`	`+#ifndef__cplusplus`
	`8`	`+#ifndefbool`
	`9`	`+#definebool char`
	`10`	`+#endif/* ndef bool */`
	`11`	`+#endif/* not C++ */`
	`12`	`+`
	`13`	`+#ifndeftrue`
	`14`	`+#definetrue ((bool) 1)`
	`15`	`+#endif`
	`16`	`+#ifndeffalse`
	`17`	`+#definebool char`
	`18`	`+#endif/* ndef bool */`
	`19`	`+#endif/* __BEOS__ */`
	`20`	`+`
	`21`	`+#ifndefTRUE`
	`22`	`+#defineTRUE 1`
	`23`	`+#endif/* TRUE */`
	`24`	`+`
	`25`	`+#ifndefFALSE`
	`26`	`+#defineFALSE 0`
	`27`	`+#endif/* FALSE */`
`3`	`28`
`4`	`29`	`#ifdef__cplusplus`
`5`	`30`	`extern"C"`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`staticScanKeywordScanKeywords[]= {`
`21`	`21`	`/* namevalue*/`
`22`	`22`	`{"allocate",SQL_ALLOCATE},`
`23`		`-{"at",SQL_AT},`
`24`	`23`	`{"autocommit",SQL_AUTOCOMMIT},`
`25`	`24`	`{"bool",SQL_BOOL},`
`26`	`25`	`{"break",SQL_BREAK},`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.31 2000/11/07 08:46:27 meskes Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.32 2000/11/09 14:06:57 meskes Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -38,11 +38,13 @@ static ScanKeyword ScanKeywords[] = {`
`38`	`38`	`{"aggregate",AGGREGATE},`
`39`	`39`	`{"all",ALL},`
`40`	`40`	`{"alter",ALTER},`
	`41`	`+{"analyse",ANALYSE},`
`41`	`42`	`{"analyze",ANALYZE},`
`42`	`43`	`{"and",AND},`
`43`	`44`	`{"any",ANY},`
`44`	`45`	`{"as",AS},`
`45`	`46`	`{"asc",ASC},`
	`47`	`+{"at",AT},`
`46`	`48`	`{"backward",BACKWARD},`
`47`	`49`	`{"before",BEFORE},`
`48`	`50`	`{"begin",BEGIN_TRANS},`
`@@ -60,6 +62,7 @@ static ScanKeyword ScanKeywords[] = {`
`60`	`62`	`{"character",CHARACTER},`
`61`	`63`	`{"characteristics",CHARACTERISTICS},`
`62`	`64`	`{"check",CHECK},`
	`65`	`+{"checkpoint",CHECKPOINT},`
`63`	`66`	`{"close",CLOSE},`
`64`	`67`	`{"cluster",CLUSTER},`
`65`	`68`	`{"coalesce",COALESCE},`

Comments

(0)