===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- OpenXM_contrib2/asir2000/parse/arith.c	2017/08/31 04:21:48	1.28
+++ OpenXM_contrib2/asir2000/parse/arith.c	2018/03/29 01:32:54	1.29
@@ -45,19 +45,19 @@
  * 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.27 2017/08/31 02:36:21 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.28 2017/08/31 04:21:48 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 struct oAFUNC {
-	void (*add)();
-	void (*sub)();
-	void (*mul)();
-	void (*div)();
-	void (*pwr)();
-	void (*chsgn)();
-	int (*comp)();
+  void (*add)();
+  void (*sub)();
+  void (*mul)();
+  void (*div)();
+  void (*pwr)();
+  void (*chsgn)();
+  int (*comp)();
 };
 
 struct oARF arf[6];
@@ -70,274 +70,274 @@ int compvoid();
 
 struct oAFUNC afunc0[] = {
 /* O_VOID=-1 */ {notdef,notdef,notdef,notdef,notdef,notdef,compvoid},
-/* ???=0 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* 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},
+/* ???=0 */  {notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* 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,divdc,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,compquote},
-/* O_OPTLIST=18 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_SYMBOL=19 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_RANGE=20 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_TB=21 */	{notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
-/* O_DPV=22 */	{adddv,subdv,muldv,notdef,notdef,chsgndv,compdv},
-/* O_QUOTEARG=23 */	{notdef,notdef,notdef,notdef,notdef,notdef,compqa},
-/* O_MAT=24 */	{AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,(int(*)())notdef},
-/* O_NBP=25 */	{addnbp,subnbp,mulnbp,notdef,pwrnbp,chsgnnbp,compnbp},
-/* O_DPM=26 */	{adddpm,subdpm,mulobjdpm,notdef,notdef,chsgndpm,compdpm},
+/* 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,compquote},
+/* O_OPTLIST=18 */  {notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_SYMBOL=19 */  {notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_RANGE=20 */  {notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_TB=21 */  {notdef,notdef,notdef,notdef,notdef,notdef,(int(*)())notdef},
+/* O_DPV=22 */  {adddv,subdv,muldv,notdef,notdef,chsgndv,compdv},
+/* O_QUOTEARG=23 */  {notdef,notdef,notdef,notdef,notdef,notdef,compqa},
+/* O_MAT=24 */  {AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,(int(*)())notdef},
+/* O_NBP=25 */  {addnbp,subnbp,mulnbp,notdef,pwrnbp,chsgnnbp,compnbp},
+/* O_DPM=26 */  {adddpm,subdpm,mulobjdpm,notdef,notdef,chsgndpm,compdpm},
 };
 
 struct oAFUNC *afunc = &afunc0[1];
 
 void arf_init() {
-	addfs = &arf[0]; addfs->name = "+"; addfs->fp = arf_add;
-	subfs = &arf[1]; subfs->name = "-"; subfs->fp = arf_sub;
-	mulfs = &arf[2]; mulfs->name = "*"; mulfs->fp = arf_mul;
-	divfs = &arf[3]; divfs->name = "/"; divfs->fp = arf_div;
-	remfs = &arf[4]; remfs->name = "%"; remfs->fp = arf_remain;
-	pwrfs = &arf[5]; pwrfs->name = "^"; pwrfs->fp = arf_pwr;
+  addfs = &arf[0]; addfs->name = "+"; addfs->fp = arf_add;
+  subfs = &arf[1]; subfs->name = "-"; subfs->fp = arf_sub;
+  mulfs = &arf[2]; mulfs->name = "*"; mulfs->fp = arf_mul;
+  divfs = &arf[3]; divfs->name = "/"; divfs->fp = arf_div;
+  remfs = &arf[4]; remfs->name = "%"; remfs->fp = arf_remain;
+  pwrfs = &arf[5]; pwrfs->name = "^"; pwrfs->fp = arf_pwr;
 }
 
 void arf_add(VL vl,Obj a,Obj b,Obj *r)
 {
-	int mid;
+  int mid;
 
-	if ( !a )
-		*r = b;
-	else if ( !b )
-		*r = a;
-	else if ( OID(a) == OID(b) )
-		(*afunc[OID(a)].add)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
-		(*afunc[mid].add)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
-		(*afunc[mid].add)(vl,a,b,r);
-	else
-		notdef(vl,a,b,r);
+  if ( !a )
+    *r = b;
+  else if ( !b )
+    *r = a;
+  else if ( OID(a) == OID(b) )
+    (*afunc[OID(a)].add)(vl,a,b,r);
+  else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
+    (*afunc[mid].add)(vl,a,b,r);
+  else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
+    (*afunc[mid].add)(vl,a,b,r);
+  else
+    notdef(vl,a,b,r);
 }
 
 void arf_sub(VL vl,Obj a,Obj b,Obj *r)
 {
-	int mid;
+  int mid;
 
-	if ( !a )
-		if ( !b )
-			*r = 0;
-		else
-			(*afunc[OID(b)].chsgn)(b,r);
-	else if ( !b )
-		*r = a;
-	else if ( OID(a) == OID(b) )
-		(*afunc[OID(a)].sub)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
-		(*afunc[mid].sub)(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
-		(*afunc[mid].sub)(vl,a,b,r);
-	else
-		notdef(vl,a,b,r);
+  if ( !a )
+    if ( !b )
+      *r = 0;
+    else
+      (*afunc[OID(b)].chsgn)(b,r);
+  else if ( !b )
+    *r = a;
+  else if ( OID(a) == OID(b) )
+    (*afunc[OID(a)].sub)(vl,a,b,r);
+  else if ( (mid = MAX(OID(a),OID(b))) <= O_R || mid == O_QUOTE )
+    (*afunc[mid].sub)(vl,a,b,r);
+  else if ( (mid = MAX(OID(a),OID(b))) == O_DP && MIN(OID(a),OID(b)) <= O_R )
+    (*afunc[mid].sub)(vl,a,b,r);
+  else
+    notdef(vl,a,b,r);
 }
 
 void arf_mul(VL vl,Obj a,Obj b,Obj *r)
 {
-	int mid,aid,bid;
+  int mid,aid,bid;
 
-	if ( !a && !b )
-		*r = 0;
-	else if ( !a || !b ) {
-		if ( !a ) a = b;
-		/* compute a*0 */
-		if ( OID(a) == O_MAT || OID(a) == O_VECT )
-			(*(afunc[O_MAT].mul))(vl,a,0,r);
-		else if ( OID(a) == O_IMAT )
-			(*(afunc[O_IMAT].mul))(vl,0,a,r);
-		else
-			*r = 0;
-	} else if ( (aid = OID(a)) == (bid = OID(b)) )
-		(*(afunc[aid].mul))(vl,a,b,r);
-	else if ( (mid = MAX(aid,bid)) <= O_R || mid == O_QUOTE )
-		(*afunc[mid].mul)(vl,a,b,r);
-	else {
-		switch ( aid ) {
-			case O_N: case O_P: case O_NBP:
-				(*afunc[mid].mul)(vl,a,b,r);
-				break;
-			case O_R:
-				/* rat * something; bid > O_R */
-				if ( bid == O_VECT || bid == O_MAT || bid == O_DP || bid == O_DPM )
-					(*afunc[mid].mul)(vl,a,b,r);
-				else 
-					notdef(vl,a,b,r);
-				break;
-			case O_MAT:
-				if ( bid <= O_R || bid == O_VECT || bid == O_DP )
-					(*afunc[O_MAT].mul)(vl,a,b,r);
-				else
-					notdef(vl,a,b,r);
-				break;
-			case O_VECT:
-				if ( bid <= O_R || bid == O_DP )
-					(*afunc[O_VECT].mul)(vl,a,b,r);
-				else if ( bid == O_MAT )
-					(*afunc[O_MAT].mul)(vl,a,b,r);
-				else
-					notdef(vl,a,b,r);
-				break;
-			case O_DP:
-				if ( bid <= O_R )
-					(*afunc[O_DP].mul)(vl,a,b,r);
-				else if ( bid == O_MAT || bid == O_VECT || bid == O_DPV || bid == O_DPM )
-					(*afunc[bid].mul)(vl,a,b,r);
-				else
-					notdef(vl,a,b,r);
-				break;
-			case O_IMAT:
-				(*afunc[O_IMAT].mul)(vl,a,b,r);
-				break;
-			default:
-					notdef(vl,a,b,r);
-				break;
-		}
-	}
+  if ( !a && !b )
+    *r = 0;
+  else if ( !a || !b ) {
+    if ( !a ) a = b;
+    /* compute a*0 */
+    if ( OID(a) == O_MAT || OID(a) == O_VECT )
+      (*(afunc[O_MAT].mul))(vl,a,0,r);
+    else if ( OID(a) == O_IMAT )
+      (*(afunc[O_IMAT].mul))(vl,0,a,r);
+    else
+      *r = 0;
+  } else if ( (aid = OID(a)) == (bid = OID(b)) )
+    (*(afunc[aid].mul))(vl,a,b,r);
+  else if ( (mid = MAX(aid,bid)) <= O_R || mid == O_QUOTE )
+    (*afunc[mid].mul)(vl,a,b,r);
+  else {
+    switch ( aid ) {
+      case O_N: case O_P: case O_NBP:
+        (*afunc[mid].mul)(vl,a,b,r);
+        break;
+      case O_R:
+        /* rat * something; bid > O_R */
+        if ( bid == O_VECT || bid == O_MAT || bid == O_DP || bid == O_DPM )
+          (*afunc[mid].mul)(vl,a,b,r);
+        else 
+          notdef(vl,a,b,r);
+        break;
+      case O_MAT:
+        if ( bid <= O_R || bid == O_VECT || bid == O_DP )
+          (*afunc[O_MAT].mul)(vl,a,b,r);
+        else
+          notdef(vl,a,b,r);
+        break;
+      case O_VECT:
+        if ( bid <= O_R || bid == O_DP )
+          (*afunc[O_VECT].mul)(vl,a,b,r);
+        else if ( bid == O_MAT )
+          (*afunc[O_MAT].mul)(vl,a,b,r);
+        else
+          notdef(vl,a,b,r);
+        break;
+      case O_DP:
+        if ( bid <= O_R )
+          (*afunc[O_DP].mul)(vl,a,b,r);
+        else if ( bid == O_MAT || bid == O_VECT || bid == O_DPV || bid == O_DPM )
+          (*afunc[bid].mul)(vl,a,b,r);
+        else
+          notdef(vl,a,b,r);
+        break;
+      case O_IMAT:
+        (*afunc[O_IMAT].mul)(vl,a,b,r);
+        break;
+      default:
+          notdef(vl,a,b,r);
+        break;
+    }
+  }
 }
 
 void arf_div(VL vl,Obj a,Obj b,Obj *r)
 {
-	int mid;
+  int mid;
 
-	if ( !b )
-		error("div : division by 0");
-	if ( !a )
-		*r = 0;
-	else if ( (OID(a) == OID(b)) )
-		(*(afunc[OID(a)].div))(vl,a,b,r);
-	else if ( (mid = MAX(OID(a),OID(b))) <= O_R || 
-		(mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) || mid == O_QUOTE )
-		(*afunc[mid].div)(vl,a,b,r);
-	else
-		notdef(vl,a,b,r);
+  if ( !b )
+    error("div : division by 0");
+  if ( !a )
+    *r = 0;
+  else if ( (OID(a) == OID(b)) )
+    (*(afunc[OID(a)].div))(vl,a,b,r);
+  else if ( (mid = MAX(OID(a),OID(b))) <= O_R || 
+    (mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) || mid == O_QUOTE )
+    (*afunc[mid].div)(vl,a,b,r);
+  else
+    notdef(vl,a,b,r);
 }
 
 void arf_remain(VL vl,Obj a,Obj b,Obj *r)
 {
-	if ( !b )
-		error("rem : division by 0");
-	else if ( !a )
-		*r = 0;
-	else if ( MAX(OID(a),OID(b)) <= O_P )
-		cmp((Q)b,(P)a,(P *)r);
-	else
-		notdef(vl,a,b,r);
+  if ( !b )
+    error("rem : division by 0");
+  else if ( !a )
+    *r = 0;
+  else if ( MAX(OID(a),OID(b)) <= O_P )
+    cmp((Q)b,(P)a,(P *)r);
+  else
+    notdef(vl,a,b,r);
 }
 
 int allow_laurent;
 
 void arf_pwr(VL vl,Obj a,Obj e,Obj *r)
 {
-	R t;
+  R t;
 
-	if ( !a ) {
-		if ( !e )
-			*r = (pointer)ONE;
-		else if ( RATN(e) && SGN((Q)e)>0 )
-			*r = 0;
-		else
-			mkpow(vl,a,e,r);
-	} else if ( !e ) {
-		if ( OID(a) == O_MAT )
-			(*(afunc[O_MAT].pwr))(vl,a,e,r);
-		else	
-			*r = (pointer)ONE;
-	} else if ( OID(a) == O_QUOTE || OID(e) == O_QUOTE )
-		(*(afunc[O_QUOTE].pwr))(vl,a,e,r);
-	else if ( (OID(e) <= O_N) && INT(e) ) {
-		if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) {
-			if ( allow_laurent )
-				(*(afunc[O_P].pwr))(vl,a,e,r);
-			else {
-				MKRAT((P)a,(P)ONE,1,t);
-				(*(afunc[O_R].pwr))(vl,t,e,r);
-			}
-		} else
-			(*(afunc[OID(a)].pwr))(vl,a,e,r);
-	} else if ( (OID(e) <= O_N) && RATN(e) ) {
-		if ( (OID(a) == O_P) && allow_laurent )
-			(*(afunc[O_P].pwr))(vl,a,e,r);
-		else if ( OID(a) <= O_R )
-			mkpow(vl,a,e,r);
-		else
-			notdef(vl,a,e,r);
-	} else if ( OID(a) <= O_R )
-		mkpow(vl,a,e,r);
-	else
-		notdef(vl,a,e,r);
+  if ( !a ) {
+    if ( !e )
+      *r = (pointer)ONE;
+    else if ( RATN(e) && SGN((Q)e)>0 )
+      *r = 0;
+    else
+      mkpow(vl,a,e,r);
+  } else if ( !e ) {
+    if ( OID(a) == O_MAT )
+      (*(afunc[O_MAT].pwr))(vl,a,e,r);
+    else  
+      *r = (pointer)ONE;
+  } else if ( OID(a) == O_QUOTE || OID(e) == O_QUOTE )
+    (*(afunc[O_QUOTE].pwr))(vl,a,e,r);
+  else if ( (OID(e) <= O_N) && INT(e) ) {
+    if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) {
+      if ( allow_laurent )
+        (*(afunc[O_P].pwr))(vl,a,e,r);
+      else {
+        MKRAT((P)a,(P)ONE,1,t);
+        (*(afunc[O_R].pwr))(vl,t,e,r);
+      }
+    } else
+      (*(afunc[OID(a)].pwr))(vl,a,e,r);
+  } else if ( (OID(e) <= O_N) && RATN(e) ) {
+    if ( (OID(a) == O_P) && allow_laurent )
+      (*(afunc[O_P].pwr))(vl,a,e,r);
+    else if ( OID(a) <= O_R )
+      mkpow(vl,a,e,r);
+    else
+      notdef(vl,a,e,r);
+  } else if ( OID(a) <= O_R )
+    mkpow(vl,a,e,r);
+  else
+    notdef(vl,a,e,r);
 }
 
 void arf_chsgn(Obj a,Obj *r)
 {
-	if ( !a )
-		*r = 0;
-	else
-		(*(afunc[OID(a)].chsgn))(a,r);
+  if ( !a )
+    *r = 0;
+  else
+    (*(afunc[OID(a)].chsgn))(a,r);
 }
 
 int arf_comp(VL vl,Obj a,Obj b)
 {
-	if ( !a )
-		if ( !b )
-			return 0;
-		else
-			return (*afunc[OID(b)].comp)(vl,a,b);
-	else if ( !b )
-			return (*afunc[OID(a)].comp)(vl,a,b);
-	else if ( OID(a) != OID(b) )
-		return OID(a)>OID(b) ? 1 : -1;
-	else
-		return (*afunc[OID(a)].comp)(vl,a,b);
+  if ( !a )
+    if ( !b )
+      return 0;
+    else
+      return (*afunc[OID(b)].comp)(vl,a,b);
+  else if ( !b )
+      return (*afunc[OID(a)].comp)(vl,a,b);
+  else if ( OID(a) != OID(b) )
+    return OID(a)>OID(b) ? 1 : -1;
+  else
+    return (*afunc[OID(a)].comp)(vl,a,b);
 }
 
 int complist(VL vl,LIST a,LIST b)
 {
-	int t;
-	NODE an,bn;
+  int t;
+  NODE an,bn;
 
-	if ( !a )
-		if ( !b )
-			return 0;
-		else
-			return -1;
-	else if ( !b )
-		return 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;
-	return 0;
+  if ( !a )
+    if ( !b )
+      return 0;
+    else
+      return -1;
+  else if ( !b )
+    return 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;
+  return 0;
 }
 
 int compvoid(VL vl,Obj a,Obj b)
 {
-	if ( !a )
-		if ( !b ) return 0;
-		else return -1;
-	else if ( !b )
-		return 1;
-	else if ( OID(a) > OID(b) ) return 1;
-	else if ( OID(b) < OID(a) ) return -1;
-	else return 0;
+  if ( !a )
+    if ( !b ) return 0;
+    else return -1;
+  else if ( !b )
+    return 1;
+  else if ( OID(a) > OID(b) ) return 1;
+  else if ( OID(b) < OID(a) ) return -1;
+  else return 0;
 }