=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v retrieving revision 1.2 retrieving revision 1.15 diff -u -p -r1.2 -r1.15 --- OpenXM_contrib2/asir2000/parse/arith.c 2000/08/21 08:31:45 1.2 +++ OpenXM_contrib2/asir2000/parse/arith.c 2004/06/15 16:14:50 1.15 @@ -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,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.1.1.1 1999/12/03 07:39:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.14 2004/05/14 06:02:54 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -66,20 +66,29 @@ 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}, +/* 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}, }; void arf_init() { @@ -105,6 +114,8 @@ Obj a,b,*r; (*afunc[OID(a)].add)(vl,a,b,r); else if ( (mid = MAX(OID(a),OID(b))) <= O_R ) (*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); } @@ -126,6 +137,8 @@ Obj a,b,*r; (*afunc[OID(a)].sub)(vl,a,b,r); else if ( (mid = MAX(OID(a),OID(b))) <= O_R ) (*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); } @@ -134,17 +147,61 @@ void arf_mul(vl,a,b,r) VL vl; Obj a,b,*r; { - int mid; + int mid,aid,bid; - if ( !a || !b ) + if ( !a && !b ) *r = 0; - else if ( OID(a) == OID(b) ) - (*(afunc[OID(a)].mul))(vl,a,b,r); - else if ( (mid = MAX(OID(a),OID(b))) <= O_R || - (mid == O_MAT) || (mid == O_VECT) || (mid == O_DP) ) + 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 + *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 ) (*afunc[mid].mul)(vl,a,b,r); - else - notdef(vl,a,b,r); + else { + switch ( aid ) { + case O_N: case O_P: + (*afunc[mid].mul)(vl,a,b,r); + break; + case O_R: + /* rat * something; bid > O_R */ + if ( bid == O_VECT || bid == O_MAT ) + (*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_P ) + (*afunc[O_DP].mul)(vl,a,b,r); + else if ( bid == O_MAT || bid == O_VECT || bid == O_DPV ) + (*afunc[bid].mul)(vl,a,b,r); + else + notdef(vl,a,b,r); + break; + default: + notdef(vl,a,b,r); + break; + } + } } void arf_div(vl,a,b,r) @@ -187,10 +244,18 @@ Obj a,e,*r; R t; if ( !a ) - *r = 0; - else if ( !e ) - *r = (pointer)ONE; - else if ( (OID(e) <= O_N) && INT(e) ) { + 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 ) { + if ( OID(a) == O_MAT ) + (*(afunc[O_MAT].pwr))(vl,a,e,r); + else + *r = (pointer)ONE; + } else if ( (OID(e) <= O_N) && INT(e) ) { if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) { MKRAT((P)a,(P)ONE,1,t); (*(afunc[O_R].pwr))(vl,t,e,r); @@ -232,7 +297,7 @@ int complist(vl,a,b) VL vl; LIST a,b; { - int i,t; + int t; NODE an,bn; if ( !a ) @@ -242,10 +307,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;