===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/arith.c,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -p -r1.10 -r1.15
--- OpenXM_contrib2/asir2000/parse/arith.c	2003/05/22 07:01:41	1.10
+++ OpenXM_contrib2/asir2000/parse/arith.c	2004/06/15 16:14:50	1.15
@@ -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.9 2003/03/27 02:59:16 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"
@@ -84,6 +84,11 @@ struct oAFUNC afunc[] = {
 /* 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() {
@@ -109,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);
 }
@@ -130,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);
 }
@@ -183,7 +192,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);