===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.9
retrieving revision 1.19
diff -u -p -r1.9 -r1.19
--- OpenXM_contrib2/asir2000/parse/lex.c	2000/12/05 01:51:35	1.9
+++ OpenXM_contrib2/asir2000/parse/lex.c	2001/12/21 08:23:15	1.19
@@ -45,7 +45,7 @@
  * 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.8 2000/12/05 01:24:57 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.18 2001/10/09 01:36:24 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -54,23 +54,24 @@
 #include "parse.h"
 #include <sys/types.h>
 #include <sys/stat.h>
+#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)
 
@@ -112,7 +113,7 @@ while ( 1 ) {\
 		break;\
 }
 
-yylex()
+int yylex()
 {
 #define yylvalp (&yylval)
 	register int c,c1;
@@ -364,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;
 
@@ -404,10 +407,14 @@ void purge_stdin()
 #elif defined(linux)
 	stdin->_IO_read_end = stdin->_IO_read_base;
 	stdin->_IO_read_ptr = stdin->_IO_read_base;
-#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips)
-	stdin->_ptr = stdin->_base; stdin->_cnt = 0;
-#elif defined(VISUAL)
+#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__)) || defined(__CYGWIN__)
+	stdin->_r = 0; stdin->_p = stdin->_bf._base;
 #else
 --->FIXIT
 #endif
@@ -418,7 +425,7 @@ static int skipspace() {
 
 	for ( c = Getc(); ; )
 		switch ( c ) {
-			case ' ': case '\t':
+			case ' ': case '\t': case '\r':
 				c = Getc(); break;
 			case '\n':
 				c = afternl();	break;
@@ -474,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' );
@@ -484,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 ) {
@@ -504,21 +509,32 @@ 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 <signal.h>
+			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 )
@@ -535,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;
 }
@@ -577,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 )
@@ -586,8 +605,7 @@ static void Ungetc(c) {
 		*--parse_strp = c;
 }
 
-static void Gets(s)
-char *s;
+static void Gets(char *s)
 {
 	int c;
 
@@ -595,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