Changeset 3236 for trunk

Timestamp:

Apr 30, 2007, 1:11:28 AM (18 years ago)

Author:

bird

Message:

Applied bash31-001

Location:

trunk/essentials/app-shells/bash

Files:

• parse.y (modified) (6 diffs)
• patchlevel.h (modified) (1 diff)

trunk/essentials/app-shells/bash/parse.y

@@ -3698 +3698 @@
       b = builtin_address_internal (token, 0);
       if (b && (b->flags & ASSIGNMENT_BUILTIN))
-        parser_state |= PST_ASSIGNOK;
+        parser_state |= PST_ASSIGNOK;
+      else if (STREQ (token, "eval") || STREQ (token, "let"))
+        parser_state |= PST_ASSIGNOK;
     }
 
@@ -4689 +4691 @@
 {
   WORD_LIST *wl, *rl;
-  int tok, orig_line_number, orig_token_size;
+  int tok, orig_line_number, orig_token_size, orig_last_token, assignok;
   char *saved_token, *ret;
 
@@ -4695 +4697 @@
   orig_token_size = token_buffer_size;
   orig_line_number = line_number;
+  orig_last_token = last_read_token;
 
   last_read_token = WORD;       /* WORD to allow reserved words here */
@@ -4700 +4703 @@
   token = (char *)NULL;
   token_buffer_size = 0;
+
+  assignok = parser_state&PST_ASSIGNOK;         /* XXX */
 
   wl = (WORD_LIST *)NULL;       /* ( */
@@ -4743 +4748 @@
     }
 
-  last_read_token = WORD;
+  last_read_token = orig_last_token;            /* XXX - was WORD? */
   if (wl)
     {
@@ -4755 +4760 @@
   if (retlenp)
     *retlenp = (ret && *ret) ? strlen (ret) : 0;
+
+  if (assignok)
+    parser_state |= PST_ASSIGNOK;
+
   return ret;
 }

trunk/essentials/app-shells/bash/patchlevel.h

@@ -26 +26 @@
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 0
+#define PATCHLEVEL 1
 
 #endif /* _PATCHLEVEL_H_ */