===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- OpenXM_contrib2/asir2000/parse/lex.c	2002/09/09 23:52:45	1.21
+++ OpenXM_contrib2/asir2000/parse/lex.c	2003/05/30 00:47:24	1.25
@@ -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.20 2002/09/09 12:23:51 kondoh Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.24 2003/05/14 06:20:12 noro Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -277,7 +277,7 @@ int yylex()
 		}
 		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;
@@ -299,12 +299,29 @@ int yylex()
 		}
 		yylvalp->p = (pointer)r;
 		return ( FORMULA );
-	} else if ( isalpha(c) ) {
-		i = 0;
-		tbuf[i++] = c;
+	} else if ( isalpha(c) || c == ':' ) {
+		if ( c == ':' ) {
+			c1 = Getc();
+			if ( c1 != ':' ) {
+				Ungetc(c1);
+				return c;
+			}
+			c1 = Getc();
+			if ( !isalpha(c1) ) {
+				Ungetc(c1);
+				return COLONCOLON;
+			}
+			i = 0;
+			tbuf[i++] = ':';
+			tbuf[i++] = ':';
+			tbuf[i++] = c1;
+		} else {
+			i = 0;
+			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;