===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/comp.c,v
retrieving revision 1.4
retrieving revision 1.10
diff -u -p -r1.4 -r1.10
--- OpenXM_contrib2/asir2000/parse/comp.c	2000/12/05 01:24:56	1.4
+++ OpenXM_contrib2/asir2000/parse/comp.c	2015/08/14 13:51:56	1.10
@@ -45,12 +45,12 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/comp.c,v 1.3 2000/08/22 05:04:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/comp.c,v 1.9 2015/08/06 10:01:53 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "comp.h"
-#if defined(VISUAL)
+#if defined(__GNUC__) || defined(VISUAL) || defined(__MINGW32__) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -58,12 +58,13 @@
 
 extern f_return;
 
-#if defined(VISUAL)
+#if defined(__GNUC__) || defined(VISUAL) || defined(__MINGW32__) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 void call_usrf(FUNC f,...)
 {
 	va_list ap;
 	int ac,i;
 	pointer *c;
+	VS prev_mpvs;
 	NODE tn;
 
 	va_start(ap,f);
@@ -71,6 +72,10 @@ void call_usrf(FUNC f,...)
 		notdef(0,0,0,0);
 	else {
 		pushpvs(f);
+		if ( f->f.usrf->module ) {
+			prev_mpvs = MPVS;
+			MPVS = f->f.usrf->module->pvs;
+		}
 		ac = va_arg(ap,int);
 		for ( i = 0, tn = f->f.usrf->args; i < ac;
 			i++, tn = NEXT(tn) )
@@ -78,6 +83,8 @@ void call_usrf(FUNC f,...)
 		c = va_arg(ap,pointer *); *c = evalstat(BDY(f->f.usrf));
 		va_end(ap);
 		f_return = 0; poppvs();
+		if ( f->f.usrf->module )
+			MPVS = prev_mpvs;
 	}
 }
 #else
@@ -88,6 +95,7 @@ va_dcl
 	int ac,i;
 	FUNC f;
 	pointer a,b,*c;
+	VS prev_mpvs;
 	NODE tn;
 
 	va_start(ap); f = va_arg(ap,FUNC);
@@ -95,12 +103,18 @@ va_dcl
 		notdef(0,0,0,0);
 	else {
 		pushpvs(f);
+		if ( f->f.usrf->module ) {
+			prev_mpvs = MPVS;
+			MPVS = f->f.usrf->module->pvs;
+		}
 		ac = va_arg(ap,int);
 		for ( i = 0, tn = f->f.usrf->args; i < ac;
 			i++, tn = NEXT(tn) )
 			ASSPV((int)FA0((FNODE)BDY(tn)),va_arg(ap,pointer));
 		c = va_arg(ap,pointer *); *c = evalstat(BDY(f->f.usrf));
 		f_return = 0; poppvs();
+		if ( f->f.usrf->module )
+			MPVS = prev_mpvs;
 	}
 }
 #endif