===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v
retrieving revision 1.12
retrieving revision 1.20
diff -u -p -r1.12 -r1.20
--- OpenXM_contrib2/asir2000/parse/debug.c	2003/02/14 22:29:18	1.12
+++ OpenXM_contrib2/asir2000/parse/debug.c	2011/06/16 08:17:15	1.20
@@ -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/debug.c,v 1.11 2001/12/25 02:39:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.19 2006/12/05 01:47:08 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -234,14 +234,14 @@ void debug(SNODE f)
 	sprintf(prompt,"(debug) ");
 	SETJMP(debug_env);
 	while ( 1 ) {
-#if defined(FEP)
+#if FEP
 		if ( !do_fep )
 #endif
 			if ( !do_server_in_X11 )
 				fputs(prompt,stderr);
 		bzero(buf,BUFSIZ);
 		while ( 1 ) {
-#if defined(FEP)
+#if FEP
 			if ( do_fep ) {
 				line = (char *)readline_console(prompt);
 				strcpy(buf,line); free(line);
@@ -355,7 +355,7 @@ void setf(int ac,char **av)
 
 	if ( !ac )
 		return;
-	searchf(usrf,av[0],&r);
+	searchuf(av[0],&r);
 	if ( r ) {
 		targetf = r;
 		curline = targetf->f.usrf->startl;
@@ -381,7 +381,7 @@ void setbp(char *p)
 	char *buf,*savp;
 	char *fname;
 	FUNC r;
-	USRF t;
+	USRF uf,t;
 	SNODE *snp = 0;
 	FNODE cond;
 	NODE tn;
@@ -393,8 +393,11 @@ void setbp(char *p)
 	if ( !strcmp(av[0],"at") ) {
 		if ( !targetf )
 			return;
-		n = atoi(av[1]); fname = targetf->f.usrf->fname;
-		for ( tn = usrf; tn; tn = NEXT(tn) ) {
+		n = atoi(av[1]);
+		uf = targetf->f.usrf;
+		fname = uf->fname;
+		tn = uf->module?uf->module->usrf_list:usrf;
+		for ( ; tn; tn = NEXT(tn) ) {
 			r = (FUNC)BDY(tn); t = r->f.usrf;
 			if ( t && t->fname && !strcmp(t->fname,fname) 
 				&& ( t->startl <= n ) && ( n <= t->endl ) )
@@ -408,7 +411,7 @@ void setbp(char *p)
 		}
 		at = 1; searchsn(&BDY(t),n,&snp);
 	} else if ( !strcmp(av[0],"in") ) {
-		searchf(usrf,av[1],&r);
+		searchuf(av[1],&r);
 		if ( !r ) {
 			fprintf(stderr,"%s() : no such function\n",av[1]);
 			return;
@@ -440,7 +443,7 @@ void setbp(char *p)
 				default:
 					ln = (*snp)->ln; break;
 			}
-			*snp = (SNODE)mksnode(3,S_BP,*snp,cond,0);
+			*snp = (SNODE)mksnode(3,S_BP,*snp,cond,NULLP);
 			(*snp)->ln = ln;
 			if ( cond ) {
 				bpt[bpi].cond = (char *)MALLOC(strlen(savp)+1);
@@ -494,7 +497,7 @@ void settp(char *p)
 		}
 		at = 1; searchsn(&BDY(t),n,&snp);
 	} else if ( !strcmp(av[0],"in") ) {
-		searchf(usrf,av[1],&r);
+		searchuf(av[1],&r);
 		if ( !r ) {
 			fprintf(stderr,"%s() : no such function\n",av[1]);
 			return;
@@ -719,7 +722,7 @@ void println(int ac,char **av,int l)
 	else if ( isdigit(av[0][0]) )
 		ln = atoi(av[0]);
 	else {
-		searchf(usrf,av[0],&r);
+		searchuf(av[0],&r);
 		if ( r && r->id != A_UNDEF ) {
 			targetf = r;
 			ln = r->f.usrf->startl;
@@ -835,6 +838,49 @@ void showpos_to_string(char *buf)
 			buf += strlen(buf);
 		}
 	}
+}
+
+/* [[file,line,name],...] */
+
+extern int at_root;
+
+void showpos_to_list(LIST *r)
+{
+	NODE n,u,u1,t;
+	VS vs;
+	STRING null,name,fname,kwd;
+	LIST l,b;
+	USINT us;
+
+	u = 0;
+	if ( PVSS ) {
+		if ( cur_binf ) {
+			/* builtin : [0,0,name] */
+			MKSTR(null,"");
+			MKSTR(name,cur_binf->name);
+			t = mknode(3,null,name,NULLP);
+			MKLIST(l,t);
+			MKNODE(u1,l,0); u = u1;
+		}
+		((VS)BDY(PVSS))->at = evalstatline;
+		for ( n = PVSS; n; n = NEXT(n) ) {
+			vs = (VS)BDY(n);
+			MKSTR(fname,vs->usrf->f.usrf->fname);
+			MKUSINT(us,vs->at);
+			MKSTR(name,vs->usrf->name);
+			t = mknode(3,fname,name,us);
+			MKLIST(l,t);
+			MKNODE(u1,l,u); u = u1;
+		}
+	}
+	/* line number at the toplevel */
+	MKSTR(fname,"toplevel"); MKUSINT(us,at_root);
+	t = mknode(2,fname,us); MKLIST(l,t); MKNODE(u1,l,u); u = u1;
+	MKLIST(b,u);
+
+	MKSTR(kwd,"asir_where");
+	t = mknode(2,kwd,b); 
+	MKLIST(*r,t);
 }
 
 void change_stack(int level,NODE *pvss)