===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v
retrieving revision 1.8
retrieving revision 1.23
diff -u -p -r1.8 -r1.23
--- OpenXM_contrib2/asir2000/parse/debug.c	2001/08/20 09:03:27	1.8
+++ OpenXM_contrib2/asir2000/parse/debug.c	2015/08/08 14:19:42	1.23
@@ -45,33 +45,12 @@
  * 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.7 2000/12/22 10:03:31 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/debug.c,v 1.22 2015/08/06 10:01:53 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include <ctype.h>
-#if PARI
-#include "genpari.h"
-#endif
 
-void show_stack(VS);
-void change_stack(int,NODE *);
-void showpos(void);
-void printvars(char *,VS);
-void println(int,char **,int);
-void bp(SNODE);
-void searchsn(SNODE *,int,SNODE **);
-void showbp(int);
-void showbps(void);
-void delbp(int,char **);
-int searchbp(void);
-void clearbp(FUNC);
-void settp(char *);
-void setbp(char *);
-void setf(int,char **);
-void show_alias(char *);
-void add_alias(char *,char *);
-
 extern do_server_in_X11,do_file;
 
 typedef enum {
@@ -96,7 +75,7 @@ static int curline = 1;
 extern NODE PVSS;
 extern unsigned int evalstatline;
 extern int debug_mode;
-extern jmp_buf debug_env;
+extern JMP_BUF debug_env;
 
 char *debcom[] = {
 	"next",
@@ -167,14 +146,15 @@ void debug_init() {
 		}
 		fclose(fp);
 	}
-#if !defined(VISUAL)
+#if 0
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( do_server_in_X11 )
 		init_cmdwin();
 #endif
+#endif
 }
 
-void add_alias(com,alias)
-char *com,*alias;
+void add_alias(char *com,char *alias)
 {
 	int i;
 	NODE tn;
@@ -189,8 +169,7 @@ char *com,*alias;
 		}
 }
 
-void show_alias(alias)
-char *alias;
+void show_alias(char *alias)
 {
 	int i;
 	NODE tn;
@@ -213,10 +192,12 @@ char *alias;
 				if ( !strcmp(alias,BDY(tn)) ) {
 					fprintf(stderr,"%s->%s\n",alias,debcom[i]); return;
 				}
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
-void debug(f)
-SNODE f;
+void debug(SNODE f)
 {
 	int ac,i,n;
 	did id;
@@ -227,28 +208,31 @@ SNODE f;
 #endif
 	char buf[BUFSIZ];
 	char prompt[BUFSIZ];
-	char *p,*pe,*line;
+	char *p,*pe;
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
+	char *line;
+#endif
 	NODE tn;
 	extern int do_fep;
 	NODE pvss;
 
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( !isatty(fileno(stdin)) && !do_server_in_X11 )
 		if ( do_file )
 			ExitAsir();
 		else
 			return;
 #endif
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 	suspend_timer();
 #endif
 	pvss = PVSS; debug_mode = 1;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(1);
 	sprintf(prompt,"(debug) ");
-	setjmp(debug_env);
+	SETJMP(debug_env);
 	while ( 1 ) {
 #if FEP
 		if ( !do_fep )
@@ -266,7 +250,7 @@ SNODE f;
 			{
 				int len;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 				if ( do_server_in_X11 )
 					get_line(buf);
 				else 
@@ -359,21 +343,19 @@ SNODE f;
 	}
 LAST:
 	debug_mode = 0;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(0);
 }
 
-void setf(ac,av)
-int ac;
-char **av;
+void setf(int ac,char **av)
 {
 	FUNC r;
 
 	if ( !ac )
 		return;
-	searchf(usrf,av[0],&r);
+	searchuf(av[0],&r);
 	if ( r ) {
 		targetf = r;
 		curline = targetf->f.usrf->startl;
@@ -392,15 +374,14 @@ static struct {
 
 static int bpindex = 0;
 
-void setbp(p)
-char *p;
+void setbp(char *p)
 {
 	int ac;
 	char *av[BUFSIZ];
 	char *buf,*savp;
 	char *fname;
 	FUNC r;
-	USRF t;
+	USRF uf,t;
 	SNODE *snp = 0;
 	FNODE cond;
 	NODE tn;
@@ -412,8 +393,11 @@ 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 ) )
@@ -427,7 +411,7 @@ 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;
@@ -459,7 +443,7 @@ 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);
@@ -473,10 +457,12 @@ char *p;
 			showbp(bpi);
 		}
 	}
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
-void settp(p)
-char *p;
+void settp(char *p)
 {
 	int ac;
 	char *_av[BUFSIZ];
@@ -514,7 +500,7 @@ 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;
@@ -559,10 +545,12 @@ char *p;
 			showbp(bpi);
 		}
 	}
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
-void clearbp(f)
-FUNC f;
+void clearbp(FUNC f)
 {
 	int i;
 
@@ -587,9 +575,7 @@ int searchbp()
 		return bpindex++;
 }
 
