[main] First pass of $sh --eval flag

Still need:

- multiple --eval flags
- the --eval-pure flag
- should fail after parse error, unlike --rcfile

Author: Andy C

core/main_loop.py

@@ -12,11 +12,14 @@
 
 from _devbuild.gen import arg_types
 from _devbuild.gen.syntax_asdl import (command, command_t, parse_result,
-                                       parse_result_e)
+                                       parse_result_e, loc, source)
+from core import alloc
 from core import error
 from core import process
-from display import ui
+from core import pyutil
+from core import state
 from core import util
+from display import ui
 from frontend import reader
 from osh import cmd_eval
 from mycpp import mylib
@@ -28,9 +31,10 @@
 from typing import cast, Any, List, TYPE_CHECKING
 if TYPE_CHECKING:
     from core.comp_ui import _IDisplay
+    from core import process
     from frontend import parse_lib
-    from osh.cmd_parse import CommandParser
-    from osh.cmd_eval import CommandEvaluator
+    from osh import cmd_parse
+    from osh import cmd_eval
     from osh.prompt import UserPlugin
 
 _ = log
@@ -100,7 +104,7 @@ class Headless(object):
     """Main loop for headless mode."""
 
     def __init__(self, cmd_ev, parse_ctx, errfmt):
-        # type: (CommandEvaluator, parse_lib.ParseContext, ui.ErrorFormatter) -> None
+        # type: (cmd_eval.CommandEvaluator, parse_lib.ParseContext, ui.ErrorFormatter) -> None
         self.cmd_ev = cmd_ev
         self.parse_ctx = parse_ctx
         self.errfmt = errfmt
