postgrespro
diff --git a/‎src/interfaces/ecpg/ChangeLog
Lines changed: 4 additions & 0 deletions b/‎src/interfaces/ecpg/ChangeLog
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/interfaces/ecpg/preproc/descriptor.c
Lines changed: 1 addition & 1 deletion b/‎src/interfaces/ecpg/preproc/descriptor.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/interfaces/ecpg/preproc/extern.h
Lines changed: 2 additions & 2 deletions b/‎src/interfaces/ecpg/preproc/extern.h
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/interfaces/ecpg/preproc/pgc.l
Lines changed: 2 additions & 16 deletions b/‎src/interfaces/ecpg/preproc/pgc.l
Lines changed: 2 additions & 16 deletions
@@ -1432,6 +1432,10 @@ Tue May 20 11:47:00 CEST 2003
 	- Reversed my fix for ifdef. It was the example, not ecpg which was
 	  incorrect.
 	- Changed DBPATH variable to PG_DBPATH.
+	
+Thu May 22 09:33:54 CEST 2003
+
+	- ecpg now recognizes named struct/union usage.
 	- Set ecpg version to 2.12.0.
 	- Set ecpg library to 3.4.2.
 	- Set pgtypes library to 1.0.0
 
@@ -192,7 +192,7 @@ output_get_descr(char *desc_name, char *index)
 				break;
 		}
 		fprintf(yyout, "%s,", get_dtype(results->value));
-		ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL);
+		ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL);
 	}
 	drop_assignments();
 	fputs("ECPGd_EODT);\n", yyout);
 
@@ -73,8 +73,8 @@ extern void add_descriptor(char *, char *);
 extern void drop_descriptor(char *, char *);
 extern struct descriptor *lookup_descriptor(char *, char *);
 extern struct variable *descriptor_variable(const char *name, int input);
-extern void add_variable(struct arguments **, struct variable *, struct variable *);
-extern void append_variable(struct arguments **, struct variable *, struct variable *);
+extern void add_variable(struct arguments **, struct variable *, char *i, struct variable *, char *);
+extern void append_variable(struct arguments **, struct variable *, char *, struct variable *, char *);
 extern void dump_variables(struct arguments *, int);
 extern struct typedefs *get_typedef(char *);
 extern void adjust_array(enum ECPGttype, char **, char **, char *, char *, int);
 
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.109 2003/05/20 11:05:27 meskes Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.110 2003/05/22 07:58:41 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -434,20 +434,6 @@ cppline			{space}*#(.*\\{space})+.*
 			  else
 				return yytext[0];
 			}
-<C>{informix_special}{struct} {
-				  /* are we simulating Informix? */
-				  if (compat == ECPG_COMPAT_INFORMIX)
-				  {
-				  	string_unput("typedef struct ");
-			  		BEGIN SQL;
-					return SQL_START;
-				  }
-				  else
-				  {
-					string_unput("struct ");
-				  	return S_ANYTHING;
-				  }
-}
 <SQL>{self}			{ /*
 					   * We may find a ';' inside a structure
 					   * definition in a TYPE or VAR statement.
@@ -905,7 +891,7 @@ cppline			{space}*#(.*\\{space})+.*
 
 <xskip>{other}		{ /* ignore */ }
 
-<xcond>{identifier}{space}*';' {
+<xcond>{identifier}{space}*";" {
 						if ( preproc_tos >= MAX_NESTED_IF-1 ) {
 							mmerror(PARSE_ERROR, ET_FATAL, "Too many nested 'EXEC SQL IFDEF' conditions");
 						}
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ output_get_descr(char desc_name, char index)`
`192`	`192`	`break;`
`193`	`193`	`}`
`194`	`194`	`fprintf(yyout, "%s,", get_dtype(results->value));`
`195`		`- ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL);`
	`195`	`+ ECPGdump_a_type(yyout, v->name, v->type, NULL, NULL, NULL, NULL, NULL, NULL, make_str("0"), NULL, NULL);`
`196`	`196`	`}`
`197`	`197`	`drop_assignments();`
`198`	`198`	`fputs("ECPGd_EODT);\n", yyout);`