===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/lex.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- OpenXM_contrib2/asir2000/parse/lex.c	2003/05/14 06:20:12	1.24
+++ OpenXM_contrib2/asir2000/parse/lex.c	2004/01/25 11:54:10	1.28
@@ -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.23 2003/03/07 03:12:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/lex.c,v 1.27 2003/11/27 02:34:11 ohara Exp $ 
 */
 #include <ctype.h>
 #include "ca.h"
@@ -186,8 +186,26 @@ int yylex()
 				c = Getc();
 				if ( c == '\\' ) {
 					c1 = Getc();
-					if ( c1 == 'n' )
+					if ( c1 == 'n' ) {
 						c1 = '\n';
+                    }else if ( c1 == 't' ) {
+                        c1 = '\t';
+                    }else if ( isdigit(c1) ){
+                        d = c1 - '0';
+                        c1 = Getc();
+                        if ( isdigit(c1) ) {
+                             d = 8*d + (c1 - '0');
+                             c1 = Getc();
+                             if ( isdigit(c1) ) {
+                                 d = 8*d + (c1 - '0');
+                             }else {
+                                 Ungetc(c1);
+                             }
+                        }else {
+                            Ungetc(c1);
+                        }
+                        c1 = d;
+                    }
 					REALLOC_NBUF nbuf[i++] = c1;
 				} else {
 					REALLOC_NBUF nbuf[i++] = c;
@@ -299,9 +317,26 @@ 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=='_')||(c=='.') ) {
@@ -427,7 +462,7 @@ void 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__)
+#elif (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__INTERIX)
 	stdin->_r = 0; stdin->_p = stdin->_bf._base;
 #else
 --->FIXIT