=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -p -r1.1.1.1 -r1.4 --- OpenXM_contrib2/asir2000/parse/lex.c 1999/12/03 07:39:12 1.1.1.1 +++ OpenXM_contrib2/asir2000/parse/lex.c 2000/08/21 08:31:47 1.4 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM/src/asir99/parse/lex.c,v 1.1.1.1 1999/11/10 08:12:34 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.3 2000/07/25 01:15:07 noro Exp $ +*/ #include #include "ca.h" #include "al.h" @@ -25,6 +73,47 @@ static int Getc(); static void Ungetc(); static void Gets(); +#define NBUFSIZ (BUFSIZ*10) +#define TBUFSIZ (BUFSIZ) + +#define REALLOC_NBUF \ +if ( i >= nbufsize ) {\ + nbufsize += NBUFSIZ;\ + if ( nbuf == nbuf0 ) {\ + nbuf = (char *)MALLOC_ATOMIC(nbufsize);\ + bcopy(nbuf0,nbuf,nbufsize-NBUFSIZ);\ + } else\ + nbuf = REALLOC(nbuf,nbufsize);\ +} + +#define REALLOC_TBUF \ +if ( i >= tbufsize ) {\ + tbufsize += TBUFSIZ;\ + if ( tbuf == tbuf0 ) {\ + tbuf = (char *)MALLOC_ATOMIC(tbufsize);\ + bcopy(tbuf0,tbuf,tbufsize-TBUFSIZ);\ + } else\ + tbuf = REALLOC(tbuf,tbufsize);\ +} + +#define READ_ALNUM_NBUF \ +while ( 1 ) {\ + c = Getc();\ + if ( isalnum(c) ) {\ + REALLOC_NBUF nbuf[i++] = c;\ + } else\ + break;\ +} + +#define READ_DIGIT_NBUF \ +while ( 1 ) {\ + c = Getc();\ + if ( isdigit(c) ) {\ + REALLOC_NBUF nbuf[i++] = c;\ + } else\ + break;\ +} + yylex() { #define yylvalp (&yylval) @@ -32,15 +121,17 @@ yylex() register int *ptr; char *cptr; int d,i,j; -#if defined(__MWERKS__) - char nbuf[BUFSIZ],tbuf[BUFSIZ]; -#else - char nbuf[BUFSIZ*10],tbuf[BUFSIZ]; -#endif + char nbuf0[NBUFSIZ],tbuf0[TBUFSIZ]; + char *nbuf, *tbuf; + int nbufsize, tbufsize; N n,n1; Q q; Obj r; + /* initialize buffer pointers */ + nbuf = nbuf0; tbuf = tbuf0; + nbufsize = NBUFSIZ; tbufsize = TBUFSIZ; + switch ( c = skipspace() ) { case EOF : asir_terminate(2); break; @@ -51,8 +142,8 @@ yylex() } else if ( c == 'x' ) { for ( i = 0; i < 8; i++ ) nbuf[i] = '0'; - for ( ; isalnum(c = Getc()); nbuf[i++] = c ); - Ungetc(c); nbuf[i] = 0; + READ_ALNUM_NBUF + Ungetc(c); REALLOC_NBUF nbuf[i] = 0; hexton(nbuf,&n1); NTOQ(n1,1,q); r = (Obj)q; yylvalp->p = (pointer)r; @@ -60,8 +151,8 @@ yylex() } else if ( c == 'b' ) { for ( i = 0; i < 32; i++ ) nbuf[i] = '0'; - for ( ; isalnum(c = Getc()); nbuf[i++] = c ); - Ungetc(c); nbuf[i] = 0; + READ_ALNUM_NBUF + Ungetc(c); REALLOC_NBUF nbuf[i] = 0; binaryton(nbuf,&n1); NTOQ(n1,1,q); r = (Obj)q; yylvalp->p = (pointer)r; @@ -78,16 +169,13 @@ yylex() break; if ( c == '\\' ) c = Getc(); - tbuf[i] = c; + REALLOC_TBUF tbuf[i] = c; } - tbuf[i] = 0; + REALLOC_TBUF tbuf[i] = 0; cptr = (char *)MALLOC(strlen(tbuf)+1); strcpy(cptr,tbuf); yylvalp->p = (pointer)cptr; return LCASE; break; case '"' : -#if 0 - for ( i = 0; (nbuf[i] = Getc()) != '"'; i++ ); -#endif i = 0; do { c = Getc(); @@ -95,11 +183,12 @@ yylex() c1 = Getc(); if ( c1 == 'n' ) c1 = '\n'; - nbuf[i++] = c1; - } else - nbuf[i++] = c; + REALLOC_NBUF nbuf[i++] = c1; + } else { + REALLOC_NBUF nbuf[i++] = c; + } } while ( c != '"' ); - nbuf[i-1] = 0; + nbuf[i-1] = 0; /* REALLOC_NBUF is not necessary */ cptr = (char *)MALLOC(strlen(nbuf)+1); strcpy(cptr,nbuf); yylvalp->p = (pointer) cptr; return ( STR ); break; @@ -155,22 +244,26 @@ yylex() if ( isdigit(c) ) { for ( i = 0; i < DLENGTH; i++ ) nbuf[i] = '0'; - for ( nbuf[i++] = c; isdigit(c = Getc()); nbuf[i++] = c); + REALLOC_NBUF nbuf[i++] = c; + READ_DIGIT_NBUF if ( c == '.' ) { double dbl; Real real; double atof(); extern int bigfloat; - for ( nbuf[i++] = c; isdigit(c = Getc()); nbuf[i++] = c); + REALLOC_NBUF nbuf[i++] = c; + READ_DIGIT_NBUF if ( c == 'e' ) { - nbuf[i++] = c; - if ( ((c = Getc()) == '+') || (c == '-') ) { - nbuf[i++] = c; c = Getc(); - } - for ( ; isdigit(c); nbuf[i++] = c, c = Getc()); + REALLOC_NBUF nbuf[i++] = c; + c = Getc(); + if ( (c == '+') || (c == '-') ) { + REALLOC_NBUF nbuf[i++] = c; + } else + Ungetc(c); + READ_DIGIT_NBUF } - Ungetc(c); nbuf[i] = 0; + Ungetc(c); REALLOC_NBUF nbuf[i] = 0; #if PARI if ( !bigfloat ) { dbl = (double)atof(nbuf+DLENGTH); @@ -194,9 +287,16 @@ yylex() yylvalp->p = (pointer)r; return ( FORMULA ); } else if ( isalpha(c) ) { - for ( i = 1, tbuf[0] = c; isalpha(c = Getc())||isdigit(c)||(c=='_'); i++ ) - tbuf[i] = c; - tbuf[i] = 0; Ungetc(c); + i = 0; + tbuf[i++] = c; + while ( 1 ) { + c = Getc(); + if ( isalpha(c)||isdigit(c)||(c=='_') ) { + REALLOC_TBUF tbuf[i++] = c; + } else + break; + } + REALLOC_TBUF tbuf[i] = 0; Ungetc(c); if ( isupper(tbuf[0]) ) { cptr = (char *)MALLOC(strlen(tbuf)+1); strcpy(cptr,tbuf); yylvalp->p = (pointer)cptr; @@ -214,8 +314,11 @@ yylex() } } else if ( c == '@' ) { if ( isdigit(c = Getc()) ) { - for ( i = 1, nbuf[0] = c; isdigit(c = Getc()); nbuf[i++] = c); - Ungetc(c); nbuf[i] = 0; yylvalp->i = atoi(nbuf); + i = 0; + nbuf[i++] = c; + READ_DIGIT_NBUF + Ungetc(c); REALLOC_NBUF nbuf[i] = 0; + yylvalp->i = atoi(nbuf); return ANS; } else if ( c == '@' ) { yylvalp->i = MAX(0,APVS->n-1); @@ -250,9 +353,17 @@ yylex() return FOP_AND; break; } } else if ( isalpha(c) ) { - for ( i = 2, tbuf[0] = '@', tbuf[1] = c; - isalpha(c = Getc()); tbuf[i++] = c); - Ungetc(c); tbuf[i] = 0; + i = 0; + tbuf[i++] = '@'; + tbuf[i++] = c; + while ( 1 ) { + c = Getc(); + if ( isalpha(c) ) { + REALLOC_TBUF tbuf[i++] = c; + } else + break; + } + Ungetc(c); REALLOC_TBUF tbuf[i] = 0; if ( !strcmp(tbuf,"@p") ) return GFPNGEN; else if ( !strcmp(tbuf,"@i") ) { @@ -399,7 +510,9 @@ FILE *fp; if ( asir_infile->encoded ) c = decrypt_char((unsigned char)c); return c; - } else { + } else if ( read_exec_file ) + return EOF; + else { c = *parse_strp++; if ( !c ) return EOF;