=================================================================== RCS file: /home/cvs/OpenXM/src/k097/d.c,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- OpenXM/src/k097/d.c 2000/12/10 02:21:45 1.6 +++ OpenXM/src/k097/d.c 2002/02/24 10:27:21 1.8 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/k097/d.c,v 1.5 2000/05/04 11:05:19 takayama Exp $ */ +/* $OpenXM: OpenXM/src/k097/d.c,v 1.7 2001/01/08 05:26:48 takayama Exp $ */ /* simple.c, 1996, 1/1 --- 1/5 */ #include #include @@ -7,8 +7,17 @@ #include "d.h" #include "simple.tab.h" +#if defined(__CYGWIN__) +#define JMP_BUF sigjmp_buf +#define SETJMP(env) sigsetjmp(env,1) +#define LONGJMP(env,p) siglongjmp(env,p) +#else +#define JMP_BUF jmp_buf +#define SETJMP(env) setjmp(env) +#define LONGJMP(env,p) longjmp(env,p) +#endif -jmp_buf KCenvOfParser; +JMP_BUF KCenvOfParser; int DebugMode = 1; extern int K00_verbose; @@ -34,6 +43,9 @@ int Debug2 = 0; int Interactive = 1; +static int isThereStdin(); +#define MARK_CHAR 3 + main2(int argc, char *argv[]) { FILE *f; FILE *outf; @@ -584,8 +596,14 @@ KCerror(char *s) /* You need this function. Otherwis { K00recoverFromError(); fprintf(stderr,"\nSyntax Error in the line %d:%s\n",Linenumber,s); - showStringBuff(Inop); return ; - longjmp(KCenvOfParser,2); + showStringBuff(Inop); + /* Clean the junks. Try load("debug/buggy.k"); */ + if (isThereStdin()) { + ungetc(MARK_CHAR,stdin); + while (fsgetc(Inop) > MARK_CHAR) ; + } + return ; + LONGJMP(KCenvOfParser,2); exit(1); } @@ -875,6 +893,15 @@ static int popFile() { /* Saki = SakiStack[Stackp]; */ Saki = '\n'; return(Saki); +} + +static int isThereStdin() { + if (Stackp > 1 && (InopStack[1])->tag == Sfile + && (InopStack[1])->lc.file == stdin) { + return(1); + }else{ + return(0); + } } int fsgetc(objectp op) {