-void delbp(ac,av)
-int ac;
-char **av;
+void delbp(int ac,char **av)
 {
 	int n;
 
@@ -610,8 +596,7 @@ void showbps() {
 		showbp(i);
 }
 
-void showbp(n)
-int n;
+void showbp(int n)
 {
 	if ( bpt[n].snp )
 		if ( bpt[n].texpr )
@@ -644,12 +629,12 @@ int n;
 				else
 					fprintf(stderr,"(%d) stop in %s\n",n,bpt[n].f->name);
 			}
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
-void searchsn(fp,n,fpp)
-SNODE *fp;
-int n;
-SNODE **fpp;
+void searchsn(SNODE *fp,int n,SNODE **fpp)
 {
 	NODE tn;
 	SNODE sn;
@@ -706,8 +691,7 @@ SNODE **fpp;
 	}
 }
 
-void bp(f)
-SNODE f;
+void bp(SNODE f)
 {
 	int ln;
 
@@ -720,24 +704,24 @@ SNODE f;
 		default:
 			ln = f->ln; break;
 	}
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(1);
 	fprintf(stderr,"stopped in %s at line %d in file \"%s\"\n",
 		CPVS->usrf->name,ln,CPVS->usrf->f.usrf->fname);
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 	targetf = CPVS->usrf; curline = ln;
 	println(0,0,1);
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__)
 	if ( do_server_in_X11 || isatty(0) )
 #endif
 		debug(f);
 }
 
-void println(ac,av,l)
-int ac;
-char **av;
-int l;
+void println(int ac,char **av,int l)
 {
 	FILE *fp;
 	char buf[BUFSIZ+1];
@@ -750,7 +734,7 @@ 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;
@@ -776,11 +760,12 @@ int l;
 	}
 	curline = ln + i;
 	fclose(fp);
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }
 
-void printvars(s,vs)
-char *s;
-VS vs;
+void printvars(char *s,VS vs)
 {
 	FNODE expr;
 	char *p;
@@ -794,17 +779,10 @@ VS vs;
 		}
 	if ( exprparse(vs==GPVS?0:vs->usrf,s,&expr) ) {
 		cpvs = CPVS; CPVS = vs;
-		if ( !(err = setjmp(debug_env)) )
+		if ( !(err = SETJMP(debug_env)) )
 			val = eval(expr); 
 		CPVS = cpvs;
 		if ( !err ) {
-#if PARI
-#if PARI1
-			outfile = stderr;
-#else
-			pari_outfile = stderr;
-#endif
-#endif
 			asir_out = stderr;
 			for ( p = s; isspace(*p); p++ );
 			fprintf(asir_out,"%s = ",p); 
@@ -817,13 +795,6 @@ VS vs;
 #if defined(VISUAL_LIB)
 			w_noflush_stderr(0);
 #endif
-#if PARI
-#if PARI1
-			outfile = stdout;
-#else
-			pari_outfile = stdout;
-#endif
-#endif
 			asir_out = stdout;
 		}
 	}
@@ -845,11 +816,13 @@ void showpos()
 			fprintf(stderr,"#%d %s(), line %d in \"%s\"\n",
 				level-vs->level,vs->usrf->name,vs->at,vs->usrf->f.usrf->fname);
 		}
+#if defined(__MINGW32__) || defined(__MINGW64__)
+		fflush(stderr);
+#endif
 	}
 }
 
-void showpos_to_string(buf)
-char *buf;
+void showpos_to_string(char *buf)
 {
 	NODE n;
 	VS vs;
@@ -871,10 +844,51 @@ char *buf;
 	}
 }
 
-void change_stack(level,pvss)
-int level;
-NODE *pvss;
+/* [[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)
+{
 	extern NODE PVSS;
 	NODE n;
 	int i;
@@ -893,9 +907,11 @@ NODE *pvss;
 	targetf = vs->usrf; curline = vs->at;
 }
 
-void show_stack(vs)
-VS vs;
+void show_stack(VS vs)
 {
 	fprintf(stderr,"#%d %s(), line %d in \"%s\"\n",
 		((VS)BDY(PVSS))->level-vs->level,vs->usrf->name,vs->at,vs->usrf->f.usrf->fname);
+#if defined(__MINGW32__) || defined(__MINGW64__)
+	fflush(stderr);
+#endif
 }