Changeset 1217 in kBuild for trunk/src/kash

Timestamp:

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

Author:

bird

Message:

make more build...

Location:

trunk/src/kash

Files:

• arith.y (modified) (6 diffs)
• arith_lex.l (modified) (4 diffs)
• bltin/test.c (modified) (1 diff)
• error.h (modified) (1 diff)
• expand.c (modified) (1 diff)
• expand.h (modified) (2 diffs)

trunk/src/kash/arith.y

@@ -34 +34 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#if 0
 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)arith.y     8.3 (Berkeley) 5/4/95";
 #else
 __RCSID("$NetBSD: arith.y,v 1.17 2003/09/17 17:33:36 jmmv Exp $");
+#endif /* not lint */
 #endif
-#endif /* not lint */
 
 #include <stdlib.h>
@@ -51 +48 @@
 #include "output.h"
 #include "memalloc.h"
-
+#include "shinstance.h"
+
+shinstance *arith_psh;
 const char *arith_buf, *arith_startbuf;
 
@@ -117 +116 @@
 %%
 int
-arith(s)
-        const char *s;
+arith(shinstance *psh, const char *s)
 {
         long result;
 
+        INTOFF;
+/* todo lock */
+   arith_psh = psh;
         arith_buf = arith_startbuf = s;
-
-        INTOFF;
         result = yyparse();
         arith_lex_reset();      /* reprime lex */
+   arith_psh = NULL;
+/* todo unlock */
         INTON;
 
@@ -137 +138 @@
  */
 int
-expcmd(argc, argv)
-        int argc;
-        char **argv;
+expcmd(shinstance *psh, int argc, char **argv)
 {
         const char *p;
@@ -152 +151 @@
                          * concatenate arguments
                          */
-                        STARTSTACKSTR(concat);
+                        STARTSTACKSTR(psh, concat);
                         ap = argv + 2;
                         for (;;) {
                                 while (*p)
-                                        STPUTC(*p++, concat);
+                                        STPUTC(psh, *p++, concat);
                                 if ((p = *ap++) == NULL)
                                         break;
-                                STPUTC(' ', concat);
+                                STPUTC(psh, ' ', concat);
                         }
-                        STPUTC('\0', concat);
-                        p = grabstackstr(concat);
+                        STPUTC(psh, '\0', concat);
+                        p = grabstackstr(psh, concat);
                 }
         } else
                 p = "";
 
-        i = arith(p);
-
-        out1fmt("%ld\n", i);
+        i = arith(psh, p);
+
+        out1fmt(psh, "%ld\n", i);
         return (! i);
 }
@@ -190 +189 @@
 
 void
-yyerror(s)
-        const char *s;
-{
-
+yyerror(const char *s)
+{
+   shinstance *psh = arith_psh;
         yyerrok;
         yyclearin;
         arith_lex_reset();      /* reprime lex */
-        error("arithmetic expression: %s: \"%s\"", s, arith_startbuf);
+/** @todo unlock */
+        error(psh, "arithmetic expression: %s: \"%s\"", s, arith_startbuf);
         /* NOTREACHED */
 }

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); }
 %%
 

trunk/src/kash/bltin/test.c

@@ -25 +25 @@
 #include <stdarg.h>
 
+#include "shell.h"
 #include "error.h"
 #include "shinstance.h"

trunk/src/kash/error.h

@@ -38 +38 @@
 #define ___error_h
 
+#include "shtypes.h"
 #include <stdarg.h>
 

trunk/src/kash/expand.c

@@ -388 +388 @@
         if (quotes)
                 rmescapes(psh, p+2);
-        result = arith(p+2);
+        result = arith(psh, p+2);
         fmtstr(p, 12, "%d", result);
 

trunk/src/kash/expand.h

@@ -38 +38 @@
 #define ___expand_h
 
+#include "shtypes.h"
+
 struct strlist {
         struct strlist *next;
@@ -70 +72 @@
 
 /* From arith.y */
-int arith(const char *);
+int arith(struct shinstance *, const char *);
 int expcmd(struct shinstance *, int , char **);
 void arith_lex_reset(void);