===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM_contrib2/asir2000/parse/arith.c	2000/08/22 05:04:25	1.3
+++ OpenXM_contrib2/asir2000/parse/arith.c	2002/08/02 05:34:03	1.8
@@ -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/arith.c,v 1.2 2000/08/21 08:31:45 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.7 2001/10/09 01:36:23 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -66,20 +66,24 @@ ARF addfs, subfs, mulfs, divfs, remfs, pwrfs;
 void divsdc();
 
 struct oAFUNC afunc[] = {
-/* ??? */	{0,0,0,0,0,0,0},
-/* O_N */	{addnum,subnum,mulnum,divnum,pwrnum,chsgnnum,compnum},
-/* O_P */	{addp,subp,mulp,divr,pwrp,chsgnp,compp},
-/* O_R */	{addr,subr,mulr,divr,pwrr,chsgnr,compr},
-/* O_LIST */	{notdef,notdef,notdef,notdef,notdef,notdef,complist},
-/* O_VECT */	{addvect,subvect,mulvect,divvect,notdef,chsgnvect,compvect},
-/* O_MAT */	{addmat,submat,mulmat,divmat,pwrmat,chsgnmat,compmat},
-/* O_STR */	{addstr,notdef,notdef,notdef,notdef,notdef,compstr},
-/* O_COMP */	{addcomp,subcomp,mulcomp,divcomp,pwrcomp,chsgncomp,compcomp},
-/* O_DP */   {addd,subd,muld,divsdc,notdef,chsgnd,compd},
-/* O_UI */	{notdef,notdef,notdef,notdef,notdef,notdef,compui},
-/* O_GF2MAT */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_ERR */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_GFMMAT */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* ???=0 */	{0,0,0,0,0,0,0},
+/* O_N=1 */	{addnum,subnum,mulnum,divnum,pwrnum,chsgnnum,compnum},
+/* O_P=2 */	{addp,subp,mulp,divr,pwrp,chsgnp,compp},
+/* O_R=3 */	{addr,subr,mulr,divr,pwrr,chsgnr,compr},
+/* O_LIST=4 */	{notdef,notdef,notdef,notdef,notdef,notdef,complist},
+/* O_VECT=5 */	{addvect,subvect,mulvect,divvect,notdef,chsgnvect,compvect},
+/* O_MAT=6 */	{addmat,submat,mulmat,divmat,pwrmat,chsgnmat,compmat},
+/* O_STR=7 */	{addstr,notdef,notdef,notdef,notdef,notdef,compstr},
+/* O_COMP=8 */	{addcomp,subcomp,mulcomp,divcomp,pwrcomp,chsgncomp,compcomp},
+/* O_DP=9 */   {addd,subd,muld,divsdc,notdef,chsgnd,compd},
+/* O_USINT=10 */	{notdef,notdef,notdef,notdef,notdef,notdef,compui},
+/* O_ERR=11 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_GF2MAT=12 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_MATHCAP=13 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_F=14 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_GFMMAT=15 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_BYTEARRAY=16 */	{notdef,notdef,notdef,notdef,notdef,notdef,compbytearray},
+/* O_QUOTE=17 */	{addquote,subquote,mulquote,divquote,pwrquote,chsgnquote,(int(*)())notdef},
 };
 
 void arf_init() {
@@ -187,7 +191,12 @@ Obj a,e,*r;
 	R t;
 
 	if ( !a )
-		*r = 0;
+		if ( !e )
+			*r = (pointer)ONE;
+		else
+			*r = 0;
+	else if ( OID(a) == O_QUOTE )
+		(*(afunc[O_QUOTE].pwr))(vl,a,e,r);
 	else if ( !e )
 		*r = (pointer)ONE;
 	else if ( (OID(e) <= O_N) && INT(e) ) {
@@ -232,7 +241,7 @@ int complist(vl,a,b)
 VL vl;
 LIST a,b;
 {
-	int i,t;
+	int t;
 	NODE an,bn;
 
 	if ( !a )
@@ -242,10 +251,11 @@ LIST a,b;
 			return -1;
 	else if ( !b )
 		return 1;
-	for ( i = 0, an = BDY(a); an; i++, an = NEXT(an) );
-	for ( an = BDY(b); an; i--, an = NEXT(an) );
-	if ( i )
-		return i > 0 ? 1 : -1;
+	for ( an = BDY(a), bn = BDY(b); an && bn; an = NEXT(an), bn = NEXT(bn) );
+	if ( an && !bn )
+		return 1;
+	else if ( !an && bn )
+		return -1;
 	for ( an = BDY(a), bn = BDY(b); an; an = NEXT(an), bn = NEXT(bn) )
 		if ( t = arf_comp(vl,BDY(an),BDY(bn)) )
 			return t;