Add -e/--eval and refactor argparse

Author: klamike

pysrc/juliacall/__main__.py

@@ -1,4 +1,22 @@
-from juliacall.repl import run_repl
-
 if __name__ == '__main__':
-    run_repl()
+    import argparse
+    from pathlib import Path
+    parser = argparse.ArgumentParser("JuliaCall REPL (experimental)")
+    parser.add_argument('-e', '--eval', type=str, default=None, help='Evaluate <expr>. If specified, all other arguments are ignored.')
+
+    parser.add_argument('--banner', choices=['yes', 'no', 'short'], default='yes', help='Enable or disable startup banner')
+    parser.add_argument('--quiet', '-q', action='store_true', help='Quiet startup: no banner, suppress REPL warnings')
+    parser.add_argument('--history-file', choices=['yes', 'no'], default='yes', help='Load or save history')
+    parser.add_argument('--preamble', type=Path, help='Code to be included before the REPL starts')
+    args = parser.parse_args()
+    if args.eval is not None:
+        from juliacall import Main
+        Main.seval(args.eval)
+    else:
+        from juliacall.repl import run_repl
+        run_repl(
+            banner=args.banner,
+            quiet=args.quiet,
+            history_file=args.history_file,
+            preamble=args.preamble
+        )

pysrc/juliacall/repl.py

@@ -1,40 +1,31 @@
-def run_repl():
+def run_repl(banner='yes', quiet=False, history_file='yes', preamble=None):
     import os
     os.environ.setdefault("PYTHON_JULIACALL_HANDLE_SIGNALS", "yes")
     if os.environ.get("PYTHON_JULIACALL_HANDLE_SIGNALS") != "yes":
         print("Experimental JuliaCall REPL requires PYTHON_JULIACALL_HANDLE_SIGNALS=yes")
         exit(1)
 
-    import argparse
-    from pathlib import Path
-    parser = argparse.ArgumentParser("JuliaCall REPL (experimental)")
-    parser.add_argument('--banner', choices=['yes', 'no', 'short'], default='yes', help='Enable or disable startup banner')
-    parser.add_argument('--quiet', '-q', action='store_true', help='Quiet startup: no banner, suppress REPL warnings')
-    parser.add_argument('--history-file', choices=['yes', 'no'], default='yes', help='Load or save history')
-    parser.add_argument('--preamble', type=Path, help='Code to be included before the REPL starts')
-    args = parser.parse_args()
-
     from juliacall import Main, Base
 
     Base.is_interactive = True
 
-    if not args.quiet:
+    if not quiet:
         Main.include(os.path.join(os.path.dirname(__file__), 'banner.jl'))
-        Main.__PythonCall_banner(Base.Symbol(args.banner))
+        Main.__PythonCall_banner(Base.Symbol(banner))
 
     if Main.seval(r'VERSION > v"v1.11.0-alpha1"'):
         no_banner_opt = Base.Symbol("no")
     else:
         no_banner_opt = False
 
-    if args.preamble:
-        Main.include(str(args.preamble.resolve()))
+    if preamble:
+        Main.include(str(preamble.resolve()))
 
     Base.run_main_repl(
         Base.is_interactive,
-        args.quiet,
+        quiet,
         no_banner_opt,
-        args.history_file == 'yes',
+        history_file == 'yes',
         True
     )