Skip to content

Commit 7bb5b25

Browse files
authored
Don't raise exception in evaluate() if parsing expr returns None (#1547)
This can happen for example if you give it a string consisting of just a comment.
1 parent 68e1ae5 commit 7bb5b25

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mathics/session.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from mathics.core.definitions import Definitions
2020
from mathics.core.evaluation import Evaluation, Result
2121
from mathics.core.parser import MathicsSingleLineFeeder, parse
22+
from mathics.core.symbols import SymbolNull
2223

2324

2425
def autoload_files(
@@ -150,7 +151,7 @@ def evaluate(self, str_expression, timeout=None, form=None):
150151
)
151152
if form is None:
152153
form = self.form
153-
self.last_result = expr.evaluate(self.evaluation)
154+
self.last_result = expr.evaluate(self.evaluation) if expr else SymbolNull
154155
return self.last_result
155156

156157
def evaluate_as_in_cli(self, str_expression, timeout=None, form=None, src_name=""):

0 commit comments

Comments
 (0)