=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v retrieving revision 1.11 retrieving revision 1.14 diff -u -p -r1.11 -r1.14 --- OpenXM_contrib2/asir2000/parse/arith.c 2004/02/04 07:42:07 1.11 +++ OpenXM_contrib2/asir2000/parse/arith.c 2004/05/14 06:02:54 1.14 @@ -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.10 2003/05/22 07:01:41 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.13 2004/04/14 07:27:42 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -86,6 +86,9 @@ struct oAFUNC afunc[] = { /* 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() { @@ -111,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); } @@ -185,7 +190,7 @@ Obj a,b,*r; case O_DP: if ( bid <= O_P ) (*afunc[O_DP].mul)(vl,a,b,r); - else if ( bid == O_MAT || bid == O_VECT ) + else if ( bid == O_MAT || bid == O_VECT || bid == O_DPV ) (*afunc[bid].mul)(vl,a,b,r); else notdef(vl,a,b,r);