ada/langkit
0
0
Fork 0
mirror of https://github.com/AdaCore/langkit.git synced 2026-02-12 12:28:12 -08:00
Code Issues Packages Projects Releases Wiki Activity

Q630-014: Adapt tests

Browse Source 
Change-Id: I50be23fd9126bb00c01f0df90db5d3812c7c30a5
This commit is contained in:
Raphael Amiard
2017-07-03 18:09:35 +02:00
parent caa90b9e85
commit bbea2feaa3
10 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
langkit/envs.py
View File

@@ -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)

8
testsuite/tests/lexical_envs/entity_resolver/test.py
View File

@@ -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():

2
testsuite/tests/lexical_envs/env_hook_unbound/test.py
View File

@@ -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():

8
testsuite/tests/lexical_envs/invalid_entity_resolver/test.py
View File

@@ -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():

12
testsuite/tests/lexical_envs/ref_after_reparse/test.py
View File

@@ -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):

8
testsuite/tests/properties/dynvar_bind/test.py
View File

@@ -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():

6
testsuite/tests/properties/internal_use/test.py
View File

@@ -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():

6
testsuite/tests/properties/is_visible_from/test.py
View File

@@ -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')

4
testsuite/tests/properties/populate_error/test.py
View File

@@ -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')

6
testsuite/tests/python-api/lexical_env/test.py
View File

@@ -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')