=================================================================== RCS file: /home/cvs/OpenXM/src/hgm/mh/src/sfile.c,v retrieving revision 1.14 retrieving revision 1.18 diff -u -p -r1.14 -r1.18 --- OpenXM/src/hgm/mh/src/sfile.c 2013/03/07 05:23:31 1.14 +++ OpenXM/src/hgm/mh/src/sfile.c 2015/03/24 05:59:43 1.18 @@ -1,9 +1,10 @@ /* - $OpenXM: OpenXM/src/hgm/mh/src/sfile.c,v 1.13 2013/03/07 03:00:43 takayama Exp $ + $OpenXM: OpenXM/src/hgm/mh/src/sfile.c,v 1.17 2014/03/14 05:58:16 takayama Exp $ */ #include #include #include +#include #ifndef STANDALONE #include #include @@ -12,6 +13,8 @@ #define SSIZE 5 int MH_DEBUG = 0; +static int isIntString(char s[]); + void mh_check_intr(int interval) { static int intr=0; if (intr >= interval) { @@ -26,19 +29,19 @@ void *mh_malloc(int s) { void *p; static int total=0; total += s; - if (MH_DEBUG) printf("mh_malloc total allocated memory: %f M\n",(float)total/(float)(1024*1024)); + if (MH_DEBUG) oxprintf("mh_malloc total allocated memory: %f M\n",(float)total/(float)(1024*1024)); #ifdef STANDALONE p = (void*)malloc(s); #else p = (void *)R_alloc(1,s); #endif if (p == NULL) { - fprintf(stderr,"No memory.\n"); mh_exit(-1); + oxprintfe("No memory.\n"); mh_exit(-1); } return(p); } int mh_free(void *p) { - if (MH_DEBUG) printf("mh_free at %p\n",p); + if (MH_DEBUG) oxprintf("mh_free at %p\n",p); #ifdef STANDALONE free(p); /* free in mh_free */ #endif @@ -51,7 +54,7 @@ int mh_exit(int n) { if (n == MH_RESET_EXIT) { standalone=1; return(0);} if (standalone) exit(n); else { - fprintf(stderr,"Fatal error mh_exit(%d) in mh-w-n.\n",n); + oxprintfe("Fatal error mh_exit(%d) in mh-w-n.\n",n); return(n); } #else @@ -68,7 +71,7 @@ struct SFILE *mh_fopen(char *name,char *mode,int byFil if (byFile) { sfp->byFile = 1; if (strcmp(name,"stdout")==0) { - sfp->fp = stdout; + sfp->fp = oxstdout; }else{ sfp->fp = fopen(name,mode); } @@ -92,7 +95,7 @@ struct SFILE *mh_fopen(char *name,char *mode,int byFil sfp->forRead=0; return(sfp); }else{ - fprintf(stderr,"Error: unknown mode %s in the string mode.\n",mode); + oxprintfe("Error: unknown mode %s in the string mode.\n",mode); return NULL; } } @@ -132,7 +135,7 @@ int mh_fputs(char *str,struct SFILE *sfp) { } strcpy(&(s[len]),str); len += inputLen; - /* printf("mh_fputs(%d):[%s]\n",len,s); */ + /* oxprintf("mh_fputs(%d):[%s]\n",len,s); */ sfp->s=s; sfp->len=len; sfp->limit=limit; return(0); } @@ -142,7 +145,7 @@ int mh_fclose(struct SFILE *sfp) { if (!sfp) return(-1); if (sfp->byFile) return fclose(sfp->fp); if (! (sfp->forRead)) { - if (!sfp->copied) fprintf(stderr,"Warning in mh_fclose. sfp->s has not been copied, but deallocated.\n"); + if (!sfp->copied) oxprintfe("Warning in mh_fclose. sfp->s has not been copied, but deallocated.\n"); if (sfp->s != NULL) { mh_free(sfp->s); sfp->s = NULL; } } mh_free(sfp); @@ -152,7 +155,7 @@ int mh_fclose(struct SFILE *sfp) { int mh_outstr(char *str,int size,struct SFILE *sfp) { int i; if (sfp->byFile) { - fprintf(stderr,"Error in mh_outstr. mh_outstr is called in the file i/o mode.\n"); + oxprintfe("Error in mh_outstr. mh_outstr is called in the file i/o mode.\n"); return 0; } if (size) str[0] = 0; @@ -163,33 +166,138 @@ int mh_outstr(char *str,int size,struct SFILE *sfp) { return(i); } +void mh_error(char *s,int code) { + oxprintfe("Error: %s\n",s); + mh_exit(code); +} +struct mh_token mh_getoken(char s[],int smax,struct SFILE *sfp) { + static int w0=0; + static int wn=0; + static char work[MH_SSIZE]; + char *r; + int t,t2; + struct mh_token token; + token.type = MH_TOKEN_EOF; + token.ival=0; token.dval=0.0; + while (1) { + if (w0 >= wn) { + r = mh_fgets(work,MH_SSIZE-1,sfp); + if (r == NULL) { + token.type = MH_TOKEN_EOF; + return token; + } + /* oxprintf("work=%s\n",work); */ + w0 = 0; wn=strlen(work); + } + t=w0; + while ((work[t] <= ' ') && (t < wn)) t++; + if (t == wn) { + w0=wn; + continue; + } + if (work[t] == ',') {w0=t+1; continue; } + t2 = t; + while((work[t2] > ' ') && (work[t2] != '=') + && (work[t2] != ',')) t2++; + /* work[t] ... work[t2-1] is a token */ + /* %abc=123#comment is not allowed. but %abc=123,# or %abc=123 # is OK. */ + if ((t == t2) && (work[t] == '=')) { + token.type=MH_TOKEN_EQ; + w0=t2+1; + return token; + } + if ((work[t] == '%') && (work[t+1] == '%')) { + /* comment */ + w0 =wn; + continue; + } + if (work[t] == '#') { + /* comment */ + w0=wn; + continue; + } + if (work[t] == '%') { + if (t2-t-2 >= smax) { + oxprintfe("s is too small in mh_getoken.\n"); + mh_exit(-1); + } + strncpy(s,&(work[t+1]),t2-(t+1)); s[t2-(t+1)] = 0; + token.type=MH_TOKEN_ID; + w0 = t2; + return token; + } + /* The case of double or int */ + strncpy(s,&(work[t]),t2-t); s[t2-t]=0; + if (isIntString(s)) { + token.type=MH_TOKEN_INT; + sscanf(s,"%d",&(token.ival)); + sscanf(s,"%lg",&(token.dval)); + }else{ + token.type=MH_TOKEN_DOUBLE; + sscanf(s,"%lg",&(token.dval)); + } + w0 = t2; + return token; + } +} + +static int isIntString(char s[]) { + int i; + for (i=0; ibyFile); - if (sfp->s) printf("sfp->s=%s\n",sfp->s); - printf("pt=%d\n",sfp->pt); - printf("len=%d\n",sfp->len); - printf("limit=%d\n",sfp->limit); - printf("fp=%p\n",sfp->fp); + oxprintf("byFile=%d\n",sfp->byFile); + if (sfp->s) oxprintf("sfp->s=%s\n",sfp->s); + oxprintf("pt=%d\n",sfp->pt); + oxprintf("len=%d\n",sfp->len); + oxprintf("limit=%d\n",sfp->limit); + oxprintf("fp=%p\n",sfp->fp); } + #define TESTSIZE 1024 main() { struct SFILE *sfp; char str[TESTSIZE]; int i; + struct mh_token tk; + sfp = mh_fopen("%%abc\n%abs=1.234\n %abs = \n 1.235\n%abs=\n1.236\n\n%abs=1.237\n%ival=-234,#comment\n","r",0); + while ((tk=mh_getoken(str,TESTSIZE,sfp)).type != MH_TOKEN_EOF) { + mh_print_token(tk,str); + } + return 0; /* sfp = mh_fopen("hoge\nafo\nbho\ncat\ndot\ndolphin\n","r",0); while (mh_fgets(str,1024,sfp)) { - printf(str); + oxprintf(str); } mh_fclose(sfp); sfp = mh_fopen("sfile.h","r",1); while (mh_fgets(str,1024,sfp)) { - printf(str); + oxprintf(str); } mh_fclose(sfp); */ @@ -200,7 +308,7 @@ main() { dump(sfp); } mh_fputs("end end\n",sfp); - printf("result=%s\n",sfp->s); + oxprintf("result=%s\n",sfp->s); mh_outstr(str,TESTSIZE,sfp); mh_fclose(sfp); }