From bbea2feaa347b2f720cf10fe6f9f5cd06f3c2d4e Mon Sep 17 00:00:00 2001 From: Raphael Amiard Date: Mon, 3 Jul 2017 18:09:35 +0200 Subject: [PATCH] Q630-014: Adapt tests Change-Id: I50be23fd9126bb00c01f0df90db5d3812c7c30a5 --- langkit/envs.py | 2 ++ testsuite/tests/lexical_envs/entity_resolver/test.py | 8 ++++---- .../tests/lexical_envs/env_hook_unbound/test.py | 2 +- .../lexical_envs/invalid_entity_resolver/test.py | 8 ++++---- .../tests/lexical_envs/ref_after_reparse/test.py | 12 ++++++------ testsuite/tests/properties/dynvar_bind/test.py | 8 ++++---- testsuite/tests/properties/internal_use/test.py | 6 +++--- testsuite/tests/properties/is_visible_from/test.py | 6 +++--- testsuite/tests/properties/populate_error/test.py | 4 ++-- testsuite/tests/python-api/lexical_env/test.py | 6 +++--- 10 files changed, 32 insertions(+), 30 deletions(-) diff --git a/langkit/envs.py b/langkit/envs.py index 79a12dba7..26b9de5be 100644 --- a/langkit/envs.py +++ b/langkit/envs.py @@ -127,6 +127,8 @@ class EnvSpec(object): :type: langkit.compiled_types.ASTNodeType """ + actions = list(actions) + self.env_hook = None if isinstance(actions and actions[0], CallEnvHook): self.env_hook = actions.pop(0) diff --git a/testsuite/tests/lexical_envs/entity_resolver/test.py b/testsuite/tests/lexical_envs/entity_resolver/test.py index d0d59a06a..3f35ef90a 100644 --- a/testsuite/tests/lexical_envs/entity_resolver/test.py +++ b/testsuite/tests/lexical_envs/entity_resolver/test.py @@ -33,21 +33,21 @@ class Decl(FooNode): name = Field() refs = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self) ), add_env() - ]) + ) class Ref(FooNode): name = Field() - env_spec = EnvSpec([add_to_env( + env_spec = EnvSpec(add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self), resolver=FooNode.resolve_ref - )]) + )) @langkit_property(public=True) def resolve(): diff --git a/testsuite/tests/lexical_envs/env_hook_unbound/test.py b/testsuite/tests/lexical_envs/env_hook_unbound/test.py index 76f2d325f..9e49f5355 100644 --- a/testsuite/tests/lexical_envs/env_hook_unbound/test.py +++ b/testsuite/tests/lexical_envs/env_hook_unbound/test.py @@ -19,7 +19,7 @@ class FooNode(ASTNode): class BarNode(FooNode): - env_spec = EnvSpec([call_env_hook(Self)]) + env_spec = EnvSpec(call_env_hook(Self)) def lang_def(): diff --git a/testsuite/tests/lexical_envs/invalid_entity_resolver/test.py b/testsuite/tests/lexical_envs/invalid_entity_resolver/test.py index 811a9d29f..47e32b230 100644 --- a/testsuite/tests/lexical_envs/invalid_entity_resolver/test.py +++ b/testsuite/tests/lexical_envs/invalid_entity_resolver/test.py @@ -31,20 +31,20 @@ def run(name, prop): name = Field() refs = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self) ), add_env() - ]) + ) class Ref(FooNode): name = Field() - env_spec = EnvSpec([add_to_env( + env_spec = EnvSpec(add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self), resolver=FooNode.resolve_ref - )]) + )) @langkit_property(public=True) def resolve(): diff --git a/testsuite/tests/lexical_envs/ref_after_reparse/test.py b/testsuite/tests/lexical_envs/ref_after_reparse/test.py index b1a0bf5c9..3d94e9bd5 100644 --- a/testsuite/tests/lexical_envs/ref_after_reparse/test.py +++ b/testsuite/tests/lexical_envs/ref_after_reparse/test.py @@ -51,26 +51,26 @@ class Block(FooNode): usings = Field() refs = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env(New(T.env_assoc, key=Self.name.sym, val=Self)), add_env() - ]) + ) class Decl(FooNode): name = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env(New(T.env_assoc, key=Self.name.sym, val=Self)) - ]) + ) class Using(FooNode): name = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( reference(Self.name.cast(FooNode).to_array, through=Name.designated_env) - ]) + ) class Ref(FooNode): diff --git a/testsuite/tests/properties/dynvar_bind/test.py b/testsuite/tests/properties/dynvar_bind/test.py index 4b863bf38..56ac03ed8 100644 --- a/testsuite/tests/properties/dynvar_bind/test.py +++ b/testsuite/tests/properties/dynvar_bind/test.py @@ -24,22 +24,22 @@ class Decl(FooNode): name = Field() refs = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self) ), add_env() - ]) + ) class Ref(FooNode): name = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env( New(T.env_assoc, key=Self.name.symbol, val=Self), ) - ]) + ) @langkit_property(public=True) def resolve(): diff --git a/testsuite/tests/properties/internal_use/test.py b/testsuite/tests/properties/internal_use/test.py index ae66bfcf0..a4f83f88f 100644 --- a/testsuite/tests/properties/internal_use/test.py +++ b/testsuite/tests/properties/internal_use/test.py @@ -34,10 +34,10 @@ class Def(Stmt): body = Field() name = Property(Self.id) - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env(Self.id.symbol, Self), add_env() - ]) + ) faulty_prop = Property(Self._env_mappings_0) @@ -45,7 +45,7 @@ class Def(Stmt): class Block(Stmt): items = Field() - env_spec = EnvSpec([add_env()]) + env_spec = EnvSpec(add_env()) def lang_def(): diff --git a/testsuite/tests/properties/is_visible_from/test.py b/testsuite/tests/properties/is_visible_from/test.py index c7299c459..d92ed0e8b 100644 --- a/testsuite/tests/properties/is_visible_from/test.py +++ b/testsuite/tests/properties/is_visible_from/test.py @@ -29,14 +29,14 @@ class FooNode(ASTNode): class Name(FooNode): tok = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env(New(T.env_assoc, key=Self.tok.symbol, val=Self)), add_env() - ]) + ) class Scope(Name.list): - env_spec = EnvSpec([add_env()]) + env_spec = EnvSpec(add_env()) foo_grammar = Grammar('main_rule') diff --git a/testsuite/tests/properties/populate_error/test.py b/testsuite/tests/properties/populate_error/test.py index db285045f..ffb5a4039 100644 --- a/testsuite/tests/properties/populate_error/test.py +++ b/testsuite/tests/properties/populate_error/test.py @@ -19,9 +19,9 @@ class FooNode(ASTNode): class Example(FooNode): - env_spec = EnvSpec([ + env_spec = EnvSpec( set_initial_env(Self.parent.parent.children_env) - ]) + ) foo_grammar = Grammar('main_rule') diff --git a/testsuite/tests/python-api/lexical_env/test.py b/testsuite/tests/python-api/lexical_env/test.py index a5b82fc57..096fd6d4b 100644 --- a/testsuite/tests/python-api/lexical_env/test.py +++ b/testsuite/tests/python-api/lexical_env/test.py @@ -39,16 +39,16 @@ class Def(Stmt): id = Field() body = Field() - env_spec = EnvSpec([ + env_spec = EnvSpec( add_to_env(New(T.env_assoc, key=Self.id.symbol, val=Self)), add_env() - ]) + ) class Block(Stmt): items = Field() - env_spec = EnvSpec([add_env()]) + env_spec = EnvSpec(add_env()) foo_grammar = Grammar('stmts_rule')