===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.15
retrieving revision 1.23
diff -u -p -r1.15 -r1.23
--- OpenXM_contrib2/asir2000/parse/pvar.c	2005/10/26 07:33:03	1.15
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2017/02/07 08:30:31	1.23
@@ -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.14 2003/11/12 07:01:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.22 2015/08/14 13:51:56 fujimoto 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));
@@ -132,6 +133,7 @@ void poppvs() {
 unsigned int makepvar(char *str)
 {
 	int c,c1,created;
+	char *buf;
 
 	if ( str[0] == '_' ) {
 		/* pattern variable */
@@ -232,9 +234,9 @@ 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 */
@@ -243,9 +245,9 @@ unsigned int makepvar(char *str)
 	return c;
 
 CONFLICTION:
-	fprintf(stderr,"\"%s\", near line %d: conflicting declarations for `%s'",
-		asir_infile->name,asir_infile->ln,str);
-	error("");
+	buf = ALLOCA(strlen("conflicting declarations for "+strlen(str)+10));
+	sprintf(buf,"conflicting declarations for `%s'",str);
+	yyerror(buf);
 }
 
 extern FUNC parse_targetf;
@@ -296,7 +298,7 @@ int getpvar(VS pvs,char *str,int searchonly)
 	if ( searchonly )
 		return -1;
 	if ( pvs->asize == pvs->n )
-		reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));
+		asir_reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));
 	v = &pvs->va[pvs->n]; 
 	NAME(v) = (char *)CALLOC(strlen(str)+1,sizeof(char));
 	strcpy(NAME(v),str); v->priv = 0;
@@ -304,7 +306,7 @@ int getpvar(VS pvs,char *str,int searchonly)
 	return i;
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #define PCLOSE _pclose
 #else
 #define PCLOSE pclose
@@ -315,19 +317,19 @@ void closecurrentinput()
 	if ( asir_infile && !asir_infile->fp )
 		return;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	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 ) {
@@ -359,6 +361,6 @@ void restorepvs()
 void storeans(pointer p)
 {
 	if ( APVS->asize == APVS->n )
-		reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
+		asir_reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
 	APVS->va[APVS->n++].priv = p; 
 }