=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.1 retrieving revision 1.4 diff -u -p -r1.1 -r1.4 --- OpenXM/src/kxx/ox_texmacs.c 2004/02/29 03:00:37 1.1 +++ OpenXM/src/kxx/ox_texmacs.c 2004/03/01 07:55:38 1.4 @@ -1,4 +1,4 @@ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.3 2004/02/29 13:02:44 takayama Exp $ */ #include #include @@ -16,30 +16,60 @@ #define LONGJMP(env,p) longjmp(env,p) #endif -#define DATA_BEGIN_V "" /* "\0x2verbatim:" */ -#define DATA_BEGIN_L "" /* "\0x2latex:" */ -#define DATA_BEGIN_P "" /* "\0x2prompt:" */ -#define DATA_END "" /* "\0x5" */ +/* +#define DEBUG +*/ +#define DEBUG2 +#ifdef DEBUG +#define DATA_BEGIN_V "" /* "\002verbatim:" */ +#define DATA_BEGIN_L "" /* "\002latex:" */ +#define DATA_BEGIN_P "" /* "\002channel:prompt " */ +#define DATA_END "" /* "\005" */ +#else +#define DATA_BEGIN_V "\002verbatim:" +#define DATA_BEGIN_L "\002latex:" +#define DATA_BEGIN_P "\002prompt:" +#define DATA_END "\005" +#endif + +/* +#define END_OF_INPUT '#' +*/ +#define END_OF_INPUT '\n' + extern int Quiet; extern JMP_BUF EnvOfStackMachine; -int Format=0; +int Format=1; /* 1 : latex mode */ +int OutputLimit_for_TeXmacs = (1024*10); void ctrlC(); struct object KpoString(char *s); char *KSpopString(void); -static char *readString(FILE *fp); +static char *readString(FILE *fp,char *prolog, char *eplog); static void printv(char *s); static void printl(char *s); static void printp(char *s); +static void printCopyright(char *s); +/* tail -f /tmp/debug-texmacs.txt + Debug output to understand the timing problem of pipe interface. +*/ +FILE *Dfp; + main() { char *s; char *r; char *sys; struct object ob; + int irt=0; + int vmode=1; +#ifdef DEBUG2 + Dfp = fopen("/tmp/debug-texmacs.txt","w"); +#endif + /* Set consts */ sys = "asir> "; Quiet = 1; @@ -47,6 +77,10 @@ main() { /* Initialize kanlib (gc is also initialized) */ KSstart(); + /* Main loop */ + printf("%s",DATA_BEGIN_V); + printCopyright(""); + /* Load ox engine here */ /* engine id should be set to ox.engine */ KSexecuteString(" [(parse) (ox.sm1) pushfile] extension "); @@ -55,19 +89,26 @@ main() { if (signal(SIGINT,SIG_IGN) != SIG_IGN) { signal(SIGINT,ctrlC); } - /* Main loop */ + + irt = 0; while(1) { - printp(sys); + /* printp(sys); no prompt */ if (SETJMP(EnvOfStackMachine)) { printv("Syntax error or an interruption\n"); KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */ if (signal(SIGINT,SIG_IGN) != SIG_IGN) { signal(SIGINT,ctrlC); } + irt = 1; continue; } else { } - s=readString(stdin); - if (s[0] == 0 || (strcmp(s,"quit;")==0)) break; + if (!irt) { + printf("%s",DATA_END); fflush(stdout); + } + irt = 0; + s=readString(stdin, "if (1) { ", " ; }else{ }"); /* see test data */ + if (s == NULL) break; + printf("%s",DATA_BEGIN_V); KSexecuteString(" ox.engine "); ob = KpoString(s); KSpush(ob); @@ -76,22 +117,58 @@ main() { /* Get the result in string. */ if (Format == 1) { /* translate to latex form */ + KSexecuteString(" ox.engine oxpushcmotag ox.engine oxpopcmo "); + ob = KSpop(); + vmode = 0; + /* printf("id=%d\n",ob.tag); bug: matrix return 17 instead of Sinteger + or error. */ + if (ob.tag == Sinteger) { + /* printf("cmotag=%d\n",ob.lc.ival);*/ + if (ob.lc.ival == CMO_ERROR2) { + vmode = 1; + } + } + if (vmode) { + KSexecuteString(" ox.engine oxpopstring "); + r = KSpopString(); + }else{ + KSexecuteString(" ox.engine 1 oxpushcmo ox.engine (print_tex_form) oxexec "); + KSexecuteString(" ox.engine oxpopstring "); + r = KSpopString(); + } + if (strlen(r) < OutputLimit_for_TeXmacs) { + if (vmode) printv(r); else printl(r); + } else printv("Output is too large.\n"); }else{ KSexecuteString(" ox.engine oxpopstring "); r = KSpopString(); - printv(r); + if (strlen(r) < OutputLimit_for_TeXmacs) printv(r); + else printv("Output is too large.\n"); } } } - #define SB_SIZE 1024 -static char *readString(FILE *fp) { +#define INC_BUF if (n >= limit-3) { \ + tmp = s; \ + limit *= 2; \ + s = (char *) sGC_malloc(limit); \ + if (s == NULL) { \ + fprintf(stderr,"No more memory.\n"); \ + exit(10); \ + } \ + strcpy(s,tmp); \ + } +/* */ +static char *readString(FILE *fp, char *prolog, char *epilog) { int n = 0; static int limit = 0; static char *s; int c; char *tmp; + int i; + int m; + int start; if (limit == 0) { limit = 1024; s = (char *)sGC_malloc(limit); @@ -100,23 +177,39 @@ static char *readString(FILE *fp) { exit(10); } } - s[0] = 0; n = 0; + s[0] = 0; n = 0; m = 0; + for (i=0; i < strlen(prolog); i++) { + s[n++] = prolog[i]; s[n] = 0; + INC_BUF ; + } + start = n; while ((c = fgetc(fp)) != EOF) { - if (c == '\n') { - return s; - } - s[n++] = c; s[n] = 0; - if (n >= limit-3) { - tmp = s; - limit *= 2; - s = (char *) sGC_malloc(limit); - if (s == NULL) { - fprintf(stderr,"No more memory.\n"); - exit(10); +#ifdef DEBUG2 + fprintf(Dfp,"[%x] ",c); fflush(Dfp); +#endif + if (c == END_OF_INPUT) { + if (oxSocketSelect0(0,1)) { + /* If there remains data in the stream, + read the remaining data. */ + if (c == '\n') c=' '; + s[n++] = c; s[n] = 0; m++; + INC_BUF ; + continue; } - strcpy(s,tmp); + break; } + if (c == '\n') c=' '; + s[n++] = c; s[n] = 0; m++; + INC_BUF ; } + if (strcmp(&(s[start]),"quit;") == 0) { + printv("Terminated the process ox_texmacs.\n"); + exit(0); + } + for (i=0; i < strlen(epilog); i++) { + s[n++] = epilog[i]; s[n] = 0; + INC_BUF ; + } return s; } @@ -125,24 +218,44 @@ static void printv(char *s) { printf("%s",DATA_BEGIN_V); printf("%s",s); printf("%s",DATA_END); - /* for debug "hello; - for (i=0; i",s); fflush(Dfp); +#endif fflush(NULL); } static void printl(char *s) { printf("%s",DATA_BEGIN_L); - printf("%s",s); + printf(" $ %s $ ",s); printf("%s",DATA_END); fflush(NULL); } static void printp(char *s) { printf("%s",DATA_BEGIN_P); + printf("%s",DATA_END); + printf("%s] ",s); + fflush(NULL); +} +static void printCopyright(char *s) { + printf("%s",DATA_BEGIN_V); + printf("OpenXM engine (ox engine) interface for TeXmacs\n2004 (C) openxm.org\n"); printf("%s",s); printf("%s",DATA_END); fflush(NULL); } + +/* test data + +1. print("hello"); print("afo"); + + 1+2; + +2. def foo(N) { for (I=0; I<10; I++) { --> error + + 3+5; + +4. print("hello"); shift+return print("afo"); + +*/ + + +