Implementing python's global and nonlocal
#1735
Conversation
oxisto
requested review from
maximiliankaul,
lshala,
konradweiss and
KuechA
as code owners
| @@ -90,6 +90,9 @@ abstract class Scope( | |||
| */ | |||
| @Transient var wildcardImports: MutableSet<ImportDeclaration> = mutableSetOf() | |||
|
|
|||
| /** A list of scope modifications. */ | |||
| @Transient var scopeModifications: MutableMap<Name, Scope> = mutableMapOf() | |||
There was a problem hiding this comment.
this would be the alternative approach to the node. Depending on what we decide, this would be removed
oxisto
changed the title
globalglobal and nonlocal
There was a problem hiding this comment.
I'd appreciate to have two PRs:
- one for the CPG changes (with it's own tests, so that we can see how it's supposed to work in general and not only in the specific python use-case)
- one making use of the first PR by implementing the Python stuff
I get why you modify the scope of a Reference as this is how the Python front-end works. However, don't we need a scope modifier for the declaration (I get that this will be problematic with the Python "add declarations pass"?
| @@ -329,3 +330,22 @@ fun MetadataProvider.newDefaultStatement(rawNode: Any? = null): DefaultStatement | |||
| log(node) | |||
| return node | |||
| } | |||
|
|
|||
| /** | |||
| * Creates a new [DefaultStatement]. The [MetadataProvider] receiver will be used to fill different | |||
There was a problem hiding this comment.
ReferenceScopeModifierStatement
|
|
||
| // There should be three variable declarations, two local and one global | ||
| var cVariables = result.variables("c") | ||
| assertEquals(3, cVariables.size) |
There was a problem hiding this comment.
I see the global one. But where is the second local one? I only see the c = 3
Done. #1742
The declaration's scope is not modified. Only the "lookup scope" of the symbol that you are trying to resolve in the current scope is modified (e.g., from the local to the global scope). The trick is that the add-declaration-pass will then create the variable in the lookup-scope (if it does not exist). So if we have a |
This PR adds a new node type `LookupScopeStatement`, which can be used to adjust the lookup scope of symbols that are resolved in the current scope. Most prominent examples are Python's `global` and `nonlocal` statements. Support for python will be added in a later PR. This will only add the node and provides the basic functionality in the lookup.
This PR tries to implement python's `global` keyword and tries to replicate python variable resolution as good as possible.
oxisto
force-pushed
the
python-global
branch
from
7820a1b
to
4d793e8
Compare
|
This PR tries to implement python's
globalkeyword and tries to replicate python variable resolution as good as possible.I had to add a
ReferenceScopeModifierStatementnode, which is able to solve bothglobalandnonlocal, but I am not 100 % happy with the solution. Another approach would be to store this scope modification in the scope itself, so this PR would need some discussion.nonlocalcannot be tested until we actually support parsing nested functions #1736