- Added missing braces to array parsing.

        - Set ecpg version to 3.1.1.
        - Removed that old debugging output that I forgot the last time.

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 1d72f794618bb7539165aef25d3cd90de26a8e5f..70a288fdf3ec7e7beeab4e9d5c59b90882dbdc78 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.94.2.2 2003/12/18 18:55:06 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.94.2.3 2004/02/15 13:50:02 meskes Exp $
 
 subdir = src/interfaces/ecpg/preproc
 top_builddir = ../../../..
@@ -6,7 +6,7 @@ include $(top_builddir)/src/Makefile.global
 
 MAJOR_VERSION=3
 MINOR_VERSION=1
-PATCHLEVEL=0
+PATCHLEVEL=1
 
 override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) \
        -DMAJOR_VERSION=$(MAJOR_VERSION) \

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 70cb84ae90dd8cabffc50f64634ee222b42fdbc3..babb2ac07098c2544a1baed4e7399aa768dfe279 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.122.2.1 2003/12/29 13:53:17 meskes Exp $
+ *       $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.122.2.2 2004/02/15 13:50:02 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -183,7 +183,7 @@ ident_cont          [A-Za-z\200-\377_0-9\$]
 
 identifier             {ident_start}{ident_cont}*
 
-array                  ({ident_cont}|{whitespace}|[\+\-\*\%\/\(\)])*
+array                  ({ident_cont}|{whitespace}|[\[\]\+\-\*\%\/\(\)])*
 typecast               "::"
 
 /*

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index b8fd28c46e5b376e700de8e9ef58429dd7fdeed0..bf5d468a9cab8732c4441172829bee0b5c195699 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.263.2.6 2004/01/21 14:11:03 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.263.2.7 2004/02/15 13:50:02 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -4630,7 +4630,6 @@ type_declaration: S_TYPEDEF
                char * dimension = $6.index1;
                char * length = $6.index2;
 
-printf("MM: %s\n", $5);
                if (($3.type_enum == ECPGt_struct ||
                     $3.type_enum == ECPGt_union) &&
                    initializer == 1)