Consider variable assignments during command search (rehash of #20)

.travis.yml

@@ -71,6 +71,11 @@ script:
   - make -C src/ test
   - TEST_DEBUG=1 TEST_TIMEOUT=15 make -C tests/ test # higher timeout for CI (default is 9s)
 
+  # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER)
+  - yes n | modernish/install.sh -s smoosh 2>&1 | tee modernish.log || true
+  - test "$(grep BUG modernish.log)" = '   LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE' || echo "Expected BUG_MULTIBYTE (and no others)"
+  - test "$(grep FAIL modernish.log | cut -c3,4,5)" = '002' || echo 'Expected ASCII char failure'
+
   # BUILD AND TEST WEB SERVER
   - (cd web; bundle install)
   - sh web/src/mk_config.sh $(pwd) >web/src/config.yml

src/command.lem

@@ -2783,11 +2783,14 @@ let run_command s0 opts checked prog_name argv env =
                    Right (s3, stmt, restore)
                 end
              | Nothing ->
-                match check_execve Nothing (* no prefix *) s1 prog with
-                | (s2, Nothing) -> 
+                let ts0 = push_locals s1 env in
+                match check_execve Nothing (* no prefix *) ts0 prog with
+                | (ts1, Nothing) ->
+                   let (s2, _) = pop_locals ts1 in
                    (* failed... and emitted an error message and set the ec *)
                    Right (s2, Done, true)
-                | (s2, Just executable) ->
+                | (ts1, Just executable) ->
+                   let (s2, _) = pop_locals ts1 in
                    let cmd = symbolic_string_of_string executable in
                    let exported = exported_set_vars s2 in
                    (* use env to override exports---impl as Pmap.(union) *)

tests/shell/semantics.command.path.test

@@ -0,0 +1,3 @@
+OLDPATH="$PATH"
+PATH=""
+PATH="$OLDPATH" cat </dev/null