- Fixed variable handling for struct members.

Michael Meskes · Michael Meskes · commit 7138a1e5fc03 · 2002-01-13T08:52:09.000Z
- Removed check for array input. An attribut might store the
          complete array.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1201,5 +1201,11 @@ Fri Jan 11 15:43:39 CET 2002
 
 	- clear sqlca on : [de]allocate descriptor  & get descriptor and set
 	  sqlca.sqlerrd[2] accordingly (Christof).
+
+Sat Jan 12 22:04:02 CET 2002
+
+	- Fixed variable handling for struct members.
+	- Removed check for array input. An attribut might store the
+	  complete array.
 	- Set ecpg version to 2.9.0.
         - Set library version to 3.3.0.
diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.35 2002/01/08 14:25:04 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.36 2002/01/13 08:52:08 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -486,14 +486,15 @@ ECPGstore_input(const struct statement * stmt, const struct variable * var,
 	char	   *newcopy = NULL;
 
 	/* 
-	 * arrays are not possible 
+	 * arrays are not possible unless the attribute is an array too
+	 * FIXME: we do not know if the attribute is an array here
 	 */
-	 
-	 if (var->arrsize > 1)
+
+/*	 if (var->arrsize > 1 && ...)
 	 {
 		ECPGraise(stmt->lineno, ECPG_ARRAY_INSERT, NULL);
 		return false;
-	 }
+	 }*/
 	 
 	/*
 	 * Some special treatment is needed for records since we want their
diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h
@@ -75,7 +75,7 @@ extern void adjust_array(enum ECPGttype, int *, int *, int, int, int);
 extern void reset_variables(void);
 extern void check_indicator(struct ECPGtype *);
 extern void remove_variables(int);
-extern struct variable *new_variable(const char *, struct ECPGtype *);
+extern struct variable *new_variable(const char *, struct ECPGtype *, int);
 extern ScanKeyword *ScanKeywordLookup(char *text);
 
 /* return codes */
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -4417,7 +4417,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_initializer
 			}
 
 			if (struct_level == 0)
-				new_variable($2, type);
+				new_variable($2, type, braces_open);
 			else
 				ECPGmake_struct_member($2, type, &(struct_member_list[struct_level - 1]));
 
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
@@ -5,13 +5,13 @@
 struct variable *allvariables = NULL;
 
 struct variable *
-new_variable(const char *name, struct ECPGtype * type)
+new_variable(const char *name, struct ECPGtype * type, int brace_level)
 {
 	struct variable *p = (struct variable *) mm_alloc(sizeof(struct variable));
 
 	p->name = mm_strdup(name);
 	p->type = type;
-	p->brace_level = braces_open;
+	p->brace_level = brace_level;
 
 	p->next = allvariables;
 	allvariables = p;
@@ -20,7 +20,7 @@ new_variable(const char *name, struct ECPGtype * type)
 }
 
 static struct variable *
-find_struct_member(char *name, char *str, struct ECPGstruct_member * members)
+find_struct_member(char *name, char *str, struct ECPGstruct_member * members, int brace_level)
 {
 	char	   *next = strchr(++str, '.'),
 				c = '\0';
@@ -41,12 +41,12 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member * members)
 				switch (members->type->type)
 				{
 					case ECPGt_array:
-						return (new_variable(name, ECPGmake_array_type(members->type->u.element, members->type->size)));
+						return (new_variable(name, ECPGmake_array_type(members->type->u.element, members->type->size), brace_level));
 					case ECPGt_struct:
 					case ECPGt_union:
-						return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->struct_sizeof)));
+						return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->struct_sizeof), brace_level));
 					default:
-						return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size)));
+						return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size), brace_level));
 				}
 			}
 			else
@@ -55,10 +55,10 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member * members)
 				if (c == '-')
 				{
 					next++;
-					return (find_struct_member(name, next, members->type->u.element->u.members));
+					return (find_struct_member(name, next, members->type->u.element->u.members, brace_level));
 				}
 				else
-					return (find_struct_member(name, next, members->type->u.members));
+					return (find_struct_member(name, next, members->type->u.members, brace_level));
 			}
 		}
 	}
@@ -94,7 +94,7 @@ find_struct(char *name, char *next)
 		*next = c;
 		next++;
 
