===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.4
retrieving revision 1.15
diff -u -p -r1.4 -r1.15
--- OpenXM_contrib2/asir2000/parse/pvar.c	2000/09/21 09:19:27	1.4
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2005/10/26 07:33:03	1.15
@@ -45,26 +45,48 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.3 2000/08/22 05:04:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.14 2003/11/12 07:01:38 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 NODE PVSS;
+extern char *CUR_FUNC;
+int gdef,mgdef,ldef;
 
-void mkpvs()
- {
+
+void mkpvs(char *fname)
+{
 	VS pvs;
+	char *fullname;
+	FUNC f;
 
+	if ( CUR_MODULE ) {
+		/* function must be declared in advance */
+		searchf(CUR_MODULE->usrf_list,fname,&f);
+		if ( !f ) {
+			fprintf(stderr,"\"%s\", near line %d: undeclared function `%s'",
+				asir_infile->name,asir_infile->ln,fname);
+			error("");
+		}
+	}
 	pvs = (VS)MALLOC(sizeof(struct oVS));
 	pvs->va = (struct oPV *)MALLOC(DEFSIZE*sizeof(struct oPV));
 	pvs->n = 0;
 	pvs->asize=DEFSIZE;
 	CPVS = pvs; 
+
+	/* XXX */
+	if ( CUR_MODULE ) {
+		fullname = 
+			(char *)MALLOC_ATOMIC(strlen(CUR_MODULE->name)+strlen(fname)+1);
+		sprintf(fullname,"%s.%s",CUR_MODULE->name,fname);
+		CUR_FUNC = fullname;
+	} else
+		CUR_FUNC = fname;
 }
 
-void pushpvs(f)
-FUNC f;
+void pushpvs(FUNC f)
 {
 	VS pvs;
 	NODE node;
@@ -101,50 +123,168 @@ void poppvs() {
 		nextbplevel--;
 }
 
-int gdef;
+#define IS_LOCAL 0
+#define IS_GLOBAL 1
+#define IS_MGLOBAL 2
+#define IS_PATTERN 3
 
-int makepvar(str)
-char *str;
+
+unsigned int makepvar(char *str)
 {
-	int c;
+	int c,c1,created;
 
-	c = getpvar(CPVS,str,0);
-	if ( gdef ) {
+	if ( str[0] == '_' ) {
+		/* pattern variable */
+		c1 = getpvar(PPVS,str,0);
+		c = PVPATTERN((unsigned int)c1);
+		PPVS->va[c1].attr = IS_PATTERN;
+	} else if ( gdef ) {
+		/* EPVS : global list of the current file */
+		/* add to the local variable list */
+		/* also add to the external variable list */
+		c = getpvar(CPVS,str,0);
 		getpvar(EPVS,str,0);
+		if ( CUR_MODULE ) {
+			c1 = getpvar(CUR_MODULE->pvs,str,1);
+			if ( c1 >= 0 ) goto CONFLICTION;
+		}
 		if ( CPVS != GPVS ) {
+			/* inside function : we add the name to the global list */
 			getpvar(GPVS,str,0);
-			CPVS->va[c].attr = 1;
+			CPVS->va[c].attr = IS_GLOBAL;
 		}
-	} else if ( (CPVS != GPVS) && 
-		(CPVS->va[c].attr || (getpvar(EPVS,str,1) >= 0)) ) {
-		CPVS->va[c].attr = 1;
-		c = (getpvar(GPVS,str,1)|MSB);
+	} else if ( mgdef ) {
+		c = getpvar(CPVS,str,0);
+		getpvar(CUR_MODULE->pvs,str,0);
+		c1 = getpvar(EPVS,str,1);
+		if ( c1 >= 0 ) goto CONFLICTION;
+		if ( CPVS != GPVS ) {
+			/* inside function */
+			CPVS->va[c].attr = IS_MGLOBAL;
+		}
+	} else if ( ldef > 0 ) {
+		/* if ldef > 0, then local variables are being declared */
+		c = getpvar(CPVS,str,0);
+		c1 = getpvar(EPVS,str,1);
+		if ( c1 >= 0 ) {
+			if ( CUR_MODULE )
+				goto CONFLICTION;
+			else {
+				fprintf(stderr,"Warning: \"%s\", near line %d: conflicting declarations for `%s'\n",
+					asir_infile->name,asir_infile->ln,str);
+				fprintf(stderr,"         `%s' is bound to the global variable\n",str);
+				CPVS->va[c].attr = IS_GLOBAL;
+				c1 = getpvar(GPVS,str,1); c = PVGLOBAL((unsigned int)c1);
+			}
+		} else {
+			if ( CUR_MODULE ) {
+				c1 = getpvar(CUR_MODULE->pvs,str,1);
+			}
+			if ( c1 >= 0 ) goto CONFLICTION;
+			CPVS->va[c].attr = IS_LOCAL;
+		}
+	} else if ( CPVS != GPVS ) {
+		/* inside function */
+		if ( CUR_MODULE ) {
+			/* search only */
+			c = getpvar(CPVS,str,1);
+			if ( c < 0 ) {
+				c = getpvar(CPVS,str,0);
+				created = 1;		
+			} else
+				created = 0;
+		} else {
+			/* may be created */
+			c = getpvar(CPVS,str,0);
+		}
+		switch ( CPVS->va[c].attr ) {
+			case IS_GLOBAL:
+				c1 = getpvar(GPVS,str,1); c = PVGLOBAL((unsigned int)c1);
+				break;
+			case IS_MGLOBAL:
+				c1 = getpvar(CUR_MODULE->pvs,str,1); c = PVMGLOBAL((unsigned int)c1);
+				break;
+			case IS_LOCAL:
+			default:
+				if ( CUR_MODULE && 
+					((c1 = getpvar(CUR_MODULE->pvs,str,1)) >= 0) ) {
+					CPVS->va[c].attr = IS_MGLOBAL;
+					c = PVMGLOBAL((unsigned int)c1);
+				} else if ( getpvar(EPVS,str,1) >= 0 ) {
+					CPVS->va[c].attr = IS_GLOBAL;
+					c1 = getpvar(GPVS,str,1); c = PVGLOBAL((unsigned int)c1);
+				} else if ( CUR_MODULE && created && (ldef == 0) ) {
+					/* not declared */
+					/* if ldef == 0, at least one local variables has been
+					   declared */
+					fprintf(stderr,
+						"Warning: \"%s\", near line %d: undeclared local variable `%s'\n",
+						asir_infile->name,asir_infile->ln,str);
+				}
+				break;
+		}
+	} else if ( CUR_MODULE ) {
+		/* outside function, inside module */
+		if ( (c = getpvar(CUR_MODULE->pvs,str,1)) >= 0 )
+			c = PVMGLOBAL((unsigned int)c);
+		else if ( getpvar(EPVS,str,1) >= 0 ) {
+			c = getpvar(GPVS,str,1);
+			c = PVGLOBAL((unsigned int)c);
+		} else {
+			/* not declared as static or extern */
+			fprintf(stderr,"\"%s\", near line %d: undeclared variable `%s'",
+				asir_infile->name,asir_infile->ln,str);
+			error("");
+		}
+	} else {
+		/* outside function, outside module */
+		c = getpvar(GPVS,str,0);
 	}
 	return c;
+
+CONFLICTION:
+	fprintf(stderr,"\"%s\", near line %d: conflicting declarations for `%s'",
+		asir_infile->name,asir_infile->ln,str);
+	error("");
 }
 
 extern FUNC parse_targetf;
 
-int searchpvar(str)
-char *str;
+int searchpvar(char *str)
 {
 	VS pvs;
-	int i;
+	MODULE mod;
+	int c;
 
 	if ( parse_targetf && parse_targetf->id != A_USR )
-		return -1;
-	pvs = parse_targetf ? parse_targetf->f.usrf->pvs : GPVS;
-	i = getpvar(pvs,str,1);
-	if ( ((i>=0)&&pvs->va[i].attr) || (i<0) )
-		return getpvar(GPVS,str,1)|MSB;
-	else
-		return i;
+		c = -1;
+	else if ( parse_targetf ) {
+		pvs = parse_targetf->f.usrf->pvs;
+		mod = parse_targetf->f.usrf->module;
+		if ( (c = getpvar(pvs,str,1)) >= 0 ) {
+			switch ( pvs->va[c].attr ) {
+				case IS_GLOBAL:
+					c = getpvar(GPVS,str,1);
+					c = PVGLOBAL((unsigned int)c);
+					break;
+				case IS_MGLOBAL:
+					c = getpvar(mod->pvs,str,1);
+					c = PVMGLOBAL((unsigned int)c);
+					break;
+				default:
+					break;
+			}
+		} else if ( mod && (c = getpvar(mod->pvs,str,1)) >= 0 )
+			c = PVMGLOBAL((unsigned int)c);
+		else if ( (c = getpvar(GPVS,str,1)) >= 0 )
+			c = PVGLOBAL((unsigned int)c);
+		else
+			c = -1;
+	}
+	return c;
 }
 
-int getpvar(pvs,str,searchonly)
-VS pvs;
-char *str;
-int searchonly;
+int getpvar(VS pvs,char *str,int searchonly)
 {
 	struct oPV *va;
 	PV v;
@@ -160,7 +300,7 @@ int searchonly;
 	v = &pvs->va[pvs->n]; 
 	NAME(v) = (char *)CALLOC(strlen(str)+1,sizeof(char));
 	strcpy(NAME(v),str); v->priv = 0;
-	v->attr= 0; v->type = -1; i = pvs->n; pvs->n++;
+	v->attr= IS_LOCAL; v->type = -1; i = pvs->n; pvs->n++;
 	return i;
 }
 
@@ -175,19 +315,10 @@ void closecurrentinput()
 	if ( asir_infile && !asir_infile->fp )
 		return;
 
-#if defined(THINK_C) || defined(VISUAL)
-#if defined(THINK_C)
-	void setDir(short);
-
+#if defined(VISUAL)
 	fclose(asir_infile->fp); 
-	setDir(asir_infile->vol);
 	unlink(asir_infile->tname);
-	resetDir();
 #else
-	fclose(asir_infile->fp); 
-	unlink(asir_infile->tname);
-#endif
-#else
 	PCLOSE(asir_infile->fp);
 #endif
 	asir_infile = NEXT(asir_infile);
@@ -197,7 +328,8 @@ void closecurrentinput()
 void resetpvs()
 {
 	if ( !NEXT(asir_infile) ) {
-		PVSS = 0; CPVS = GPVS; nextbp = 0;
+		PVSS = 0; CPVS = GPVS; MPVS = 0; CUR_MODULE = 0; nextbp = 0;
+		gdef = mgdef = ldef = 0;
 		if ( EPVS->va ) {
 			bzero((char *)EPVS->va,(int)(EPVS->asize*sizeof(struct oPV))); EPVS->n = 0;
 		}
@@ -224,52 +356,9 @@ void restorepvs()
 	nextbplevel = saved_nextbplevel;
 }
 
-void storeans(p)
-pointer p;
+void storeans(pointer p)
 {
 	if ( APVS->asize == APVS->n )
 		reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
 	APVS->va[APVS->n++].priv = p; 
 }
-
-#if 0
-pointer evalpv(id,tree,f)
-int id;
-NODE2 tree;
-pointer f;
-{
-	pointer a,val = 0;
-	pointer *addr;
-	int pv;
-	NODE ind,tn;
-
-	switch ( id ) {
-		case I_PRESELF:
-			getmemberp((FNODE)tree,(Obj **)&addr);
-			(*((ARF)f)->fp)(CO,*addr,ONE,&val); *addr = val; break;
-		case I_POSTSELF:
-			getmemberp((FNODE)tree,(Obj **)&addr);
-			val = *addr; (*((ARF)f)->fp)(CO,*addr,ONE,&a); *addr = a; break;
-		case I_PVAR:
-			pv = (int)BDY1(tree); ind = (NODE)BDY2(tree); GETPV(pv,a);
-			if ( !ind )
-				val = a;
-			else {
-				evalnodebody(ind,&tn); getarray(a,tn,&val); 
-			}
-			break;
-		case I_ASSPVAR:
-			pv = (int)BDY1(tree); ind = (NODE)BDY2(tree);
-			if ( !ind ) {
-				val = eval(f); ASSPV(pv,val);
-			} else {
-				GETPV(pv,a);
-				if ( a ) { 
-					evalnodebody(ind,&tn); putarray(a,tn,val = eval(f)); 
-				}
-			}
-			break;
-	}
-	return val;
-}
-#endif