Skip to content

Commit

Permalink
[oil-language] Implement command sub in Oil expressions.
Browse files Browse the repository at this point in the history
One more spec test passes.  And we can even interoperate!
  • Loading branch information
Andy Chu committed Aug 9, 2019
1 parent bb8f53a commit 2d991fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/oil.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ def ShellMain(lang, argv0, argv, login_shell):
bool_ev = osh_expr_eval.BoolEvaluator(mem, exec_opts, word_ev, errfmt)
exec_deps.bool_ev = bool_ev

expr_ev = expr_eval.OilEvaluator(mem, errfmt)
expr_ev = expr_eval.OilEvaluator(mem, ex, errfmt)
exec_deps.expr_ev = expr_ev

tracer = dev.Tracer(parse_ctx, exec_opts, mem, word_ev, trace_f)
Expand Down
9 changes: 7 additions & 2 deletions oil_lang/expr_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from _devbuild.gen.id_kind_asdl import Id
from _devbuild.gen.syntax_asdl import (
expr_e, word_part_e
expr_e, expr_t, word_part_e
)
from _devbuild.gen.runtime_asdl import (
lvalue, value_e, scope_e,
Expand All @@ -23,8 +23,9 @@ class OilEvaluator(object):
2. Look up variables and evaluate words.
"""

def __init__(self, mem, errfmt):
def __init__(self, mem, ex, errfmt):
self.mem = mem
self.ex = ex
self.errfmt = errfmt

def LookupVar(self, var_name):
Expand Down Expand Up @@ -71,6 +72,7 @@ def EvalWordPart(self, part):
raise NotImplementedError(part.__class__.__name__)

def EvalRHS(self, node):
# type: (expr_t) -> Any
"""
This is a naive PyObject evaluator! It uses the type dispatch of the host
Python interpreter.
Expand All @@ -90,6 +92,9 @@ def EvalRHS(self, node):
if node.tag == expr_e.Var:
return self.LookupVar(node.name.val)

if node.tag == expr_e.CommandSub:
return self.ex.RunCommandSub(node.command_list)

if node.tag == expr_e.DoubleQuoted:
s = ''.join(self.EvalWordPart(part) for part in node.parts)
return s
Expand Down
6 changes: 4 additions & 2 deletions spec/oil-assign.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ x=7

#### command sub $(echo hi)
var x = $(echo hi)
echo x=$x
var y = $(echo '')
# Make sure we can operate on these values
echo x=${x:-default} y=${y:-default}
## STDOUT:
x=hi
x=hi y=default
## END

#### shell array @(a b c)
Expand Down

0 comments on commit 2d991fd

Please sign in to comment.