===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM_contrib2/asir2000/parse/eval.c	1999/12/03 07:39:12	1.1
+++ OpenXM_contrib2/asir2000/parse/eval.c	2000/09/22 06:36:43	1.7
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/parse/eval.c,v 1.2 1999/11/18 05:42:03 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/eval.c,v 1.6 2000/09/21 09:19:27 noro Exp $ 
+*/
 #include <ctype.h>
 #include "ca.h"
 #include "al.h"
@@ -8,7 +56,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif
+#if PARI
 #include "genpari.h"
+#endif
 
 extern jmp_buf timer_env;
 
@@ -135,15 +185,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 ) {
@@ -155,7 +196,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);
@@ -169,10 +210,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 )
@@ -192,10 +231,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;
@@ -255,6 +301,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;
@@ -481,6 +531,10 @@ FNODE a;
 
 	args = (LIST)eval(a);
 	node = BDY(args); 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);