===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/util.c,v
retrieving revision 1.7
retrieving revision 1.15
diff -u -p -r1.7 -r1.15
--- OpenXM_contrib2/asir2000/parse/util.c	2001/06/04 02:49:48	1.7
+++ OpenXM_contrib2/asir2000/parse/util.c	2005/10/19 04:51:15	1.15
@@ -45,20 +45,19 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/util.c,v 1.6 2000/12/11 09:28:03 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/util.c,v 1.14 2005/09/14 02:48:38 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
 #include "parse.h"
-#if defined(VISUAL) || (defined(__MACH__) && defined(__ppc__))
+#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 #include <ctype.h>
 
-int length(n)
-NODE n;
+int length(NODE n)
 {
 	int i;
 
@@ -66,8 +65,7 @@ NODE n;
 	return i;
 }
 
-int argc(a)
-NODE a;
+int argc(NODE a)
 {
 	int i;
 
@@ -75,17 +73,15 @@ NODE a;
 	return ( i );
 }
 
-void stoarg(s,acp,av)
-char *s;
-int *acp;
-char **av;
+void stoarg(char *s,int *acp,char **av)
 {
 	int i;
 
 	for ( i = 0; ; i++ ) {
-		for ( ; *s && isspace(*s); s++ );
+		for ( ; *s && isspace((unsigned char)*s); s++ );
 		if ( *s ) {
-			for ( av[i] = s; *s && !isspace(*s); s++ );
+			for ( av[i] = s; *s && 
+				!isspace((unsigned char)*s); s++ );
 			if ( *s )
 				*s++ = 0;
 		} else {
@@ -96,9 +92,7 @@ char **av;
 }
 
 #if 0
-unsigned int ator(addr,r)
-unsigned int addr;
-Obj *r;
+unsigned int ator(unsigned int addr,Obj *r)
 {
 	N n;
 	Q q;
@@ -115,13 +109,10 @@ Obj *r;
 }
 #endif
 
-void getarray(a,ind,vp)
-pointer a;
-NODE ind;
-pointer *vp;
+void getarray(pointer a,NODE ind,pointer *vp)
 {
-	Obj len,row,col;
-	int i,l;
+	Obj len,row,col,trg;
+	int i;
 	NODE n,n0;
 	VECT v;
 	Q q;
@@ -167,6 +158,17 @@ pointer *vp;
 					a = (pointer)v;
 				}
 				break;
+			case O_IMAT:
+				row = (Obj)BDY(ind);
+				ind = NEXT(ind);
+				col = (Obj)BDY(ind);
+				if ( ((IMAT)a)->row < QTOS((Q)row) ||
+					((IMAT)a)->col < QTOS((Q)col) ||
+					(QTOS((Q)row) < 0) || (QTOS((Q)col) < 0))
+						error("putarray : Out of range");
+				GetIbody((IMAT)a, QTOS((Q)row), QTOS((Q)col), (Obj*)&trg);
+				a = (pointer)trg;
+				break;
 			case O_LIST:
 				n0 = BDY((LIST)a); i = QTOS((Q)BDY(ind));
 				if ( i < 0 )
@@ -185,13 +187,10 @@ pointer *vp;
 	*vp = a;
 }
 
-void putarray(a,ind,b)
-pointer a;
-NODE ind;
-pointer b;
+void putarray(pointer a,NODE ind,pointer b)
 {
 	Obj len,row,col;
-	int i,l;
+	int i;
 	NODE n,n0;
 
 	if ( a && OID(a) == O_BYTEARRAY ) {
@@ -233,6 +232,16 @@ pointer b;
 				} else
 					error("putarray : invalid assignment");
 				break;
+			case O_IMAT:
+				row = (Obj)BDY(ind);
+				ind = NEXT(ind);
+				col = (Obj)BDY(ind);
+				if ( ((IMAT)a)->row < QTOS((Q)row) ||
+					((IMAT)a)->col < QTOS((Q)col) ||
+					(QTOS((Q)row) < 0) || (QTOS((Q)col) < 0))
+						error("putarray : Out of range");
+				PutIent((IMAT)a, QTOS((Q)row), QTOS((Q)col), (Obj)b);
+				break;
 			case O_LIST:
 				if ( NEXT(ind) ) {
 					n0 = BDY((LIST)a); i = QTOS((Q)BDY(ind));
@@ -253,9 +262,7 @@ pointer b;
 	}
 }
 
-int rangecheck(a,n)
-Obj a;
-int n;
+int rangecheck(Obj a,int n)
 {
 	N m;
 
@@ -269,8 +276,7 @@ int n;
 	return 1;
 }
 
-int zp(p)
-P p;
+int zp(P p)
 {
 	int r;
 	DCP dc;
@@ -285,7 +291,7 @@ P p;
 	return ( r );
 }
 
-#if defined(VISUAL) || (defined(__MACH__) && defined(__ppc__))
+#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 NODE mknode(int ac,...)
 {
 	va_list ap;
@@ -383,11 +389,19 @@ va_dcl
 }
 #endif
 
-void makevar(str,p)
-char *str;
-P *p;
+V searchvar(char *str)
 {
 	VL vl;
+
+	for ( vl = CO; ;vl = NEXT(vl) ) 
+		if ( NAME(VR(vl)) && !strcmp(NAME(VR(vl)),str) )
+			return VR(vl);
+	return 0;
+}
+
+void makevar(char *str,P *p)
+{
+	VL vl;
 	V v;
 	P t;
 
@@ -406,16 +420,14 @@ P *p;
 			vl = NEXT(vl);
 }
 
-void makesrvar(f,p)
-FUNC f;
-P *p;
+void makesrvar(FUNC f,P *p)
 {
 	VL vl;
 	V v;
 	P t;
 	char *str;
 
-	for ( vl = CO, str = NAME(f); ; )
+	for ( vl = CO, str = f->fullname; ; )
 		if ( NAME(VR(vl)) && !strcmp(NAME(VR(vl)),str) ) {
 			VR(vl)->attr = (pointer)V_SR; VR(vl)->priv = (pointer)f;
 			MKV(VR(vl),t); *p = t;
@@ -431,10 +443,7 @@ P *p;
 			vl = NEXT(vl);
 }
 
-void appendtonode(n,a,nrp)
-NODE n;
-pointer a;
-NODE *nrp;
+void appendtonode(NODE n,pointer a,NODE *nrp)
 {
 	NODE tn;
 
@@ -446,10 +455,7 @@ NODE *nrp;
 	}
 }
 
-void appendtonode2(n,a,b,nrp)
-NODE2 n;
-pointer a,b;
-NODE2 *nrp;
+void appendtonode2(NODE2 n,pointer a,pointer b,NODE2 *nrp)
 {
 	NODE2 tn;
 
@@ -461,9 +467,7 @@ NODE2 *nrp;
 	}
 }
 
-void appendvar(vl,v)
-VL vl;
-V v;
+void appendvar(VL vl,V v)
 {
 	while (1)
 		if ( vl->v == v )
@@ -475,10 +479,7 @@ V v;
 			vl = NEXT(vl);
 }
 
-void reallocarray(arrayp,sizep,indexp,esize)
-char **arrayp;
-int *sizep,*indexp;
-int esize;
+void reallocarray(char **arrayp,int *sizep,int *indexp,int esize)
 {
 	char *new;