py: fix RunSrc to allow multiple top-level statements (#257) - #258
Open
ncw wants to merge 1 commit into
Open
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
RunSrc compiled source in SingleMode, whose interactive grammar only accepts a single top-level statement. Source with more than one statement (e.g. two class definitions) failed with SyntaxError, while the equivalent RunFile path (which uses ExecMode) worked fine. Compile in ExecMode instead, matching RunFile and the semantics of Python's exec() for a source buffer, and add a regression test. Fixes #257
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
py.RunSrc fails with SyntaxError: 'invalid syntax' when the source contains more than one top-level statement — for example, two class definitions:
The equivalent py.RunFile path works fine.
Reported in #257.
Root cause
RunSrc compiled the source in SingleMode:
SingleMode maps to Python's single/interactive grammar, which accepts only a single top-level statement. RunFile goes through ResolveAndCompile, which uses ExecMode (the file/module grammar that accepts a whole module of statements) — hence the discrepancy.
This has been present since RunSrc was introduced in 727b7c4.
Fix
Compile in ExecMode instead, matching RunFile and the semantics of Python's exec() for a source buffer.
Test
Adds TestRunSrcMultipleStatements in pytest (which imports both py and stdlib, avoiding the import cycle in the py package). Verified it fails against the old SingleMode code and passes with the fix. Full suite green.
Fixes #257