===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/eval.c,v
retrieving revision 1.21
retrieving revision 1.29
diff -u -p -r1.21 -r1.29
--- OpenXM_contrib2/asir2000/parse/eval.c	2003/05/14 06:20:12	1.21
+++ OpenXM_contrib2/asir2000/parse/eval.c	2003/05/30 00:47:24	1.29
@@ -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.20 2003/02/14 22:29:18 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.28 2003/05/24 10:42:18 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -63,6 +63,7 @@ extern JMP_BUF timer_env;
 int f_break,f_return,f_continue;
 int evalstatline;
 int recv_intr;
+int show_crossref;
 
 pointer eval(FNODE f)
 {
@@ -803,26 +804,39 @@ MODULE searchmodule(char *name)
 	}
 	return 0;
 }
+/*
+ * xxx.yyy() is searched in the flist 
+ * of the module xxx.
+ * yyy() is searched in the global flist.
+ */
 
-void gen_searchf(char *name,FUNC *r)
+void searchuf(char *name,FUNC *r)
 {
-	FUNC val = 0;
 	MODULE mod;
 	char *name0,*dot;
 
-	if ( CUR_MODULE )
-		searchf(CUR_MODULE->usrf_list,name,&val);
-	if ( !val ) {
-		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,&val);
-		}
+	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
+		searchf(usrf,name,r);
+}
+
+void gen_searchf(char *name,FUNC *r)
+{
+	FUNC val = 0;
+	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 )
@@ -830,7 +844,7 @@ void gen_searchf(char *name,FUNC *r)
 	if ( !val )
 		searchpf(name,&val);
 	if ( !val )
-		searchf(usrf,name,&val);
+		searchuf(name,&val);
 	if ( !val )
 		appenduf(name,&val);
 	*r = val;
@@ -849,27 +863,77 @@ void searchf(NODE fn,char *name,FUNC *r)
 	*r = 0;
 }
 
+MODULE mkmodule(char *);
+
 void appenduf(char *name,FUNC *r)
 {
 	NODE tn;
 	FUNC f;
+	int len;
+	MODULE mod;
+	char *modname,*fname,*dot;
 
 	f=(FUNC)MALLOC(sizeof(struct oFUNC)); 
-	f->name = name; f->id = A_UNDEF; f->argc = 0; f->f.binf = 0;
-	if ( CUR_MODULE ) {
-		MKNODE(tn,f,CUR_MODULE->usrf_list); CUR_MODULE->usrf_list = tn;
+	f->id = A_UNDEF; f->argc = 0; f->f.binf = 0;
+	if ( dot = strchr(name,'.') ) {
+		/* undefined function in a module */
+		len = dot-name;
+		modname = (char *)MALLOC_ATOMIC(len+1);
+		strncpy(modname,name,len); modname[len] = 0;
+		fname = (char *)MALLOC_ATOMIC(strlen(name)-len+1);
+		strcpy(fname,dot+1);
+		f->name = fname;
+		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; 
+		f->fullname = name;
 		MKNODE(tn,f,usrf); usrf = tn;
 	}
 	*r = f;
 }
 
+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;
+	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)
@@ -881,6 +945,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 ) {
@@ -903,10 +969,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 )
@@ -920,6 +991,7 @@ void mkuf(char *name,char *fname,NODE args,SNODE body,
 	t->desc = desc;
 	f->id = A_USR; f->argc = argc; f->f.usrf = t;
 	CPVS = GPVS;
+	CUR_FUNC = 0;
 	clearbp(f);
 }
 
@@ -951,8 +1023,6 @@ Obj getopt_from_cpvs(char *key)
 
 }
 
-extern NODE MODULE_LIST;
-
 MODULE mkmodule(char *name)
 {
 	MODULE mod;
@@ -980,4 +1050,16 @@ MODULE mkmodule(char *name)
 		MODULE_LIST = m;
 		return mod;
 	}
+}
+
+void print_crossref(FUNC f)
+{
+  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);
+	}
+  }
 }