Merge pull request #2587 from Kodiologist/repl2

Execute `hy -i < code.hy` in the REPL environment

AUTHORS

@@ -109,3 +109,4 @@
 * Andrey Vlasovskikh <[email protected]>
 * Joseph LaFreniere <[email protected]>
 * Daniel Tan <[email protected]>
+* Zhan Tang <[email protected]>

NEWS.rst

@@ -25,6 +25,8 @@ Bug Fixes
 ------------------------------
 * Tracebacks now point to the correct code in more cases.
 * `help` should no longer crash when objects are missing docstrings.
+* `hy -i < script.hy` now executes `script.hy` inside the REPL environment,
+  like Python.
 
 0.28.0 (released 2024-01-05)
 =============================

hy/cmdline.py

@@ -262,10 +262,7 @@ def proc_opt(opt, arg=None, item=None, i=None):
         return 0
     elif action == "run_script_stdin":
         sys.argv = argv
-        if repl:
-            source = sys.stdin
-            filename = 'stdin'
-        else:
+        if not repl:
             return run_command(sys.stdin.read(), filename="<stdin>")
     elif action == "run_script_file":
         sys.argv = argv

tests/test_bin.py

@@ -80,6 +80,18 @@ def test_stdin():
     assert "TU" in out
 
 
+def test_i_flag_repl_env():
+    # If a program is passed in through standard input, it's evaluated
+    # in the REPL environment.
+    code = '(import sys) (if (hasattr sys "ps1") "Yeppers" "Nopers")'
+    out, _ = run_cmd("hy -i", code)
+    assert "Yeppers" in out
+    # With `-c`, on the other hand, the code is run before the REPL is
+    # launched.
+    out, _ = run_cmd(['hy', '-i', '-c', code])
+    assert "Nopers" in out
+
+
 def test_error_parts_length():
     """Confirm that exception messages print arrows surrounding the affected
     expression."""