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

Timestamp:

Sep 15, 2020, 2:55:26 PM (5 years ago)

Author:

bird

Message:

kash: Cache one pstack_block since parsecmd seems to be called for each statement line in a script. Also, mark pstack blocks as 'done' before returning from parsecmd and prevent them from becoming current (curpstack) again upon popping.

File:

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

trunk/src/kash/parser.c

@@ -133 +133 @@
         union node *ret;
         int t;
-
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        pstack_block *pst = pstackallocpush(psh);
+#endif
         TRACE2((psh, "parsecmd(%d)\n", interact));
-#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
-        pstackallocpush(psh);
-#endif
+
         psh->tokpushback = 0;
         psh->doprompt = interact;
@@ -155 +155 @@
         TRACE2((psh, "parsecmd(%d) returns:\n", interact));
         showtree(psh, ret);
+#endif
+#ifdef KASH_SEPARATE_PARSER_ALLOCATOR
+        pstackmarkdone(pst);
 #endif
         return ret;