=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/debug.c,v retrieving revision 1.19 retrieving revision 1.23 diff -u -p -r1.19 -r1.23 --- OpenXM_contrib2/asir2000/parse/debug.c 2006/12/05 01:47:08 1.19 +++ OpenXM_contrib2/asir2000/parse/debug.c 2015/08/08 14:19:42 1.23 @@ -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.18 2006/02/28 08:36:39 noro 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 -#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__) && !defined(__MINGW64__) if ( do_server_in_X11 ) init_cmdwin(); #endif @@ -195,6 +192,9 @@ void show_alias(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(SNODE f) @@ -209,25 +209,25 @@ void debug(SNODE f) char buf[BUFSIZ]; char prompt[BUFSIZ]; char *p,*pe; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) char *line; #endif NODE tn; extern int do_fep; NODE pvss; -#if !defined(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); @@ -250,7 +250,7 @@ void debug(SNODE f) { int len; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 ) get_line(buf); else @@ -343,7 +343,7 @@ void debug(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); @@ -443,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); @@ -457,6 +457,9 @@ void setbp(char *p) showbp(bpi); } } +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif } void settp(char *p) @@ -542,6 +545,9 @@ void settp(char *p) showbp(bpi); } } +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif } void clearbp(FUNC f) @@ -623,6 +629,9 @@ void showbp(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(SNODE *fp,int n,SNODE **fpp) @@ -695,15 +704,18 @@ void bp(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 !defined(MPI) && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( do_server_in_X11 || isatty(0) ) #endif debug(f); @@ -748,6 +760,9 @@ void println(int ac,char **av,int l) } curline = ln + i; fclose(fp); +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif } void printvars(char *s,VS vs) @@ -768,13 +783,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); @@ -787,13 +795,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; } } @@ -815,6 +816,9 @@ 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 } } @@ -858,7 +862,7 @@ void showpos_to_list(LIST *r) /* builtin : [0,0,name] */ MKSTR(null,""); MKSTR(name,cur_binf->name); - t = mknode(3,null,name,0); + t = mknode(3,null,name,NULLP); MKLIST(l,t); MKNODE(u1,l,0); u = u1; } @@ -907,4 +911,7 @@ 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 }