Changeset 1222 for trunk/src/kash/generated/arith.c

Timestamp:

Oct 8, 2007, 2:24:31 AM (18 years ago)

Author:

bird

Message:

more fixes - it all compiles now (linking fails of course).

File:

• trunk/src/kash/generated/arith.c (modified) (7 diffs)

trunk/src/kash/generated/arith.c

@@ -44 +44 @@
  */
 
-#include <sys/cdefs.h>
+#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
 #endif /* not lint */
+#endif
 
 #include <stdlib.h>
@@ -59 +58 @@
 #include "output.h"
 #include "memalloc.h"
-
+#include "shinstance.h"
+
+shinstance *arith_psh;
 const char *arith_buf, *arith_startbuf;
 
@@ -294 +295 @@
 #define yystacksize YYSTACKSIZE
 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;
 
@@ -314 +317 @@
  */
 int
-expcmd(argc, argv)
-        int argc;
-        char **argv;
+expcmd(shinstance *psh, int argc, char **argv)
 {
         const char *p;
@@ -344 +345 @@
                 p = "";
 
-        i = arith(p);
+        i = arith(psh, p);
 
         out1fmt(psh, "%ld\n", i);
@@ -367 +368 @@
 
 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 */
 }
@@ -382 +383 @@
 #define YYERROR goto yyerrlab
 #ifdef __cplusplus
-extern "C" {
+extern "C" { 
 char * getenv();
 int yylex();