===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.4
retrieving revision 1.10
diff -u -p -r1.4 -r1.10
--- OpenXM_contrib2/asir2000/parse/eval.c	2000/08/21 08:31:46	1.4
+++ OpenXM_contrib2/asir2000/parse/eval.c	2001/08/21 01:39:39	1.10
@@ -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,17 +45,15 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.3 2000/07/13 05:09:03 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.9 2001/08/20 09:50:34 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
 #include "al.h"
 #include "base.h"
 #include "parse.h"
-#if !defined(THINK_C)
 #include <sys/types.h>
 #include <sys/stat.h>
-#endif
 #if PARI
 #include "genpari.h"
 #endif
@@ -67,6 +65,7 @@ int evalstatline;
 int recv_intr;
 
 pointer bevalf(), evalmapf(), evall();
+pointer eval_rec_mapf(), beval_rec_mapf();
 Obj getopt_from_cpvs();
 
 pointer eval(f)
@@ -101,10 +100,13 @@ FNODE f;
 	if ( !f )
 		return ( 0 );
 	switch ( f->id ) {
+		case I_PAREN:
+			val = eval((FNODE)(FA0(f)));
+			break;
 		case I_BOP:
 			a1 = eval((FNODE)FA1(f)); a2 = eval((FNODE)FA2(f));
 			(*((ARF)FA0(f))->fp)(CO,a1,a2,&val); 
-		break;
+			break;
 		case I_COP:
 			a1 = eval((FNODE)FA1(f)); a2 = eval((FNODE)FA2(f));
 			c = arf_comp(CO,a1,a2);
@@ -163,6 +165,8 @@ FNODE f;
 			break;
 		case I_MAP:
 			val = evalmapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
+		case I_RECMAP:
+			val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
 		case I_IFUNC:
 			val = evalif((FNODE)FA0(f),(FNODE)FA1(f)); break;
 #if !defined(VISUAL)
@@ -185,15 +189,6 @@ FNODE f;
 			}
 			break;
 #endif
-#if 0
-		case I_PRESELF: case I_POSTSELF: 
-			val = evalpv(f->id,FA1(f),FA0(f)); break;
-		case I_PVAR: 
-			val = evalpv(f->id,FA0(f),0); break;
-		case I_ASSPVAR:
-			val = evalpv(f->id,FA0(f),FA1(f)); break;
-#endif
-#if 1
 		case I_PRESELF:
 			f1 = (FNODE)FA1(f);
 			if ( ID(f1) == I_PVAR ) {
@@ -205,7 +200,7 @@ FNODE f;
 					(*((ARF)FA0(f))->fp)(CO,u,ONE,&val); putarray(a,tn,val);
 				}
 			} else
-				val = evalpv(f->id,(FNODE)FA1(f),FA0(f));
+				error("++ : not implemented yet");
 			break;
 		case I_POSTSELF:
 			f1 = (FNODE)FA1(f);
@@ -219,10 +214,8 @@ FNODE f;
 					val = a;
 				}
 			} else
-				val = evalpv(f->id,(FNODE)FA1(f),FA0(f));
+				error("-- : not implemented yet");
 			break;
-		case I_CAST:
-			getmember((FNODE)f,(Obj *)&val); break;
 		case I_PVAR:
 			pv = (int)FA0(f); ind = (NODE)FA1(f); GETPV(pv,a); 
 			if ( !ind )
@@ -242,10 +235,17 @@ FNODE f;
 					evalnodebody(ind,&tn); 
 					putarray(a,tn,val = eval((FNODE)FA1(f))); 
 				}
-			} else
-				val = evalpv(ID(f),(FNODE)FA0(f),FA1(f));
+			} else if ( ID(f1) == I_POINT ) {
+				/* f1 <-> FA0(f1)->FA1(f1) */
+				a = eval(FA0(f1));
+				assign_to_member(a,(char *)FA1(f1),val = eval((FNODE)FA1(f)));
+			} else if ( ID(f1) == I_INDEX ) {
+				/* f1 <-> FA0(f1)[FA1(f1)] */
+				a = eval((FNODE)FA0(f1)); ind = (NODE)FA1(f1);
+				evalnodebody(ind,&tn);
+				putarray(a,tn,val = eval((FNODE)FA1(f)));
+			}
 			break;
-#endif
 		case I_ANS:
 			if ( (pv =(int)FA0(f)) < (int)APVS->n ) 
 				val = APVS->va[pv].priv;
@@ -305,6 +305,10 @@ FNODE f;
 		case I_GETOPT:
 			val = (pointer)getopt_from_cpvs((char *)FA0(f));
 			break;
+		case I_POINT:
+			a = (pointer)eval(FA0(f));
+			val = (pointer)memberofstruct(a,(char *)FA1(f));
+			break;
 		default:
 			error("eval : unknown id");
 			break;
@@ -555,6 +559,69 @@ FNODE a;
 			n = BDY((LIST)head);
 			for ( r0 = r = 0; n; n = NEXT(n) ) {
 				NEXTNODE(r0,r); MKNODE(t,BDY(n),rest); BDY(r) = bevalf(f,t);
+			}
+			if ( r0 )
+				NEXT(r) = 0;
+			MKLIST(rl,r0);
+			val = (pointer)rl;
+			break;
+		default:
+			val = bevalf(f,node);
+			break;
+	}
+	return val;
+}
+
+pointer eval_rec_mapf(f,a)
+FUNC f;
+FNODE a;
+{
+	LIST args;
+
+	args = (LIST)eval(a);
+	return beval_rec_mapf(f,BDY(args));
+}
+
+pointer beval_rec_mapf(f,node)
+FUNC f;
+NODE node;
+{
+	LIST args;
+	NODE rest,t,n,r,r0;
+	Obj head;
+	VECT v,rv;
+	MAT m,rm;
+	LIST rl;
+	int len,row,col,i,j;
+	pointer val;
+
+	head = (Obj)BDY(node); rest = NEXT(node);
+	if ( !head ) {
+		val = bevalf(f,node);
+		return val;
+	}
+	switch ( OID(head) ) {
+		case O_VECT:
+			v = (VECT)head; len = v->len; MKVECT(rv,len);
+			for ( i = 0; i < len; i++ ) {
+				MKNODE(t,BDY(v)[i],rest); BDY(rv)[i] = beval_rec_mapf(f,t);
+			}
+			val = (pointer)rv;
+			break;
+		case O_MAT:
+			m = (MAT)head; row = m->row; col = m->col; MKMAT(rm,row,col);
+			for ( i = 0; i < row; i++ )
+				for ( j = 0; j < col; j++ ) {
+					MKNODE(t,BDY(m)[i][j],rest);
+					BDY(rm)[i][j] = beval_rec_mapf(f,t);
+				}
+			val = (pointer)rm;
+			break;
+		case O_LIST:
+			n = BDY((LIST)head);
+			for ( r0 = r = 0; n; n = NEXT(n) ) {
+				NEXTNODE(r0,r); MKNODE(t,BDY(n),rest);
+				BDY(r) = beval_rec_mapf(f,t);
 			}
 			if ( r0 )
 				NEXT(r) = 0;