-		return find_struct_member(name, next, p->type->u.element->u.members);
+		return find_struct_member(name, next, p->type->u.element->u.members, p->brace_level);
 	}
 	else
 	{
@@ -107,7 +107,7 @@ find_struct(char *name, char *next)
 		/* restore the name, we will need it later on */
 		*next = c;
 
-		return find_struct_member(name, next, p->type->u.members);
+		return find_struct_member(name, next, p->type->u.members, p->brace_level);
 	}
 }
 
diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc
@@ -1,7 +1,5 @@
 #include <string.h>
 
-exec sql include sqlca;
-
 /* just a test comment */ exec sql whenever sqlerror do PrintAndStop(msg);
 exec sql whenever sqlwarning do warn();
 

Original file line number	Diff line number	Diff line change
`@@ -4417,7 +4417,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_initializer`
`4417`	`4417`	`}`
`4418`	`4418`
`4419`	`4419`	`if (struct_level == 0)`
`4420`		`- new_variable($2, type);`
	`4420`	`+ new_variable($2, type, braces_open);`
`4421`	`4421`	`else`
`4422`	`4422`	`ECPGmake_struct_member($2, type, &(struct_member_list[struct_level - 1]));`
`4423`	`4423`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`	`struct variable *allvariables = NULL;`
`6`	`6`
`7`	`7`	`struct variable *`
`8`		`-new_variable(const char name, struct ECPGtype type)`
	`8`	`+new_variable(const char name, struct ECPGtype type, int brace_level)`
`9`	`9`	`{`
`10`	`10`	`struct variable p = (struct variable ) mm_alloc(sizeof(struct variable));`
`11`	`11`
`12`	`12`	`p->name = mm_strdup(name);`
`13`	`13`	`p->type = type;`
`14`		`- p->brace_level = braces_open;`
	`14`	`+ p->brace_level = brace_level;`
`15`	`15`
`16`	`16`	`p->next = allvariables;`
`17`	`17`	`allvariables = p;`
`@@ -20,7 +20,7 @@ new_variable(const char name, struct ECPGtype type)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`static struct variable *`
`23`		`-find_struct_member(char name, char str, struct ECPGstruct_member * members)`
	`23`	`+find_struct_member(char name, char str, struct ECPGstruct_member * members, int brace_level)`
`24`	`24`	`{`
`25`	`25`	`char *next = strchr(++str, '.'),`
`26`	`26`	`c = '\0';`
`@@ -41,12 +41,12 @@ find_struct_member(char name, char str, struct ECPGstruct_member * members)`
`41`	`41`	`switch (members->type->type)`
`42`	`42`	`{`
`43`	`43`	`case ECPGt_array:`
`44`		`- return (new_variable(name, ECPGmake_array_type(members->type->u.element, members->type->size)));`
	`44`	`+ return (new_variable(name, ECPGmake_array_type(members->type->u.element, members->type->size), brace_level));`
`45`	`45`	`case ECPGt_struct:`
`46`	`46`	`case ECPGt_union:`
`47`		`- return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->struct_sizeof)));`
	`47`	`+ return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->struct_sizeof), brace_level));`
`48`	`48`	`default:`
`49`		`- return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size)));`
	`49`	`+ return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size), brace_level));`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`else`
`@@ -55,10 +55,10 @@ find_struct_member(char name, char str, struct ECPGstruct_member * members)`
`55`	`55`	`if (c == '-')`
`56`	`56`	`{`
`57`	`57`	`next++;`
`58`		`- return (find_struct_member(name, next, members->type->u.element->u.members));`
	`58`	`+ return (find_struct_member(name, next, members->type->u.element->u.members, brace_level));`
`59`	`59`	`}`
`60`	`60`	`else`
`61`		`- return (find_struct_member(name, next, members->type->u.members));`
	`61`	`+ return (find_struct_member(name, next, members->type->u.members, brace_level));`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -94,7 +94,7 @@ find_struct(char name, char next)`
`94`	`94`	`*next = c;`
`95`	`95`	`next++;`
`96`	`96`
`97`		`- return find_struct_member(name, next, p->type->u.element->u.members);`
	`97`	`+ return find_struct_member(name, next, p->type->u.element->u.members, p->brace_level);`
`98`	`98`	`}`
`99`	`99`	`else`
`100`	`100`	`{`
`@@ -107,7 +107,7 @@ find_struct(char name, char next)`
`107`	`107`	`/* restore the name, we will need it later on */`
`108`	`108`	`*next = c;`
`109`	`109`
`110`		`- return find_struct_member(name, next, p->type->u.members);`
	`110`	`+ return find_struct_member(name, next, p->type->u.members, p->brace_level);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`