===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/util.c,v
retrieving revision 1.2
retrieving revision 1.13
diff -u -p -r1.2 -r1.13
--- OpenXM_contrib2/asir2000/parse/util.c	2000/08/21 08:31:47	1.2
+++ OpenXM_contrib2/asir2000/parse/util.c	2005/02/08 18:06:05	1.13
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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/util.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/util.c,v 1.12 2004/12/18 16:50:10 saito Exp $ 
 */
 #include "ca.h"
 #include "base.h"
 #include "parse.h"
-#if defined(THINK_C) || defined(VISUAL)
+#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -120,11 +120,25 @@ 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;
 
+	if ( a && OID(a) == O_BYTEARRAY ) {
+		len = (Obj)BDY(ind);
+		if ( !rangecheck(len,((BYTEARRAY)a)->len) )
+			error("getarray : Out of range");
+		else if ( NEXT(ind) )
+			error("getarray : invalid index");
+		else {
+			i = (int)BDY((BYTEARRAY)a)[QTOS((Q)len)];
+			STOQ(i,q);
+			*vp = (pointer)q;
+		}
+		return;
+	}
 	for ( ; ind; ind = NEXT(ind) ) {
 		if ( !a )
 			error("getarray : array or list expected");
@@ -153,15 +167,26 @@ 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));
-				for ( l = 0, n = n0; n; n = NEXT(n), l++ );
-				if ( i < 0 || i >= l )
+				if ( i < 0 )
 					error("getarray : Out of range");
-				else {
-					for ( n = n0, l = 0; l < i; l++, n = NEXT(n) );
+				for ( n = n0; i > 0 && n; n = NEXT(n), i-- );
+				if ( i || !n )
+					error("getarray : Out of range");
+				else	
 					a = (pointer)BDY(n);
-				}
 				break;
 			default:
 				error("getarray : array or list expected");
@@ -177,9 +202,19 @@ NODE ind;
 pointer b;
 {
 	Obj len,row,col;
-	int i,l;
+	int i;
 	NODE n,n0;
 
+	if ( a && OID(a) == O_BYTEARRAY ) {
+		len = (Obj)BDY(ind);
+		if ( !rangecheck(len,((BYTEARRAY)a)->len) )
+			error("putarray : Out of range");
+		else if ( NEXT(ind) )
+			error("putarray : invalid index");
+		else
+			BDY((BYTEARRAY)a)[QTOS((Q)len)] = (unsigned char)QTOS((Q)b);
+		return;
+	}
 	for ( ; ind; ind = NEXT(ind) ) {
 		if ( !a )
 			error("putarray : array expected");
@@ -209,16 +244,26 @@ 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));
-					for ( l = 0, n = n0; n; n = NEXT(n), l++ );
-					if ( i < 0 || i >= l )
+					if ( i < 0 )
 						error("putarray : Out of range");
-					else {
-						for ( n = n0, l = 0; l < i; l++, n = NEXT(n) );
+					for ( n = n0; i > 0 && n; n = NEXT(n), i-- );
+					if ( i || !n )
+						error("puarray : Out of range");
+					else
 						a = (pointer)BDY(n);
-					}
 				} else
 					error("putarray : invalid assignment");
 				break;
@@ -261,7 +306,7 @@ P p;
 	return ( r );
 }
 
-#if defined(THINK_C) || defined(VISUAL)
+#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 NODE mknode(int ac,...)
 {
 	va_list ap;
@@ -391,7 +436,7 @@ P *p;
 	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;
@@ -470,43 +515,3 @@ int esize;
 		*arrayp = new;
 	}
 }
-
-#if defined(THINK_C)
-void bzero(p,len)
-register char *p;
-register int len;
-{
-	for ( ; len; len-- )
-		*p++ = 0;
-}
-
-void bcopy(s,d,len)
-register char *s;
-register char *d;
-int len;
-{
-	for ( ; len; len-- )
-		*d++ = *s++;
-}
-
-char *index(char *s,char c)
-{
-	for ( ; *s && *s != c; s++ );
-	if ( *s )
-		return s;
-	else
-		return 0;
-}
-	
-void printap(p)
-P p;
-{
-	DCP dc;
-	
-	for ( dc = DC(p); dc; dc = NEXT(dc) ) {
-		printf("(c=0x%lx c->nm=0x%lx c->nm->p=%ld) ",
-			(int *)dc->c,(int *)((Q)dc->c)->nm,(int)((Q)dc->c)->nm->p);
-	}
-	printf("\n");
-}
-#endif