Changeset 1217 in kBuild for trunk/src/kash/arith_lex.l

Timestamp:

Oct 7, 2007 9:47:15 PM (17 years ago)

Author:

bird

Message:

make more build...

File:

• trunk/src/kash/arith_lex.l (modified) (4 diffs)

trunk/src/kash/arith_lex.l

@@ -35 +35 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#if 0
 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
 #else
 __RCSID("$NetBSD: arith_lex.l,v 1.13 2005/03/21 22:37:09 dsl Exp $");
+#endif /* not lint */
 #endif
-#endif /* not lint */
 
-#include <unistd.h>
 #include "arith.h"
 #include "error.h"
 #include "expand.h"
 #include "var.h"
+#include "shinstance.h"
 
 extern int yylval;
+extern shinstance *arith_psh;
 extern char *arith_buf, *arith_startbuf;
 #undef YY_INPUT
@@ -65 +63 @@
 0[0-7]*         { yylval = strtol(yytext, 0, 0); return(ARITH_NUM); }
 [1-9][0-9]*     { yylval = strtol(yytext, 0, 0); return(ARITH_NUM); }
-[A-Za-z_][A-Za-z_0-9]*  { char *v = lookupvar(yytext);
+[A-Za-z_][A-Za-z_0-9]*  { char *v = lookupvar(arith_psh, yytext);
                         if (v) {
                                 yylval = strtol(v, &v, 0);
@@ -71 +69 @@
                                         return ARITH_NUM;
                         }
-                        error("arith: syntax error: \"%s\"", arith_startbuf);
+                        error(arith_psh, "arith: syntax error: \"%s\"", arith_startbuf);
                 }
 "("     { return(ARITH_LPAREN); }
@@ -95 +93 @@
 "~"     { return(ARITH_BNOT); }
 "!"     { return(ARITH_NOT); }
-.       { error("arith: syntax error: \"%s\"", arith_startbuf); }
+.       { error(arith_psh, "arith: syntax error: \"%s\"", arith_startbuf); }
 %%