Commit1ca0b6d

Michael Meskes

committed

Make sure a variable is no longer referenced when it is removed.

Fixed counting bug in parsing "->" operator.Removed that silly debugging function I accidently committed last night.

1 parent8de7241 commit1ca0b6dCopy full SHA for 1ca0b6d

File tree

+38

-12

lines changed

+38

-12

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1477,6 +1477,11 @@ Mon Jun 2 17:36:03 CEST 2003`
`1477`	`1477`	`Tue Jun 10 19:43:49 CEST 2003`
`1478`	`1478`
`1479`	`1479`	`- Fixed several small bugs.`
	`1480`	`+`
	`1481`	`+Wed Jun 11 08:30:41 CEST 2003`
	`1482`	`+`
	`1483`	`+- Make sure a variable is no longer referenced when it is removed.`
	`1484`	`+- Fixed counting bug in parsing "->" operator.`
`1480`	`1485`	`- Set ecpg version to 2.12.0.`
`1481`	`1486`	`- Set ecpg library to 3.4.2.`
`1482`	`1487`	`- Set pgtypes library to 1.0.0`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.229 2003/06/10 17:46:43 meskes Exp $*/`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.230 2003/06/11 06:39:12 meskes Exp $*/`
`2`	`2`
`3`	`3`	`/* Copyright comment*/`
`4`	`4`	`%{`
`@@ -48,14 +48,6 @@ static struct inf_compat_val`
`48`	`48`	`structinf_compat_val *next;`
`49`	`49`	`} *informix_val;`
`50`	`50`
`51`		`-voidmm(void)`
`52`		`-{`
`53`		`-int i,j;`
`54`		`-`
`55`		`-i=1;`
`56`		`-j=i+1;`
`57`		`-}`
`58`		`-`
`59`	`51`	`/*`
`60`	`52`	`* Handle parsing errors and warnings`
`61`	`53`	`*/`
`@@ -673,7 +665,6 @@ stmt: AlterDatabaseSetStmt{ output_statement($1, 0, connection); }`
`673`	`665`	`structcursor *ptr;`
`674`	`666`	`structarguments *p;`
`675`	`667`
`676`		`-mm();`
`677`	`668`	`for (ptr = cur; ptr !=NULL; ptr=ptr->next)`
`678`	`669`	`{`
`679`	`670`	`if (strcmp(ptr->name,$1) ==0)`
`@@ -2632,7 +2623,6 @@ DeclareCursorStmt: DECLARE name cursor_options CURSOR opt_hold FOR SelectStmt`
`2632`	`2623`	`this = (structcursor *) mm_alloc(sizeof(structcursor));`
`2633`	`2624`
`2634`	`2625`	`/* initial definition*/`
`2635`		`-mm();`
`2636`	`2626`	`this->next = cur;`
`2637`	`2627`	`this->name =$2;`
`2638`	`2628`	`this->connection = connection;`

Lines changed: 32 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ find_struct(char name, char next, char *end)`
`137`	`137`	`/* restore the name, we will need it later */`
`138`	`138`	`*next=c;`
`139`	`139`
`140`		`-returnfind_struct_member(name,end,p->type->u.element->u.members,p->brace_level);`
	`140`	`+returnfind_struct_member(name,++end,p->type->u.element->u.members,p->brace_level);`
`141`	`141`	`}`
`142`	`142`	`else`
`143`	`143`	`{`
`@@ -260,6 +260,37 @@ remove_variables(int brace_level)`
`260`	`260`	`{`
`261`	`261`	`if (p->brace_level >=brace_level)`
`262`	`262`	`{`
	`263`	`+/* is it still referenced by a cursor? */`
	`264`	`+structcursor*ptr;`
	`265`	`+`
	`266`	`+for (ptr=cur;ptr!=NULL;ptr=ptr->next)`
	`267`	`+{`
	`268`	`+structargumentsvarptr,prevvar;`
	`269`	`+`
	`270`	`+for (varptr=prevvar=ptr->argsinsert;varptr!=NULL;varptr=varptr->next)`
	`271`	`+{`
	`272`	`+if (p==varptr->variable)`
	`273`	`+{`
	`274`	`+/* remove from list */`
	`275`	`+if (varptr==ptr->argsinsert)`
	`276`	`+ptr->argsinsert=varptr->next;`
	`277`	`+else`
	`278`	`+prevvar->next=varptr->next;`
	`279`	`+}`
	`280`	`+}`
	`281`	`+for (varptr=ptr->argsresult;varptr!=NULL;varptr=varptr->next)`
	`282`	`+{`
	`283`	`+if (p==varptr->variable)`
	`284`	`+{`
	`285`	`+/* remove from list */`
	`286`	`+if (varptr==ptr->argsresult)`
	`287`	`+ptr->argsresult=varptr->next;`
	`288`	`+else`
	`289`	`+prevvar->next=varptr->next;`
	`290`	`+}`
	`291`	`+}`
	`292`	`+}`
	`293`	`+`
`263`	`294`	`/* remove it */`
`264`	`295`	`if (p==allvariables)`
`265`	`296`	`prev=allvariables=p->next;`

Comments

(0)