Module Name: src
Committed By: christos
Date: Thu Oct 29 14:21:40 UTC 2009
Modified Files:
src/bin/sh: Makefile arith_lex.l
Log Message:
use flex options instead of #defines
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/bin/sh/Makefile
cvs rdiff -u -r1.14 -r1.15 src/bin/sh/arith_lex.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/Makefile
diff -u src/bin/sh/Makefile:1.85 src/bin/sh/Makefile:1.86
--- src/bin/sh/Makefile:1.85 Mon Apr 20 12:05:29 2009
+++ src/bin/sh/Makefile Thu Oct 29 10:21:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2009/04/20 16:05:29 drochner Exp $
+# $NetBSD: Makefile,v 1.86 2009/10/29 14:21:40 christos Exp $
# @(#)Makefile 8.4 (Berkeley) 5/5/95
.include <bsd.own.mk>
@@ -34,7 +34,7 @@
YFLAGS+=-l
.endif
-CPPFLAGS+=-DSHELL -I. -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
#XXX: For testing only.
#CPPFLAGS+=-DDEBUG=1
#CFLAGS+=-funsigned-char
Index: src/bin/sh/arith_lex.l
diff -u src/bin/sh/arith_lex.l:1.14 src/bin/sh/arith_lex.l:1.15
--- src/bin/sh/arith_lex.l:1.14 Sun Mar 25 02:29:26 2007
+++ src/bin/sh/arith_lex.l Thu Oct 29 10:21:40 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith_lex.l,v 1.14 2007/03/25 06:29:26 apb Exp $ */
+/* $NetBSD: arith_lex.l,v 1.15 2009/10/29 14:21:40 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: arith_lex.l,v 1.14 2007/03/25 06:29:26 apb Exp $");
+__RCSID("$NetBSD: arith_lex.l,v 1.15 2009/10/29 14:21:40 christos Exp $");
#endif
#endif /* not lint */
@@ -53,9 +53,10 @@
#undef YY_INPUT
#define YY_INPUT(buf,result,max) \
result = (*buf = *arith_buf++) ? 1 : YY_NULL;
-#define YY_NO_UNPUT
%}
+%option nounput noinput
+
%%
[ \t\n] { ; }
0x[0-9a-fA-F]+ { yylval = strtoimax(yytext, 0, 0); return(ARITH_NUM); }
