===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.24
retrieving revision 1.32
diff -u -p -r1.24 -r1.32
--- OpenXM_contrib2/asir2000/parse/eval.c	2003/05/16 07:56:16	1.24
+++ OpenXM_contrib2/asir2000/parse/eval.c	2004/04/30 08:25:38	1.32
@@ -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/eval.c,v 1.23 2003/05/14 09:18:38 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.31 2004/02/09 08:23:30 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -84,6 +84,7 @@ pointer eval(FNODE f)
 	GF2N gf2n;
 	GFPN gfpn;
 	GFSN gfsn;
+	RANGE range;
 
 #if defined(VISUAL)
 	if ( recv_intr ) {
@@ -453,10 +454,11 @@ extern NODE PVSS;
 pointer evalf(FUNC f,FNODE a,FNODE opt)
 {
 	LIST args;
+	OPTLIST optlist;
 	pointer val;
 	int i,n,level;
-	NODE tn,sn,opts,opt1;
-    VS pvs,prev_mpvs;
+	NODE tn,sn,opts,opt1,dmy;
+    	VS pvs,prev_mpvs;
 	char errbuf[BUFSIZ];
 	static unsigned int stack_size;
 	static void *stack_base;
@@ -474,11 +476,31 @@ pointer evalf(FUNC f,FNODE a,FNODE opt)
 	}
 	switch ( f->id ) {
 		case A_BIN:
+			if ( opt ) {
+				opts = BDY((LIST)eval(opt));
+				/* opts = ["opt1",arg1],... */
+				opt1 = BDY((LIST)BDY(opts));
+				if ( !strcmp(BDY((STRING)BDY(opt1)),"option_list") ) {
+					/*
+					 * the special option specification:
+					 *  option_list=[["o1","a1"],...]
+					 */
+					asir_assert(BDY(NEXT(opt1)),O_LIST,"evalf");
+					opts = BDY((LIST)BDY(NEXT(opt1)));
+				}
+			} else
+				opts = 0;
 			if ( !n ) {
 				cur_binf = f;
 				(*f->f.binf)(&val);
 			} else {
 				args = (LIST)eval(a);
+				if ( opts ) {
+					NEWOPTLIST(optlist);
+					BDY(optlist) = opts;
+					appendtonode(BDY(args),(pointer)optlist,&dmy);
+					if ( !BDY(args) ) BDY(args) = dmy;
+				}
 				cur_binf = f;
 				(*f->f.binf)(args?BDY(args):0,&val);
 			}
@@ -827,58 +849,26 @@ void searchuf(char *name,FUNC *r)
 		searchf(usrf,name,r);
 }
 
-/*
- * xxx.yyy() is searched in the flist 
- * of the module xxx.
- * yyy() is searched in the current flist
- * and proto list.
- */
-
-void searchuf_proto(char *name,FUNC *r)
-{
-	MODULE mod;
-	char *name0,*dot;
-
-	if ( dot = strchr(name,'.') ) {
-		name0 = (char *)ALLOCA(strlen(name)+1);
-		strcpy(name0,name);
-		dot = strchr(name0,'.');
-		*dot = 0;
-		mod = searchmodule(name0);
-		if ( mod )
-			searchf(mod->usrf_list,dot+1,r);
-	} else if ( CUR_MODULE )
-		searchf(CUR_MODULE->proto_list,name,r);
-}
-
 void gen_searchf(char *name,FUNC *r)
 {
 	FUNC val = 0;
-
-	if ( CUR_MODULE ) {
-		searchf(CUR_MODULE->usrf_list,name,&val);
-		if ( !val )
-			searchf(sysf,name,&val);
-		if ( !val )
-			searchf(ubinf,name,&val);
-		if ( !val )
-			searchpf(name,&val);
-		if ( !val )
-			searchuf_proto(name,&val);
-		if ( !val )
-			appenduf(name,&val);
-	} else {
-		if ( !val )
-			searchf(sysf,name,&val);
-		if ( !val )
-			searchf(ubinf,name,&val);
-		if ( !val )
-			searchpf(name,&val);
-		if ( !val )
-			searchuf(name,&val);
-		if ( !val )
-			appenduf(name,&val);
+	int global = 0;
+	if ( *name == ':' ) {
+		global = 1;
+		name += 2;
 	}
+	if ( CUR_MODULE && !global )
+		searchf(CUR_MODULE->usrf_list,name,&val);
+	if ( !val )
+		searchf(sysf,name,&val);
+	if ( !val )
+		searchf(ubinf,name,&val);
+	if ( !val )
+		searchpf(name,&val);
+	if ( !val )
+		searchuf(name,&val);
+	if ( !val )
+		appenduf(name,&val);
 	*r = val;
 }
 
@@ -908,44 +898,64 @@ void appenduf(char *name,FUNC *r)
 	f=(FUNC)MALLOC(sizeof(struct oFUNC)); 
 	f->id = A_UNDEF; f->argc = 0; f->f.binf = 0;
 	if ( dot = strchr(name,'.') ) {
-		/* undefined function in undefined module */
+		/* undefined function in a module */
 		len = dot-name;
 		modname = (char *)MALLOC_ATOMIC(len+1);
 		strncpy(modname,name,len); modname[len] = 0;
-		mod = mkmodule(modname);
 		fname = (char *)MALLOC_ATOMIC(strlen(name)-len+1);
 		strcpy(fname,dot+1);
 		f->name = fname;
-		MKNODE(mod->usrf_list,f,0);
+		f->fullname = name;
+		mod = searchmodule(modname);
+		if ( !mod )
+			mod = mkmodule(modname);
+		MKNODE(tn,f,mod->usrf_list); mod->usrf_list = tn;
 	} else {
 		f->name = name; 
-		if ( CUR_MODULE ) {
-			MKNODE(tn,f,CUR_MODULE->usrf_list); CUR_MODULE->usrf_list = tn;
-		} else {
-			MKNODE(tn,f,usrf); usrf = tn;
-		}
+		f->fullname = name;
+		MKNODE(tn,f,usrf); usrf = tn;
 	}
 	*r = f;
 }
 
-void appenduf_global(char *name,FUNC *r)
+void appenduf_local(char *name,FUNC *r)
 {
 	NODE tn;
 	FUNC f;
+	MODULE mod;
 
+	for ( tn = CUR_MODULE->usrf_list; tn; tn = NEXT(tn) )
+		if ( !strcmp(((FUNC)BDY(tn))->name,name) )
+			break;
+	if ( tn )
+		return;
+
 	f=(FUNC)MALLOC(sizeof(struct oFUNC)); 
 	f->id = A_UNDEF; f->argc = 0; f->f.binf = 0;
-	f->name = name; 
-	MKNODE(tn,f,usrf); usrf = tn;
+	f->name = name;
+	f->fullname =
+		(char *)MALLOC_ATOMIC(strlen(CUR_MODULE->name)+strlen(name)+1);
+	sprintf(f->fullname,"%s.%s",CUR_MODULE->name,name);
+	MKNODE(tn,f,CUR_MODULE->usrf_list); CUR_MODULE->usrf_list = tn;
 	*r = f;
 }
 
+void appenduflist(NODE n)
+{
+	NODE tn;
+	FUNC f;
+
+	for ( tn = n; tn; tn = NEXT(tn) )
+		appenduf_local((char *)BDY(tn),&f);
+}
+
 void mkparif(char *name,FUNC *r)
 {
 	FUNC f;
 
 	*r = f =(FUNC)MALLOC(sizeof(struct oFUNC)); 
 	f->name = name; f->id = A_PARI; f->argc = 0; f->f.binf = 0;
+	f->fullname = name;
 }
 
 void mkuf(char *name,char *fname,NODE args,SNODE body,int startl,int endl,char *desc,MODULE module)
@@ -957,6 +967,8 @@ void mkuf(char *name,char *fname,NODE args,SNODE body,
 	char *longname;
 	int argc;
 
+	if ( *name == ':' )
+		name += 2;
 	if ( !module ) {
 		searchf(sysf,name,&f);
 		if ( f ) {
@@ -979,10 +991,15 @@ void mkuf(char *name,char *fname,NODE args,SNODE body,
 		f=(FUNC)MALLOC(sizeof(struct oFUNC)); 
 		f->name = name; 
 		MKNODE(tn,f,usrf_list); usrf_list = tn;
-		if ( module )
+		if ( module ) {
+			f->fullname = 
+				(char *)MALLOC_ATOMIC(strlen(f->name)+strlen(module->name)+1);
+			sprintf(f->fullname,"%s.%s",module->name,f->name);
 			module->usrf_list = usrf_list;
-		else
+		} else {
+			f->fullname = f->name;
 			usrf = usrf_list;
+		}
 	}
 	if ( Verbose && f->id != A_UNDEF ) {
 		if ( module )
@@ -1057,45 +1074,14 @@ MODULE mkmodule(char *name)
 	}
 }
 
-/* register function names to the proto list of a module */
-
-void register_proto(NODE n)
-{
-	NODE tn,flist;
-	char *name;
-	FUNC val;
-
-	if ( !CUR_MODULE )
-		error("globalf : must be declared in a module.");
-	for ( tn = n; tn; tn = NEXT(tn) ) {
-		name = (char *)BDY(tn);
-		searchf(sysf,name,&val);
-		if ( val ) {
-			fprintf(stderr,"globalf : `%s' is a builtin function.",name);
-			error("");
-		}
-		searchf(ubinf,name,&val);
-		if ( val ) {
-			fprintf(stderr,
-				"globalf : `%s' is a user-defined builtin function.",name);
-			error("");
-		}
-		searchpf(name,&val);
-		if ( val ) {
-			fprintf(stderr,"globalf : `%s' is a pure function.",name);
-			error("");
-		}
-		searchf(usrf,name,&val);
-		if ( !val )
-			appenduf_global(name,&val);
-		MKNODE(flist,val,CUR_MODULE->proto_list);
-		CUR_MODULE->proto_list = flist;
-	}
-}
-
 void print_crossref(FUNC f)
 {
-	if ( show_crossref && CUR_FUNC )
-		fprintf(asir_out,"%s() at line %d in %s()\n",
-			f->name, asir_infile->ln, CUR_FUNC);
+  FUNC r;
+  if ( show_crossref && CUR_FUNC ) {
+	searchuf(f->fullname,&r);
+	if (r != NULL) {
+	  fprintf(asir_out,"%s() at line %d in %s()\n",
+			  f->fullname, asir_infile->ln, CUR_FUNC);
+	}
+  }
 }