@@ -191,8 +195,8 @@ def _Loop(self):
 
 def Interactive(
         flag,  # type: arg_types.main
-        cmd_ev,  # type: CommandEvaluator 
-        c_parser,  # type: CommandParser
+        cmd_ev,  # type: cmd_eval.CommandEvaluator 
+        c_parser,  # type: cmd_parse.CommandParser
         display,  # type: _IDisplay
         prompt_plugin,  # type: UserPlugin
         waiter,  # type: process.Waiter
@@ -321,7 +325,7 @@ def Interactive(
 
 
 def Batch(cmd_ev, c_parser, errfmt, cmd_flags=0):
-    # type: (CommandEvaluator, CommandParser, ui.ErrorFormatter, int) -> int
+    # type: (cmd_eval.CommandEvaluator, cmd_parse.CommandParser, ui.ErrorFormatter, int) -> int
     """Loop for batch execution.
 
     Returns:
@@ -387,7 +391,7 @@ def Batch(cmd_ev, c_parser, errfmt, cmd_flags=0):
 
 
 def ParseWholeFile(c_parser):
-    # type: (CommandParser) -> command_t
+    # type: (cmd_parse.CommandParser) -> command_t
     """Parse an entire shell script.
 
     This uses the same logic as Batch().  Used by:
@@ -411,3 +415,46 @@ def ParseWholeFile(c_parser):
         return children[0]
     else:
         return command.CommandList(children)
+
+def EvalFile(fs_path, fd_state, parse_ctx, cmd_ev):
+    # type: (str, process.FdState, parse_lib.ParseContext, cmd_eval.CommandEvaluator) -> bool
+    """Evaluate a disk file, for --eval --eval-pure
+
+    Copied and adapted from the 'source' builtin in builtin/meta_oils.py.
+
+    (Note that bind -x has to eval from a string, like Eval)
+
+    Raises:
+      util.UserExit
+    Returns:
+      ok: whether processing should continue
+    """
+    mem = cmd_ev.mem
+    arena = cmd_ev.arena
+    errfmt = cmd_ev.errfmt
+
+    # _LoadDiskFile
+    blame_loc = loc.Missing
+    try:
+        f = fd_state.Open(fs_path)
+    except (IOError, OSError) as e:
+        errfmt.Print_(
+            'Error reading %r: %s' % (fs_path, pyutil.strerror(e)),
+            blame_loc=blame_loc)
+        return False
+
+    line_reader = reader.FileLineReader(f, arena)
+    c_parser = parse_ctx.MakeOshParser(line_reader)
+
+    # TODO:
+    # - Improve error locations
+    # - parse error should be fatal
+
+    with process.ctx_FileCloser(f):
+        with state.ctx_ThisDir(mem, fs_path):
+            src = source.MainFile(fs_path)
+            with alloc.ctx_SourceCode(arena, src):
+                # May raise util.UserExit
+                unused = Batch(cmd_ev, c_parser, errfmt)
+
+    return True

core/shell.py

@@ -164,7 +164,8 @@ def SourceStartupFile(
     rc_c_parser = parse_ctx.MakeOshParser(rc_line_reader)
 
     with alloc.ctx_SourceCode(arena, source.MainFile(rc_path)):
-        # TODO: handle status, e.g. 2 for ParseError
+        # Note: bash keep going after parse error in startup file.  Should we
+        # have a strict mode for this?
         unused = main_loop.Batch(cmd_ev, rc_c_parser, errfmt)
 
     f.close()
@@ -957,9 +958,23 @@ def Main(
     # First, process --eval flags.  In interactive mode, this comes before --rcfile.
     # (It could be used for the headless shell.  Although terminals have a bootstrap process.)
     # Note that --eval
+
+    # TODO: process these in a loop, in order
     if flag.eval is not None:
-        raise AssertionError()
+        try:
+            ok = main_loop.EvalFile(flag.eval, fd_state, parse_ctx, cmd_ev)
+        except util.UserExit as e:
+            # TODO:
+            # do we need this?
+            # should there be a different shopt?  Could be verbose in YSH
+            if exec_opts.verbose_errexit():
+                errfmt.StderrLine('oils: --eval exit')
+            return e.status
+        if not ok:  # parse error or I/O error was already printed
+            return 1
+
     if flag.eval_pure is not None:
+        # TODO: Same as above, except we restrict
         raise AssertionError('pure')
 
     #

frontend/syntax.asdl

@@ -46,12 +46,14 @@ module syntax
   | CFlag
   | Stdin(str comment)
 
-    # MainFile is for main.{osh,ysh}, as well as oshrc/yshrc.  They're files
-    # loaded directly by the shell.
+    # MainFile is for main.{osh,ysh}, --eval oshrc/yshrc.  They're files loaded
+    # directly by the shell.
   | MainFile(str path)
     # A file loaded by 'source' or 'use'.
-    # TODO: provide a chain of locations back to the sourced script!  I guess
-    # the debug_stack can do that too.
+    # TODO: we probably don't need this location?  The debug stack provides a
+    # chain of locations back to the sourced script.  Maybe we need to point to
+    # a debug_frame instead?
+    # It could be DiskFileShell and DiskFileUser, or just DiskFile.
   | OtherFile(str path, loc location)
 
     # Code parsed from a word.  (TODO: rename source.Word?)

spec/interactive.test.sh

@@ -37,6 +37,19 @@ RCFILE
 2
 ## END
 
+#### --rcfile with parse error - shell is executed anyway
+cat >$TMP/rcfile <<EOF
+echo RCFILE; ( echo
+EOF
+
+$SH --rcfile $TMP/rcfile -i -c 'echo flag -c'
+echo status=$?
+
+## STDOUT:
+flag -c
+status=0
+## END
+
 #### interactive shell loads files in rcdir (when combined with -c)
 
 $SH -c 'echo A'

spec/ysh-usage.test.sh

@@ -1,6 +1,7 @@
 ## our_shell: ysh
+## oils_failures_allowed: 2
 
-#### ysh usage
+#### ysh --location-str --location-start-line
 
 set +o errexit
 
@@ -21,6 +22,106 @@ line 10
 -- [ stdin ]:11: Unexpected
 ## END
 
+#### ysh --eval
+
+echo 'echo one --eval' >one.ysh
+$[ENV.SH] --eval one.ysh -c 'echo flag -c'
+echo
+
+echo 'echo myscript' >myscript.sh
+$[ENV.SH] --eval one.ysh myscript.sh
+echo
+
+# eval comes before oshrc
+echo 'echo oshrc' >oshrc
+$[ENV.SH] --rcfile oshrc --eval one.ysh -i -c 'echo flag -c'
+echo
+
+exit
+
+echo 'echo two --eval' >two.ysh
+
+$[ENV.SH] --eval one.ysh --eval two.ysh -c 'echo flag -c'
+
+
+## STDOUT:
+one --eval
+flag -c
+
+one --eval
+myscript
+
+one --eval
+oshrc
+flag -c
+
+## END
+
+#### ysh --eval-pure
+
+echo TODO
+
+## STDOUT:
+## END
+
+#### ysh --eval cannot load file
+
+$[ENV.SH] --eval nonexistent.ysh -c 'echo flag -c'
+
+## status: 1
+## STDOUT:
+## END
+
+#### ysh --eval parse error
+
+echo 'echo zz; ( echo' >bad.ysh
+
+$[ENV.SH] --eval bad.ysh -c 'echo hi'
+
+## STDOUT:
+## END
+
+#### ysh --eval runtime error
+
+echo 'echo flag --eval; false; echo bye' >bad.ysh
+
+$[ENV.SH] --eval bad.ysh -c 'echo flag -c'
+
+## STDOUT:
+flag --eval
+flag -c
+## END
+
+#### ysh --eval exit status
+
+echo 'echo hi; exit 99; echo bye' >e.ysh
+
+$[ENV.SH] --eval e.ysh -c 'echo hi'
+
+## status: 99
+## STDOUT:
+hi
+## END
+
+#### ysh --eval respects _this_dir
+
+#echo tmp=$[ENV.TMP]
+
+var dir = "$[ENV.TMP]/code"
+mkdir -p $dir
+
+echo 'echo one; source $_this_dir/two.ysh' > $dir/one.ysh
+echo 'echo two' > $dir/two.ysh
+
+$[ENV.SH] --eval $dir/one.ysh -c 'echo flag -c'
+
+## STDOUT:
+one
+two
+flag -c
+## END
+
+
 #### --debug-file
 var TMP = ENV.TMP
 $[ENV.SH] --debug-file $TMP/debug.txt -c 'true'