===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.9
retrieving revision 1.17
diff -u -p -r1.9 -r1.17
--- OpenXM_contrib2/asir2000/parse/pvar.c	2003/05/14 09:18:38	1.9
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2006/03/11 23:14:53	1.17
@@ -45,22 +45,45 @@
  * 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.8 2003/05/14 07:08:48 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.16 2006/02/08 02:11:19 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,*buf;
+	FUNC f;
 
+	if ( CUR_MODULE ) {
+		/* function must be declared in advance */
+		searchf(CUR_MODULE->usrf_list,fname,&f);
+		if ( !f ) {
+			buf = ALLOCA(strlen("undeclared function "+strlen(fname)+10));
+			sprintf(buf,"undeclared function `%s'",fname);
+			yyerror(buf);
+		}
+	}
 	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(FUNC f)
@@ -100,22 +123,32 @@ void poppvs() {
 		nextbplevel--;
 }
 
-int gdef,mgdef;
-
 #define IS_LOCAL 0
 #define IS_GLOBAL 1
 #define IS_MGLOBAL 2
+#define IS_PATTERN 3
 
+
 unsigned int makepvar(char *str)
 {
-	int c,c1;
+	int c,c1,created;
+	char *buf;
 
-	/* EPVS : global list of the current file */
-	/* add to the local variable list */
-	if ( gdef ) {
-		/* add to the external variable list */
+	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);
@@ -124,13 +157,47 @@ unsigned int makepvar(char *str)
 	} 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 */
-		c = getpvar(CPVS,str,0);
+		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);
@@ -147,6 +214,13 @@ unsigned int makepvar(char *str)
 				} 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;
 		}
@@ -159,13 +233,20 @@ unsigned int makepvar(char *str)
 			c = PVGLOBAL((unsigned int)c);
 		} else {
 			/* not declared as static or extern */
-			error("Undeclared variable in a module.");
+			buf = ALLOCA(strlen("undeclared variable"+strlen(str)+10));
+			sprintf(buf,"undeclared variable `%s'",str);
+			yyerror(buf);
 		}
 	} else {
 		/* outside function, outside module */
 		c = getpvar(GPVS,str,0);
 	}
 	return c;
+
+CONFLICTION:
+	buf = ALLOCA(strlen("conflicting declarations for "+strlen(str)+10));
+	sprintf(buf,"conflicting declarations for `%s'",str);
+	yyerror(buf);
 }
 
 extern FUNC parse_targetf;
@@ -239,7 +320,8 @@ void closecurrentinput()
 	fclose(asir_infile->fp); 
 	unlink(asir_infile->tname);
 #else
-	PCLOSE(asir_infile->fp);
+	if ( asir_infile->fp != stdin )
+		PCLOSE(asir_infile->fp);
 #endif
 	asir_infile = NEXT(asir_infile);
 	resetpvs();
@@ -247,8 +329,9 @@ void closecurrentinput()
 
 void resetpvs()
 {
-	if ( !NEXT(asir_infile) ) {
+	if ( asir_infile && !NEXT(asir_infile) ) {
 		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;
 		}