=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v retrieving revision 1.1.1.1 retrieving revision 1.26 diff -u -p -r1.1.1.1 -r1.26 --- OpenXM_contrib2/asir2000/parse/arith.c 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/parse/arith.c 2005/12/10 14:14:15 1.26 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM/src/asir99/parse/arith.c,v 1.2 1999/11/18 05:42:02 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * 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@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * 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.25 2005/11/27 00:07:06 noro Exp $ +*/ #include "ca.h" #include "parse.h" @@ -16,24 +64,42 @@ struct oARF arf[6]; ARF addfs, subfs, mulfs, divfs, remfs, pwrfs; void divsdc(); +int compqa(); +int compquote(); +int compvoid(); -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}, +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}, +/* 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,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}, }; +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; @@ -43,9 +109,7 @@ void arf_init() { pwrfs = &arf[5]; pwrfs->name = "^"; pwrfs->fp = arf_pwr; } -void arf_add(vl,a,b,r) -VL vl; -Obj a,b,*r; +void arf_add(VL vl,Obj a,Obj b,Obj *r) { int mid; @@ -55,15 +119,15 @@ Obj a,b,*r; *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 ) + 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,a,b,r) -VL vl; -Obj a,b,*r; +void arf_sub(VL vl,Obj a,Obj b,Obj *r) { int mid; @@ -76,32 +140,78 @@ Obj a,b,*r; *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 ) + 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,a,b,r) -VL vl; -Obj a,b,*r; +void arf_mul(VL vl,Obj a,Obj b,Obj *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 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 - notdef(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 ) + (*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; + case O_IMAT: + (*afunc[O_IMAT].mul)(vl,a,b,r); + break; + default: + notdef(vl,a,b,r); + break; + } + } } -void arf_div(vl,a,b,r) -VL vl; -Obj a,b,*r; +void arf_div(VL vl,Obj a,Obj b,Obj *r) { int mid; @@ -112,15 +222,13 @@ Obj a,b,*r; 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_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,a,b,r) -VL vl; -Obj a,b,*r; +void arf_remain(VL vl,Obj a,Obj b,Obj *r) { if ( !b ) error("rem : division by 0"); @@ -132,30 +240,50 @@ Obj a,b,*r; notdef(vl,a,b,r); } -void arf_pwr(vl,a,e,r) -VL vl; -Obj a,e,*r; +int allow_laurent; + +void arf_pwr(VL vl,Obj a,Obj e,Obj *r) { R t; - if ( !a ) - *r = 0; - else if ( !e ) - *r = (pointer)ONE; + 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) ) { - MKRAT((P)a,(P)ONE,1,t); - (*(afunc[O_R].pwr))(vl,t,e,r); + 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(a,r) -Obj a,*r; +void arf_chsgn(Obj a,Obj *r) { if ( !a ) *r = 0; @@ -163,9 +291,7 @@ Obj a,*r; (*(afunc[OID(a)].chsgn))(a,r); } -int arf_comp(vl,a,b) -VL vl; -Obj a,b; +int arf_comp(VL vl,Obj a,Obj b) { if ( !a ) if ( !b ) @@ -180,11 +306,9 @@ Obj a,b; return (*afunc[OID(a)].comp)(vl,a,b); } -int complist(vl,a,b) -VL vl; -LIST a,b; +int complist(VL vl,LIST a,LIST b) { - int i,t; + int t; NODE an,bn; if ( !a ) @@ -194,12 +318,25 @@ 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; 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; }