===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v
retrieving revision 1.13
retrieving revision 1.24
diff -u -p -r1.13 -r1.24
--- OpenXM_contrib2/asir2000/parse/debug.c	2003/03/07 03:12:31	1.13
+++ OpenXM_contrib2/asir2000/parse/debug.c	2015/08/14 13:51:56	1.24
@@ -45,14 +45,11 @@
  * 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.12 2003/02/14 22:29:18 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.23 2015/08/08 14:19:42 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include <ctype.h>
-#if defined(PARI)
-#include "genpari.h"
-#endif
 
 extern do_server_in_X11,do_file;
 
@@ -150,7 +147,7 @@ void debug_init() {
 		fclose(fp);
 	}
 #if 0
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 )
 		init_cmdwin();
 #endif
@@ -209,25 +206,25 @@ void debug(SNODE f)
 	char buf[BUFSIZ];
 	char prompt[BUFSIZ];
 	char *p,*pe;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	char *line;
 #endif
 	NODE tn;
 	extern int do_fep;
 	NODE pvss;
 
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__)
 	if ( !isatty(fileno(stdin)) && !do_server_in_X11 )
 		if ( do_file )
 			ExitAsir();
 		else
 			return;
 #endif
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	suspend_timer();
 #endif
 	pvss = PVSS; debug_mode = 1;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(1);
@@ -250,7 +247,7 @@ void debug(SNODE f)
 			{
 				int len;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 				if ( do_server_in_X11 )
 					get_line(buf);
 				else 
@@ -343,7 +340,7 @@ void debug(SNODE f)
 	}
 LAST:
 	debug_mode = 0;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(0);
@@ -355,7 +352,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 +378,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 +390,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 +408,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 +440,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 +494,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;
@@ -692,7 +692,7 @@ void bp(SNODE f)
 		default:
 			ln = f->ln; break;
 	}
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(1);
@@ -700,7 +700,7 @@ void bp(SNODE f)
 		CPVS->usrf->name,ln,CPVS->usrf->f.usrf->fname);
 	targetf = CPVS->usrf; curline = ln;
 	println(0,0,1);
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 || isatty(0) )
 #endif
 		debug(f);
@@ -719,7 +719,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;
@@ -765,13 +765,6 @@ void printvars(char *s,VS vs)
 			val = eval(expr); 
 		CPVS = cpvs;
 		if ( !err ) {
-#if defined(PARI)
-#if defined(PARI1)
-			outfile = stderr;
-#else
-			pari_outfile = stderr;
-#endif
-#endif
 			asir_out = stderr;
 			for ( p = s; isspace(*p); p++ );
 			fprintf(asir_out,"%s = ",p); 
@@ -784,13 +777,6 @@ void printvars(char *s,VS vs)
 #if defined(VISUAL_LIB)
 			w_noflush_stderr(0);
 #endif
-#if defined(PARI)
-#if defined(PARI1)
-			outfile = stdout;
-#else
-			pari_outfile = stdout;
-#endif
-#endif
 			asir_out = stdout;
 		}
 	}
@@ -835,6 +821,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)