Merge pull request #1362 from mathics/string-output-in-quotes

Surround string output in double quotes.

Author: rocky

mathics/main.py

@@ -115,11 +115,29 @@ def read_line(self, prompt):
             return self.rl_read_line(prompt)
         return input(prompt)
 
-    def print_result(self, result, no_out_prompt=False):
-        if result is not None and result.result is not None:
-            output = self.to_output(str(result.result))
-            mess = self.get_out_prompt() if not no_out_prompt else ""
-            print(mess + output + "\n")
+    def print_result(self, result, no_out_prompt=False, strict_wl_output=False):
+        if result is None:
+            # FIXME decide what to do here
+            return
+
+        last_eval = result.last_eval
+
+        if last_eval is not None:
+            try:
+                eval_type = last_eval.get_head_name()
+            except:
+                print(sys.exc_info()[1])
+                return
+
+        out_str = str(result.result)
+        if eval_type == "System`String" and not strict_wl_output:
+            out_str = '"' + out_str.replace('"', r'\"') + '"'
+        if eval_type == "System`Graph":
+            out_str = "-Graph-"
+
+        output = self.to_output(out_str)
+        mess = self.get_out_prompt() if not no_out_prompt else ""
+        print(mess + output + "\n")
 
     def rl_read_line(self, prompt):
         # Wrap ANSI colour sequences in \001 and \002, so readline
@@ -191,10 +209,9 @@ def main() -> int:
         prog="mathics",
         usage="%(prog)s [options] [FILE]",
         add_help=False,
-        description="Mathics is a general-purpose computer algebra system.",
-        epilog="""Please feel encouraged to contribute to Mathics! Create
-            your own fork, make the desired changes, commit, and make a pull
-            request.""",
+        description="A simple command-line interface to Mathics",
+        epilog="""For a more extensive command-line interface see "mathicsscript".
+Please contribute to Mathics!""",
     )
 
     argparser.add_argument(
@@ -274,6 +291,12 @@ def main() -> int:
         "--version", "-v", action="version", version="%(prog)s " + __version__
     )
 
+    argparser.add_argument(
+        "--strict-wl-output",
+        help="Most WL-output compatible (at the expense of useability).",
+        action="store_true",
+    )
+
     args, script_args = argparser.parse_known_args()
 
     quit_command = "CTRL-BREAK" if sys.platform == "win32" else "CONTROL-D"
@@ -319,7 +342,7 @@ def main() -> int:
         for expr in args.execute:
             evaluation = Evaluation(shell.definitions, output=TerminalOutput(shell))
             result = evaluation.parse_evaluate(expr, timeout=settings.TIMEOUT)
-            shell.print_result(result, no_out_prompt=True)
+            shell.print_result(result, no_out_prompt=True, strict_wl_output=args.strict_wl_output)
             if evaluation.exc_result == Symbol("Null"):
                 exit_rc = 0
             elif evaluation.exc_result == Symbol("$Aborted"):
@@ -373,7 +396,7 @@ def main() -> int:
                 print(query)
             result = evaluation.evaluate(query, timeout=settings.TIMEOUT)
             if result is not None:
-                shell.print_result(result)
+                shell.print_result(result, strict_wl_output=args.strict_wl_output)
         except (KeyboardInterrupt):
             print("\nKeyboardInterrupt")
         except EOFError: