=================================================================== RCS file: /home/cvs/OpenXM/src/k097/d.c,v retrieving revision 1.2 retrieving revision 1.14 diff -u -p -r1.2 -r1.14 --- OpenXM/src/k097/d.c 2000/01/21 03:01:25 1.2 +++ OpenXM/src/k097/d.c 2004/06/16 02:40:10 1.14 @@ -1,19 +1,31 @@ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/k097/d.c,v 1.13 2003/07/22 07:39:57 takayama Exp $ */ /* simple.c, 1996, 1/1 --- 1/5 */ #include #include #include #include +#include +#include #include "d.h" #include "simple.tab.h" +#include "ox_pathfinder.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; -static FILE *outfile = stdout; +static FILE *outfile; int Linenumber = 0; objectp Inop = (objectp) NULL; /* Input stream */ int Saki = 0; /* Look a head */ @@ -34,6 +46,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 +599,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); } @@ -877,6 +898,15 @@ static int popFile() { 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) { struct stringBuf *obuf; char *str; @@ -961,19 +991,22 @@ void parseAstring(char *s) } -void loadFile(objectp op) -{ +objectp checkIfTheFileExists(objectp op) { FILE *fp; char fname[1024]; + char *s; + objectp nullObj; + nullObj = NULL; if (op->tag != Sstring) { fprintf(stderr,"File name must be given as an argment of load.\n"); - return; + return nullObj; } - if (strlen(op->lc.str) > 1000) { + if (strlen(op->lc.str) > 800) { fprintf(stderr,"Too long file name.\n"); - return; + return nullObj; } - fp = fopen(op->lc.str,"r"); + strcpy(fname,op->lc.str); + fp = fopen(fname,"r"); if (fp == (FILE *)NULL) { strcpy(fname,getLOAD_K_PATH()); strcat(fname,op->lc.str); @@ -983,11 +1016,36 @@ void loadFile(objectp op) strcat(fname,op->lc.str); fp = fopen(fname,"r"); if (fp == (FILE *)NULL) { - fprintf(stderr,"Cannot open the file <<%s>> for loading in the current directory nor the library directories %s and %s.\n",op->lc.str,getLOAD_K_PATH(),LOAD_K_PATH); - return; + fprintf(stderr,"Cannot open the file <<%s>> for loading in the current directory nor the library directories %s and %s.\n",op->lc.str,getLOAD_K_PATH(),LOAD_K_PATH); + return nullObj; } } } + close(fp); + op = newObject_d(); + op->tag = Sstring; + s = (char *)GC_malloc(sizeof(char)*(strlen(fname)+1)); + if (s == NULL) fprintf(stderr,"No more memory.\n"); + strcpy(s,fname); + op->lc.str = s; + return(op); +} + +void loadFile(objectp op) +{ + FILE *fp; + char fname[1024]; + if (op->tag != Sstring) { + fprintf(stderr,"File name must be given as an argment of load.\n"); + return; + } + op = checkIfTheFileExists(op); + if (op == NULL) return; + if (strlen(op->lc.str) > 1000) { + fprintf(stderr,"Too long file name.\n"); + return; + } + fp = fopen(op->lc.str,"r"); if (K00_verbose) fprintf(stderr,"Reading the file <<%s>>... ",op->lc.str); parseAfile(fp); if (K00_verbose) fprintf(stderr,"\nClosed the file <<%s>>.\n",op->lc.str); @@ -997,24 +1055,68 @@ void loadFileWithCpp(objectp op) { FILE *fp; char fname[1024]; + char tmpName[1024]; + int pid; objectp ob; + char *outfile; + char *cpp; + char *argv[10]; + int n; + char *sfile = NULL; if (op->tag != Sstring) { fprintf(stderr,"File name must be given as an argment of load.\n"); return; } + op = checkIfTheFileExists(op); + if (op == NULL) return; if (strlen(op->lc.str) > 900) { fprintf(stderr,"Too long file name.\n"); return; } - system("/bin/rm -f k00.cppload.tmp"); - strcpy(fname,"/lib/cpp -P -lang-c++ <"); - strcat(fname,op->lc.str); - strcat(fname," >k00.cppload.tmp"); - system(fname); + /* Use gcc -v to know what symbols are defined. + if defined(linux) || defined(__linux__) + Removed old codes. */ + + sfile = op->lc.str; + cpp = getCppPath(); + if (cpp == NULL) { + fprintf(stderr,"cpp is not found.\n"); return; + } + /* printf("%s\n",cpp); */ + outfile = generateTMPfileName("k0-cpp"); + if (outfile == NULL) { + fprintf(stderr,"Failed to generate a temporary file name.\n"); return; + } + /* printf("%s\n",outfile); */ + if ((char *)strstr(cpp,"/asir/bin/cpp.exe") == NULL) { +#if defined(__APPLE_CC__) + sprintf(tmpName,"cpp -P %s | sed -e 's/^\\#.*//g' >%s",sfile,outfile); +#else + argv[0] = cpp; + argv[1] = "-P"; + argv[2] = "-lang-c++"; + argv[3] = sfile; + argv[4] = outfile; + argv[5] = NULL; +#endif + }else{ + argv[0] = cpp; + argv[1] = "-P"; + argv[2] = cygwinPathToWinPath(sfile); + argv[3] = cygwinPathToWinPath(outfile); + argv[4] = NULL; + } +#if defined(__APPLE_CC__) + system(tmpName); +#else + n=oxForkExecBlocked(argv); +#endif + ob = newObject_d(); ob->tag = Sstring; - ob->lc.str = "k00.cppload.tmp"; + ob->lc.str = outfile; loadFile(ob); + unlink(outfile); } void showStringBuff(objectp op) @@ -1046,20 +1148,8 @@ void showStringBuff(objectp op) fprintf(stderr,"\n"); } + + char *getLOAD_K_PATH() { - char *p; - char *p2; - p = getenv("LOAD_K_PATH"); - if (p == NULL) { - return("/usr/local/lib/kxx97/yacc/"); - }else{ - if (strlen(p) == 0) return(p); - if (p[strlen(p)-1] == '/') return(p); - /* Add / */ - p2 = (char *) malloc(sizeof(char)*(strlen(p)+3)); - if (p2 == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); } - strcpy(p2,p); strcat(p2,"/"); - return(p2); - } + return getLOAD_K_PATH2(); } -