Skip to content

Don't raise exception in evaluate() if parsing expr returns None #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdlucas1 merged 3 commits into from
Dec 19, 2025
Merged

Don't raise exception in evaluate() if parsing expr returns None #1547

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6b40df
Update session.py
bdlucas1 Dec 18, 2025
db3fba2
Merge remote-tracking branch 'upstream/master' into fix-none-expr
bdlucas1 Dec 18, 2025
8538531
Return SymbolNull instead
bdlucas1 Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mathics/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def evaluate(self, str_expression, timeout=None, form=None):
)
if form is None:
form = self.form
self.last_result = expr.evaluate(self.evaluation)
self.last_result = expr.evaluate(self.evaluation) if expr else None
Copy link
Contributor

@mmatera mmatera Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In WMA, an empty expression should result in Null (SymbolNull). I think that what we should do here instead is to check in line 147 if expr is None, and return SymbolNull.

Copy link
Collaborator Author

@bdlucas1 bdlucas1 Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I've updated the PR accordingly.

Copy link
Member

@rocky rocky Dec 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I've updated the PR accordingly.

Thanks. LGTM. (And thanks @mmatera for spotting.)

Copy link
Contributor

@mmatera mmatera Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@mmatera mmatera Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

return self.last_result

def evaluate_as_in_cli(self, str_expression, timeout=None, form=None, src_name=""):
Expand Down
Loading