Changeset 1199 for trunk/src/kash/parser.c

Timestamp:

Oct 7, 2007, 12:04:05 AM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/parser.c (modified) (9 diffs)

trunk/src/kash/parser.c ¶

@@ -257 +257 @@
 
         negate = 0;
-        TRACE(("pipeline: entered\n"));
+        TRACE((psh, "pipeline: entered\n"));
         while (readtoken() == TNOT)
                 negate = !negate;
@@ -313 +313 @@
 
         while (readtoken() == TNOT) {
-                TRACE(("command: TNOT recognized\n"));
+                TRACE((psh, "command: TNOT recognized\n"));
                 negate = !negate;
         }
@@ -353 +353 @@
                 n1->nbinary.ch1 = list(0);
                 if ((got=readtoken()) != TDO) {
-TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
+TRACE((psh, "expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
                         synexpect(TDO);
                 }
@@ -554 +554 @@
 
         while (readtoken() == TNOT) {
-                TRACE(("command: TNOT recognized\n"));
+                TRACE((psh, "command: TNOT recognized\n"));
                 negate = !negate;
         }
@@ -622 +622 @@
 void fixredir(union node *n, const char *text, int err)
         {
-        TRACE(("Fix redir %s %d\n", text, err));
+        TRACE((psh, "Fix redir %s %d\n", text, err));
         if (!err)
                 n->ndup.vname = NULL;
@@ -654 +654 @@
                 if (quoteflag == 0)
                         n->type = NXHERE;
-                TRACE(("Here document %d\n", n->type));
+                TRACE((psh, "Here document %d\n", n->type));
                 if (here->striptabs) {
                         while (*wordtext == '\t')
@@ -753 +753 @@
                                         lasttoken = t = pp -
                                             parsekwd + KWDOFFSET;
-                                        TRACE(("keyword %s recognized\n", tokname[t]));
+                                        TRACE((psh, "keyword %s recognized\n", tokname[t]));
                                         goto out;
                                 }
                         }
                         if(!noalias &&
-                            (ap = lookupalias(wordtext, 1)) != NULL) {
+                            (ap = lookupalias(psh, wordtext, 1)) != NULL) {
                                 pushstring(ap->val, strlen(ap->val), ap);
                                 checkkwd = savecheckkwd;
@@ -769 +769 @@
 #ifdef DEBUG
         if (!alreadyseen)
-            TRACE(("token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+            TRACE((psh, "token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
         else
-            TRACE(("reread token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
+            TRACE((psh, "reread token %s %s\n", tokname[t], t == TWORD ? wordtext : ""));
 #endif
         return (t);
@@ -1620 +1620 @@
 {
         if (commandname)
-                outfmt(&errout, "%s: %d: ", commandname, startlinno);
-        outfmt(&errout, "Syntax error: %s\n", msg);
-        error((char *)NULL);
+                outfmt(&psh->errout, "%s: %d: ", commandname, startlinno);
+        outfmt(&psh->errout, "Syntax error: %s\n", msg);
+        error(psh, (char *)NULL);
         /* NOTREACHED */
 }