From 0417a44940300bcc862e2c35660209560ca05afe Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 12 Oct 2022 18:40:15 -0400
Subject: [PATCH 1/2] Parse string arguments in ToString

---
 mathics/builtin/atomic/strings.py | 32 +++++++++++++++++++++++++++++--
 mathics/core/formatter.py         |  1 +
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/mathics/builtin/atomic/strings.py b/mathics/builtin/atomic/strings.py
index 18fb1a533..0960b1d13 100644
--- a/mathics/builtin/atomic/strings.py
+++ b/mathics/builtin/atomic/strings.py
@@ -33,7 +33,7 @@
 from mathics.core.element import BaseElement
 from mathics.core.formatter import format_element
 from mathics.core.list import ListExpression
-from mathics.core.parser import MathicsFileLineFeeder, parse
+from mathics.core.parser import MathicsFileLineFeeder, MathicsSingleLineFeeder, parse
 from mathics.core.symbols import (
     Symbol,
     SymbolTrue,
@@ -48,8 +48,9 @@
 )
 
 
+from mathics.session import MathicsSession
 from mathics.settings import SYSTEM_CHARACTER_ENCODING
-from mathics_scanner import TranslateError
+from mathics_scanner import TranslateError, InvalidSyntaxError
 
 
 SymbolToExpression = Symbol("ToExpression")
@@ -820,16 +821,33 @@ class ToString(Builtin):
      = 2
     >> ToString[2] // InputForm
      = "2"
+
+    'ToString' formats output according to form rules. Note spaces around the operator are added:
     >> ToString[a+b]
      = a + b
+
     >> "U" <> 2
      : String expected.
      = U <> 2
     >> "U" <> ToString[2]
      = U2
+
     >> ToString[Integrate[f[x],x], TeXForm]
      = \\int f\\left[x\\right] \\, dx
 
+    When 'ToString' is passed a string, the string is first parsed to an expression.
+
+    >> ToString["1->2", OutputForm]
+     = ...
+
+    >> ToString["1->2"] == ToString[1 -> 2]
+     = True
+
+    If a string argument does not parse, the string is left untouched and returned
+    >> ToString["->2", StandardForm]
+     = ->2
+
+    ## FIXME: add examples using encoding->"ASCII", encoding->"Unicode" after this works.
     """
 
     options = {
@@ -851,6 +869,16 @@ def apply_default(self, value, evaluation, options):
     def apply_form(self, expr, form, evaluation, options):
         "ToString[expr_, form_, OptionsPattern[ToString]]"
         encoding = options["System`CharacterEncoding"]
+
+        if isinstance(expr, String):
+            # ToString[] of a string parses the string into an M-expression and then
+            # runs ToString[] on the resulting M-expression.
+            session = MathicsSession()
+            try:
+                expr = parse(session.definitions, MathicsSingleLineFeeder(expr.value))
+            except InvalidSyntaxError:
+                return expr
+
         return eval_ToString(expr, form, encoding.value, evaluation)
 
 
diff --git a/mathics/core/formatter.py b/mathics/core/formatter.py
index 9bd33e79b..a986a5790 100644
--- a/mathics/core/formatter.py
+++ b/mathics/core/formatter.py
@@ -183,6 +183,7 @@ def format_element(
     Applies formats associated to the expression, and then calls Makeboxes
     """
     expr = do_format(element, evaluation, form)
+    # FIXME: handle "encoding" in kwargs
     result = Expression(SymbolMakeBoxes, expr, form)
     result_box = result.evaluate(evaluation)
     if isinstance(result_box, String):

From 0983c40f96dba069e73a4e078c3efb5ed5991c86 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 12 Oct 2022 20:55:45 -0400
Subject: [PATCH 2/2] Replace session with definition...

that apparently is all we need.
---
 mathics/builtin/atomic/strings.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mathics/builtin/atomic/strings.py b/mathics/builtin/atomic/strings.py
index 0960b1d13..49deca601 100644
--- a/mathics/builtin/atomic/strings.py
+++ b/mathics/builtin/atomic/strings.py
@@ -25,6 +25,7 @@
     Integer1,
 )
 from mathics.core.attributes import listable, protected
+from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.convert.expression import to_mathics_list
@@ -48,7 +49,6 @@
 )
 
 
-from mathics.session import MathicsSession
 from mathics.settings import SYSTEM_CHARACTER_ENCODING
 from mathics_scanner import TranslateError, InvalidSyntaxError
 
@@ -873,9 +873,10 @@ def apply_form(self, expr, form, evaluation, options):
         if isinstance(expr, String):
             # ToString[] of a string parses the string into an M-expression and then
             # runs ToString[] on the resulting M-expression.
-            session = MathicsSession()
+            # FIXME: should add_builtin be True?
+            definitions = Definitions(add_builtin=False)
             try:
-                expr = parse(session.definitions, MathicsSingleLineFeeder(expr.value))
+                expr = parse(definitions, MathicsSingleLineFeeder(expr.value))
             except InvalidSyntaxError:
                 return expr