[fix] Fix Oil command sub.

And fix lint errors.
oilshell · Oct 16, 2020 · 56c395c · 56c395c
1 parent 574ce0f
commit 56c395c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/core/executor.py b/core/executor.py
@@ -28,7 +28,6 @@
 
 from typing import cast, Dict, List, TYPE_CHECKING
 if TYPE_CHECKING:
-  from _devbuild.gen.id_kind_asdl import Id_t
   from _devbuild.gen.runtime_asdl import cmd_value__Argv
   from _devbuild.gen.syntax_asdl import (
     command_t, command__Subshell, command__ShFunction,

diff --git a/core/vm.py b/core/vm.py
@@ -6,7 +6,6 @@
 
 from typing import List, Any, TYPE_CHECKING
 if TYPE_CHECKING:
-  from _devbuild.gen.id_kind_asdl import Id_t
   from _devbuild.gen.runtime_asdl import (
       cmd_value__Argv, cmd_value__Assign, redirect
   )

diff --git a/oil_lang/expr_eval.py b/oil_lang/expr_eval.py
@@ -237,7 +237,7 @@ def EvalExpr(self, node):
       if id_ == Id.Left_AmpParen:
         return 'TODO: value.Block'
       else:
-        stdout = self.shell_ex.RunCommandSub(node.child)
+        stdout = self.shell_ex.RunCommandSub(node)
         if id_ == Id.Left_AtParen:  # @(seq 3)
           strs = self.splitter.SplitForWordEval(stdout)
           return strs

diff --git a/osh/word_eval.py b/osh/word_eval.py
@@ -47,8 +47,7 @@
 from typing import Optional, Tuple, List, Dict, cast, TYPE_CHECKING
 
 if TYPE_CHECKING:
-  from _devbuild.gen.id_kind_asdl import Id_t
-  from _devbuild.gen.syntax_asdl import command_t, speck, word_part_t
+  from _devbuild.gen.syntax_asdl import speck, word_part_t
   from _devbuild.gen.option_asdl import builtin_t
   from core import optview
   from core.state import Mem