===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.15
retrieving revision 1.24
diff -u -p -r1.15 -r1.24
--- OpenXM_contrib2/asir2000/parse/lex.c	2001/06/04 02:49:48	1.15
+++ OpenXM_contrib2/asir2000/parse/lex.c	2003/05/14 06:20:12	1.24
@@ -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.14 2001/03/08 07:49:13 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.23 2003/03/07 03:12:31 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -60,22 +60,18 @@
 #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)
 
@@ -117,7 +113,7 @@ while ( 1 ) {\
 		break;\
 }
 
-yylex()
+int yylex()
 {
 #define yylvalp (&yylval)
 	register int c,c1;
@@ -130,6 +126,12 @@ yylex()
 	N n,n1;
 	Q q;
 	Obj r;
+	int floatingpoint = 0;
+	double dbl;
+	Real real;
+	double atof();
+	extern int bigfloat;
+
 	
 	/* initialize buffer pointers */
 	nbuf = nbuf0; tbuf = tbuf0;
@@ -142,7 +144,7 @@ yylex()
 			while ( ( c = Getc() ) == '0' );
 			if ( c == '.' ) {
 				Ungetc(c); c = '0';
-			} else if ( c == 'x' ) {
+			} else if ( c == 'x' || c == 'X' ) {
 				for ( i = 0; i < 8; i++ ) 
 					nbuf[i] = '0';
 				READ_ALNUM_NBUF
@@ -151,7 +153,7 @@ yylex()
 				NTOQ(n1,1,q); r = (Obj)q;
 				yylvalp->p = (pointer)r;
 				return ( FORMULA );
-			} else if ( c == 'b' ) {
+			} else if ( c == 'b' || c == 'B' ) {
 				for ( i = 0; i < 32; i++ ) 
 					nbuf[i] = '0';
 				READ_ALNUM_NBUF
@@ -250,14 +252,11 @@ yylex()
 		REALLOC_NBUF nbuf[i++] = c;
 		READ_DIGIT_NBUF
 		if ( c == '.' ) {
-			double dbl;
-			Real real;
-			double atof();
-			extern int bigfloat;
+			floatingpoint = 1;
 
 			REALLOC_NBUF nbuf[i++] = c;
 			READ_DIGIT_NBUF
-			if ( c == 'e' ) {
+			if ( c == 'e' || c == 'E' ) {
 				REALLOC_NBUF nbuf[i++] = c;
 				c = Getc();
 				if ( (c == '+') || (c == '-') ) {
@@ -266,8 +265,19 @@ yylex()
 					Ungetc(c);
 				READ_DIGIT_NBUF
 			}
+		} else if ( c == 'e' || c == 'E' ) {
+			floatingpoint = 1;
+			REALLOC_NBUF nbuf[i++] = c;
+			c = Getc();
+			if ( (c == '+') || (c == '-') ) {
+				REALLOC_NBUF nbuf[i++] = c;
+			} else
+				Ungetc(c);
+			READ_DIGIT_NBUF
+		}
+		if ( floatingpoint ) {
 			Ungetc(c); REALLOC_NBUF nbuf[i] = 0;
-#if PARI
+#if defined(PARI)
 			if ( !bigfloat ) {
 				dbl = (double)atof(nbuf+DLENGTH);
 				MKReal(dbl,real); r = (Obj)real;
@@ -294,7 +304,7 @@ yylex()
 		tbuf[i++] = c;
 		while ( 1 ) {
 			c = Getc();
-			if ( isalpha(c)||isdigit(c)||(c=='_') ) {
+			if ( isalpha(c)||isdigit(c)||(c=='_')||(c=='.') ) {
 				REALLOC_TBUF tbuf[i++] = c;
 			} else
 				break;
@@ -369,6 +379,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;
 
@@ -410,10 +422,12 @@ void purge_stdin()
 	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)
+#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__)
+#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__)
 	stdin->_r = 0; stdin->_p = stdin->_bf._base;
 #else
 --->FIXIT
@@ -481,8 +495,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' );
@@ -491,8 +504,7 @@ char *s;
 
 extern int ox_do_copy;
 
-void yyerror(s)
-char *s;
+void yyerror(char *s)
 {
 	if ( main_parser )
 		if ( ox_do_copy ) {
@@ -511,16 +523,10 @@ 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;
 
@@ -559,9 +565,7 @@ FILE *fp;
 	}
 }
 
-void Eungetc(c,fp)
-int c;
-FILE *fp;
+void Eungetc(int c,FILE *fp)
 {
 	if ( fp ) {
 		if ( asir_infile->encoded )
@@ -606,7 +610,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 )
@@ -615,8 +619,7 @@ static void Ungetc(c) {
 		*--parse_strp = c;
 }
 
-static void Gets(s)
-char *s;
+static void Gets(char *s)
 {
 	int c;
 
@@ -652,8 +655,7 @@ void readline_ungetc()
         readline_nc++; readline_index--;
 }
 
-char *readline_console(prompt)
-char *prompt;
+char *readline_console(char *prompt)
 {
         char *line;
         int exp_result;