===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- OpenXM_contrib2/asir2000/parse/pvar.c	2003/05/14 06:20:12	1.7
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2003/05/16 07:56:16	1.10
@@ -45,14 +45,15 @@
  * 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.6 2001/10/09 01:36:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.9 2003/05/14 09:18:38 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 NODE PVSS;
+extern char *CUR_FUNC;
 
-void mkpvs()
+void mkpvs(char *fname)
 {
 	VS pvs;
 
@@ -61,6 +62,9 @@ void mkpvs()
 	pvs->n = 0;
 	pvs->asize=DEFSIZE;
 	CPVS = pvs; 
+
+	/* XXX */
+	CUR_FUNC = fname;
 }
 
 void pushpvs(FUNC f)
@@ -106,29 +110,46 @@ int gdef,mgdef;
 #define IS_GLOBAL 1
 #define IS_MGLOBAL 2
 
+
 unsigned int makepvar(char *str)
 {
 	int c,c1;
 
 	/* EPVS : global list of the current file */
 	/* add to the local variable list */
-	c = getpvar(CPVS,str,0);
 	if ( gdef ) {
 		/* 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 ) {
+				fprintf(stderr,"\"%s\", near line %d: conflicting declarations for `%s'",
+					asir_infile->name,asir_infile->ln,str);
+				error("");
+			}
+		}
 		if ( CPVS != GPVS ) {
 			/* inside function : we add the name to the global list */
 			getpvar(GPVS,str,0);
 			CPVS->va[c].attr = IS_GLOBAL;
 		}
 	} else if ( mgdef ) {
+		c = getpvar(CPVS,str,0);
 		getpvar(CUR_MODULE->pvs,str,0);
+		c1 = getpvar(EPVS,str,1);
+		if ( c1 >= 0 ) {
+			fprintf(stderr,"\"%s\", near line %d: conflicting declarations for `%s'",
+				asir_infile->name,asir_infile->ln,str);
+			error("");
+		}
 		if ( CPVS != GPVS ) {
 			/* inside function */
 			CPVS->va[c].attr = IS_MGLOBAL;
 		}
 	} else if ( CPVS != GPVS ) {
 		/* inside function */
+		c = getpvar(CPVS,str,0);
 		switch ( CPVS->va[c].attr ) {
 			case IS_GLOBAL:
 				c1 = getpvar(GPVS,str,1); c = PVGLOBAL((unsigned int)c1);
@@ -148,6 +169,22 @@ unsigned int makepvar(char *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;
 }
@@ -232,7 +269,7 @@ 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;
 		if ( EPVS->va ) {
 			bzero((char *)EPVS->va,(int)(EPVS->asize*sizeof(struct oPV))); EPVS->n = 0;
 		}