Skip to content

Commit 71a5d82

Browse files
committed
fixings in MathicsSession
1 parent 3ff2a01 commit 71a5d82

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

mathics/core/definitions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ def load_pymathics_module(self, module, remove_on_quit=True):
151151
if not var.context:
152152
var.context = "Pymathics`"
153153
symbol_name = instance.get_name()
154+
print("loading symbol name ", symbol_name )
154155
builtins[symbol_name] = instance
155156
builtins_by_module[loaded_module.__name__].append(instance)
156157
newsymbols[symbol_name] = instance

mathics/session.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ def __init__(self, add_builtin=True, catch_interrupt=False, form="InputForm"):
1111
self.form = form
1212
self.last_result = None
1313

14-
def evaluate(self, str_expression, timeout = None, form=None):
14+
def evaluate(self, str_expression, timeout=None, form=None):
1515
expr = parse(self.definitions, SingleLineFeeder(str_expression))
1616
if form is None:
1717
form = self.form
1818
self.last_result = expr.evaluate(self.evaluation)
1919
return self.last_result
2020

21-
def format_result(self, str_expression=None, timeout = None, form=None):
22-
self.last_result
21+
def format_result(self, str_expression=None, timeout=None, form=None):
22+
if str_expression:
23+
self.evaluate(str_expression, timeout = None, form=None)
24+
25+
res = self.last_result
2326
if form is None:
2427
form = self.form
25-
return res.do_format(self.evaluation, form)
28+
return res.format(self.evaluation, form)

0 commit comments

Comments
 (0)