===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v
retrieving revision 1.56
retrieving revision 1.58
diff -u -p -r1.56 -r1.58
--- OpenXM_contrib2/asir2000/builtin/array.c	2007/11/23 05:43:23	1.56
+++ OpenXM_contrib2/asir2000/builtin/array.c	2009/03/03 10:04:10	1.58
@@ -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/builtin/array.c,v 1.55 2006/10/26 10:49:16 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.57 2009/02/03 00:39:23 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -54,7 +54,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#if !defined(_MSC_VER)
 #include <unistd.h>
+#endif
 
 #define F4_INTRAT_PERIOD 8 
 
@@ -459,15 +461,29 @@ void Pnewbytearray(NODE arg,BYTEARRAY *rp)
 
 	ac = argc(arg);
 	if ( ac == 1 ) {
-		/* ARG0(arg) must be a filename */
-		asir_assert(ARG0(arg),O_STR,"newbytearray");
-		fname = BDY((STRING)ARG0(arg));
-		fp = fopen(fname,"rb");
-		if ( !fp ) error("newbytearray : fopen failed");
-		if ( stat(fname,&sbuf) < 0 ) error("newbytearray : stat failed");
-		len = sbuf.st_size;
-		MKBYTEARRAY(array,len);
-		fread(BDY(array),len,sizeof(char),fp);
+		if ( !OID((Obj)ARG0(arg)) ) error("newbytearray : invalid argument");
+		switch ( OID((Obj)ARG0(arg)) ) {
+			case O_STR:
+				fname = BDY((STRING)ARG0(arg));
+				fp = fopen(fname,"rb");
+				if ( !fp ) error("newbytearray : fopen failed");
+				if ( stat(fname,&sbuf) < 0 ) 
+					error("newbytearray : stat failed");
+				len = sbuf.st_size;
+				MKBYTEARRAY(array,len);
+				fread(BDY(array),len,sizeof(char),fp);
+				break;
+			case O_N:
+				if ( !RATN(ARG0(arg)) )
+					error("newbytearray : invalid argument");
+				len = QTOS((Q)ARG0(arg)); 
+				if ( len < 0 )
+					error("newbytearray : invalid size");
+				MKBYTEARRAY(array,len);
+				break;
+			default:
+				error("newbytearray : invalid argument");
+		}
 	} else if ( ac == 2 ) {
 		asir_assert(ARG0(arg),O_N,"newbytearray");
 		len = QTOS((Q)ARG0(arg)); 
@@ -2062,8 +2078,7 @@ void red_by_compress(int m,unsigned int *p,unsigned in
 
 void red_by_vect(int m,unsigned int *p,unsigned int *r,unsigned int hc,int len)
 {
-	register unsigned int up,lo;
-	unsigned int dmy;
+	unsigned int up,lo,dmy;
 
 	*p++ = 0; r++; len--;
 	for ( ; len; len--, r++, p++ )