=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v retrieving revision 1.1.1.1 retrieving revision 1.6 diff -u -p -r1.1.1.1 -r1.6 --- OpenXM_contrib2/asir2000/parse/arith.c 1999/12/03 07:39:11 1.1.1.1 +++ OpenXM_contrib2/asir2000/parse/arith.c 2001/08/20 09:03:27 1.6 @@ -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.5 2000/12/11 09:28:03 noro Exp $ +*/ #include "ca.h" #include "parse.h" @@ -18,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() { @@ -140,6 +192,8 @@ Obj a,e,*r; if ( !a ) *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) ) { @@ -194,10 +248,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;