fixing for mathicsserver

Author: mmatera

mathics/builtin/base.py

@@ -606,10 +606,16 @@ def __new__(cls, *leaves, **kwargs):
     def evaluate(self, evaluation):
         # Shall here evaluate the leaves?
         return
-    
+
+    def get_head_name(self):
+        return self.get_name()
+
     def get_lookup_name(self):
         return self.get_name()
 
+    def get_string_value(self):
+        return "-@" + self.get_head_name() + "@-"
+
     def same(self, expr):
         return expr.same(self)
 

mathics/builtin/inout.py

@@ -845,7 +845,7 @@ def boxes_to_xml(self, leaves=None, **box_options) -> str:
             result += '<mtr>'
             for item in row:
                 result += '<mtd {0}>{1}</mtd>'.format(
-                    joined_attrs, item.boxes_to_xml(**new_box_options))
+                    joined_attrs, item.evaluate(evaluation).boxes_to_xml(**new_box_options))
             result += '</mtr>\n'
         result += '</mtable>'
         return result

mathics/core/expression.py

@@ -1228,7 +1228,9 @@ def eval_range(indices):
             for index in indices:
                 leaf = leaves[index]
                 if not leaf.has_form('Unevaluated', 1):
-                    leaves[index] = leaf.evaluate(evaluation)
+                    leaf = leaf.evaluate(evaluation)
+                    if leaf:
+                        leaves[index] = leaf
 
         if 'System`HoldAll' in attributes or 'System`HoldAllComplete' in attributes:
             # eval_range(range(0, 0))