===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/tokenizer.l,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/m4/tokenizer.l	2008/08/16 12:21:46	1.4
+++ src/usr.bin/m4/tokenizer.l	2008/08/16 12:23:50	1.5
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: tokenizer.l,v 1.4 2008/08/16 12:21:46 espie Exp $ */
+/* $OpenBSD: tokenizer.l,v 1.5 2008/08/16 12:23:50 espie Exp $ */
 /*
  * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
  *
@@ -21,11 +21,9 @@
 #include <stdint.h>
 #include <limits.h>
 
-extern int mimic_gnu;
 extern int32_t yylval;
 
 int32_t number(void);
-int32_t parse_radix(void);
 %}
 
 delim 	[ \t\n]
@@ -33,17 +31,10 @@
 hex	0[xX][0-9a-fA-F]+
 oct	0[0-7]*
 dec	[1-9][0-9]*
-radix	0[rR][0-9]+:[0-9a-zA-Z]+
 
 %%
 {ws}			{/* just skip it */}
 {hex}|{oct}|{dec}	{ yylval = number(); return(NUMBER); }
-{radix}			{ if (mimic_gnu) {
-				yylval = parse_radix(); return(NUMBER);
-			  } else {
-			  	return(ERROR);
-			  }
-			}
 "<="			{ return(LE); }
 ">="			{ return(GE); }
 "<<"			{ return(LSHIFT); }
@@ -67,31 +58,5 @@
 		fprintf(stderr, "m4: numeric overflow in expr: %s\n", yytext);
 	}
 	return l;
-}
 
-int32_t
-parse_radix()
-{
-	long base;
-	char *next;
-	long l;
-
-	l = 0;
-	base = strtol(yytext+2, &next, 0);
-	if (base > 36 || next == NULL) {
-		fprintf(stderr, "m4: error in number %s\n", yytext);
-	} else {
-		next++;
-		while (*next != 0) {
-			if (*next >= '0' && *next <= '9')
-				l = base * l + *next - '0';
-			else if (*next >= 'a' && *next <= 'z')
-				l = base * l + *next - 'a' + 10;
-			else if (*next >= 'A' && *next <= 'Z')
-				l = base * l + *next - 'A' + 10;
-			next++;
-		}
-	}
-	return l;
 }
-