===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.12
retrieving revision 1.19
diff -u -p -r1.12 -r1.19
--- OpenXM_contrib2/asir2000/parse/pvar.c	2003/05/20 06:15:01	1.12
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2014/08/09 06:08:11	1.19
@@ -45,7 +45,7 @@
  * 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.11 2003/05/16 09:34:50 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.18 2006/06/21 09:46:06 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -58,16 +58,17 @@ int gdef,mgdef,ldef;
 void mkpvs(char *fname)
 {
 	VS pvs;
-	char *fullname;
+	char *fullname,*buf;
 	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("");
+			buf = ALLOCA(strlen("undeclared function "+strlen(fname)+10));
+			sprintf(buf,"undeclared function `%s'",fname);
+			yyerror(buf);
+			error("cannot continue to read inputs");
 		}
 	}
 	pvs = (VS)MALLOC(sizeof(struct oVS));
@@ -126,25 +127,28 @@ void poppvs() {
 #define IS_LOCAL 0
 #define IS_GLOBAL 1
 #define IS_MGLOBAL 2
+#define IS_PATTERN 3
 
 
 unsigned int makepvar(char *str)
 {
 	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 ) {
-				fprintf(stderr,"\"%s\", near line %d: conflicting declarations for `%s'",
-					asir_infile->name,asir_infile->ln,str);
-				error("");
-			}
+			if ( c1 >= 0 ) goto CONFLICTION;
 		}
 		if ( CPVS != GPVS ) {
 			/* inside function : we add the name to the global list */
@@ -155,11 +159,7 @@ unsigned int makepvar(char *str)
 		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 ( c1 >= 0 ) goto CONFLICTION;
 		if ( CPVS != GPVS ) {
 			/* inside function */
 			CPVS->va[c].attr = IS_MGLOBAL;
@@ -167,7 +167,24 @@ unsigned int makepvar(char *str)
 	} else if ( ldef > 0 ) {
 		/* if ldef > 0, then local variables are being declared */
 		c = getpvar(CPVS,str,0);
-		CPVS->va[c].attr = IS_LOCAL;
+		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 ) {
@@ -217,15 +234,20 @@ unsigned int makepvar(char *str)
 			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("");
+			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;
@@ -299,15 +321,15 @@ 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();
 }
 
 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 ) {