fix BaseForm

Author: mmatera

mathics/builtin/inout.py

@@ -2784,7 +2784,8 @@ def apply_makeboxes(self, expr, n, f, evaluation):
         try:
             val = convert_base(x, base, p)
         except ValueError:
-            return evaluation.message("BaseForm", "basf", n)
+            evaluation.message("BaseForm", "basf", n)
+            return None
 
         if f.get_name() == "System`OutputForm":
             return from_python("%s_%d" % (val, base))

mathics/builtin/strings.py

@@ -22,6 +22,7 @@
     PrefixOperator,
 )
 from mathics.core.expression import (
+    BoxError,
     Expression,
     Symbol,
     SymbolFailed,
@@ -1887,7 +1888,15 @@ def apply_default(self, value, evaluation, options):
     def apply_form(self, value, form, evaluation, options):
         "ToString[value_, form_, OptionsPattern[ToString]]"
         encoding = options["System`CharacterEncoding"]
+        if value.has_form("HoldForm", None):
+            if len(value._leaves) == 1:
+                value = value._leaves[0]
+            else:
+                value = Expression("Sequence", *(value._leaves))
         text = value.format(evaluation, form.get_name(), encoding=encoding)
+        if text is None or text.has_form("MakeBoxes", None):
+            raise BoxError(value, form)
+
         text = text.boxes_to_text(evaluation=evaluation)
         return String(text)
 

mathics/core/evaluation.py

@@ -231,10 +231,23 @@ def __init__(
         self, definitions=None, output=None, format="text", catch_interrupt=True
     ) -> None:
         from mathics.core.definitions import Definitions
-        from mathics.core.expression import Symbol
-
+        from mathics.core.expression import Symbol, String
         if definitions is None:
             definitions = Definitions()
+        # This code is for debugging, to avoid to pass
+        # through evaluation in format.
+        from mathics.builtin.strings import ToString
+        self.tostring = ToString(expression=False)
+        tostropts = {'System`CharacterEncoding': String("Unicode"),
+                     'System`FormatType': Symbol('OutputForm'),
+                     'System`NumberMarks': Symbol('$NumberMarks'),
+                     'System`PageHeight': Symbol('Infinity'),
+                     'System`PageWidth': Symbol('Infinity'),
+                     'System`TotalHeight': Symbol('Infinity'),
+                     'System`TotalWidth': Symbol('Infinity')
+        }
+        self.tostring.options = tostropts
+        #######
         self.definitions = definitions
         self.recursion_depth = 0
         self.timeout = False
@@ -437,25 +450,31 @@ def format_output(self, expr, format=None):
 
         from mathics.core.expression import Expression, BoxError
 
-        fmtstring = "" 
+        fmtsymbol = None
         if format == "text":
-            fmtstring = Symbol("System`OutputForm")
+            fmtsymbol = Symbol("System`OutputForm")
         elif format == "xml":
-            fmtstring = Symbol("System`MathMLForm")
+            fmtsymbol = Symbol("System`MathMLForm")
         elif format == "tex":
-            fmtstring = Symbol("System`TeXForm")
+            fmtsymbol = Symbol("System`TeXForm")
         elif format == "unformatted":
             self.exc_result = None
             return expr
         else:
             raise ValueError
         try:
-            expr = Expression("HoldForm", expr)
-            result = Expression("ToString", expr, fmtstring).evaluate(self)
-            boxes = result.value
+            hfexpr = Expression("HoldForm", expr)
+            # The next uncommented lines are just for debug. Eventually,
+            # we can go bach to the commented line...
+            # Expression("ToString", hfexpr, fmtsymbol).evaluate(self)
+            opts =  self.tostring.options
+            result = self.tostring.apply_form(hfexpr, fmtsymbol, self, opts)
+            boxes = result.value if result is not None else None
         except BoxError:
+            result = self.tostring.apply_form(hfexpr, Symbol("FullForm"), self, opts)
             self.message(
-                "General", "notboxes", Expression("FullForm", result).evaluate(self)
+                "General", "notboxes",
+                Expression("MakeBoxes", result, fmtsymbol)
             )
             boxes = None
         return boxes