=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v retrieving revision 1.2 retrieving revision 1.18 diff -u -p -r1.2 -r1.18 --- OpenXM_contrib2/asir2000/parse/lex.c 2000/02/07 03:14:40 1.2 +++ OpenXM_contrib2/asir2000/parse/lex.c 2001/10/09 01:36:24 1.18 @@ -1,30 +1,77 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.1.1.1 1999/12/03 07:39:12 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@sec.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.17 2001/09/03 07:01:10 noro Exp $ +*/ #include #include "ca.h" #include "al.h" #include "base.h" #include "parse.h" -#if !defined(THINK_C) #include #include -#endif +#if defined(VISUAL) +#include "ytab.h" +#else #include "y.tab.h" +#endif -extern IN asir_infile; +static int Getc(); +static void Ungetc(int c); +static void Gets(char *s); +static int skipspace(); + +extern INFILE asir_infile; extern struct oTKWD kwd[]; -int afternl(); -int myatoi(); -int aftercomment(); - extern int main_parser; extern char *parse_strp; +extern int recv_intr; -static int skipspace(); -static int Getc(); -static void Ungetc(); -static void Gets(); - #define NBUFSIZ (BUFSIZ*10) #define TBUFSIZ (BUFSIZ) @@ -66,7 +113,7 @@ while ( 1 ) {\ break;\ } -yylex() +int yylex() { #define yylvalp (&yylval) register int c,c1; @@ -318,6 +365,8 @@ yylex() Ungetc(c); REALLOC_TBUF tbuf[i] = 0; if ( !strcmp(tbuf,"@p") ) return GFPNGEN; + else if ( !strcmp(tbuf,"@s") ) + return GFSNGEN; else if ( !strcmp(tbuf,"@i") ) { extern pointer IU; @@ -351,12 +400,32 @@ yylex() return ( c ); } +void purge_stdin() +{ +#if defined(__FreeBSD__) + fpurge(stdin); +#elif defined(linux) + stdin->_IO_read_end = stdin->_IO_read_base; + stdin->_IO_read_ptr = stdin->_IO_read_base; +#elif defined(VISUAL_LIB) + void w_purge_stdin(); + + w_purge_stdin(); +#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(VISUAL) || defined(_IBMR2) + stdin->_ptr = stdin->_base; stdin->_cnt = 0; +#elif defined(__MACH__) && defined(__ppc__) + stdin->_r = 0; stdin->_p = stdin->_bf._base; +#else +--->FIXIT +#endif +} + static int skipspace() { int c,c1; for ( c = Getc(); ; ) switch ( c ) { - case ' ': case '\t': + case ' ': case '\t': case '\r': c = Getc(); break; case '\n': c = afternl(); break; @@ -412,8 +481,7 @@ int aftercomment() { } } -int myatoi(s) -char *s; +int myatoi(char *s) { int i,r; for ( i = 0, r = 0; i < DLENGTH; i++ ) r = r * 10 + ( s[i] - '0' ); @@ -422,8 +490,7 @@ char *s; extern int ox_do_copy; -void yyerror(s) -char *s; +void yyerror(char *s) { if ( main_parser ) if ( ox_do_copy ) { @@ -442,27 +509,40 @@ int echoback; extern int read_exec_file, do_fep, do_file; -int readline_getc(); -void readline_ungetc(); -int Egetc(); -void Eungetc(); - unsigned char encrypt_char(unsigned char); unsigned char decrypt_char(unsigned char); -int Egetc(fp) -FILE *fp; +int Egetc(FILE *fp) { int c; if ( fp ) { - c = getc(fp); +#if FEP + if ( do_fep && isatty(fileno(fp)) ) + c = readline_getc(); + else +#endif + c = getc(fp); +#if defined(VISUAL) + if ( recv_intr ) { +#include + if ( recv_intr == 1 ) { + recv_intr = 0; + int_handler(SIGINT); + } else { + recv_intr = 0; + ox_usr1_handler(0); + } + } +#endif if ( c == EOF ) return c; 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; @@ -471,14 +551,17 @@ FILE *fp; } } -void Eungetc(c,fp) -int c; -FILE *fp; +void Eungetc(int c,FILE *fp) { if ( fp ) { if ( asir_infile->encoded ) c = (int)encrypt_char((unsigned char)c); - ungetc(c,fp); +#if FEP + if ( do_fep && isatty(fileno(fp)) ) + readline_ungetc(); + else +#endif + ungetc(c,fp); } else *--parse_strp = c; } @@ -491,7 +574,11 @@ static int Getc() { if ((c = Egetc(asir_infile->fp)) == EOF) if ( NEXT(asir_infile) ) { closecurrentinput(); - c = Getc(); + /* if the input is the top level, generate error */ + if ( !NEXT(asir_infile) ) + error("end-of-file detected during parsing"); + else + c = Getc(); break; } else if ( read_exec_file || do_file ) asir_terminate(2); @@ -509,7 +596,7 @@ static int Getc() { return ( c ); } -static void Ungetc(c) { +static void Ungetc(int c) { if ( main_parser ) { Eungetc(c,asir_infile->fp); if ( echoback ) @@ -518,8 +605,7 @@ static void Ungetc(c) { *--parse_strp = c; } -static void Gets(s) -char *s; +static void Gets(char *s) { int c; @@ -527,3 +613,57 @@ char *s; *s++ = c; *s = 0; } + +#if FEP + +static char *readline_line; +static int readline_nc,readline_index; +char *readline_console(); + +int readline_getc() +{ + char buf[BUFSIZ]; + + if ( !readline_nc ) { + if ( readline_line ) + free(readline_line); + sprompt(buf); + readline_line = readline_console(buf); + readline_nc = strlen(readline_line); + readline_index = 0; + } + readline_nc--; + return readline_line[readline_index++]; +} + +void readline_ungetc() +{ + readline_nc++; readline_index--; +} + +char *readline_console(char *prompt) +{ + char *line; + int exp_result; + char *expansion; + + while ( 1 ) { + line = (char *)readline(prompt); + if ( line && *line ) { + using_history(); + exp_result = history_expand(line,&expansion); + if ( !exp_result ) { + free(expansion); + for ( ; isspace(*line); line++ ); + add_history(line); + break; + } else if ( exp_result > 0 ) { + free(line); + line = expansion; + break; + } + } + } + return line; +} +#endif