forked from M-Labs/artiq
1
0
Fork 0

Add support for ListComp.

This commit is contained in:
whitequark 2015-06-15 08:40:37 +03:00
parent 77adf2f6b5
commit d27bb3168d
3 changed files with 28 additions and 2 deletions

View File

@ -44,7 +44,7 @@ def is_int(typ, width=None):
def get_int_width(typ):
if is_int(typ):
return types.get_value(typ["width"])
return types.get_value(typ.find()["width"])
def is_float(typ):
return types.is_mono(typ, "float")

View File

@ -273,6 +273,22 @@ class ASTTypedRewriter(algorithm.Transformer):
if_loc=node.if_loc, else_loc=node.else_loc, loc=node.loc)
return self.visit(node)
def visit_ListComp(self, node):
extractor = LocalExtractor(env_stack=self.env_stack, engine=self.engine)
extractor.visit(node)
node = asttyped.ListCompT(
typing_env=extractor.typing_env, globals_in_scope=extractor.global_,
type=types.TVar(),
elt=node.elt, generators=node.generators,
begin_loc=node.begin_loc, end_loc=node.end_loc, loc=node.loc)
try:
self.env_stack.append(node.typing_env)
return self.generic_visit(node)
finally:
self.env_stack.pop()
def visit_Raise(self, node):
node = self.generic_visit(node)
if node.cause:
@ -297,7 +313,6 @@ class ASTTypedRewriter(algorithm.Transformer):
visit_Ellipsis = visit_unsupported
visit_GeneratorExp = visit_unsupported
visit_Lambda = visit_unsupported
visit_ListComp = visit_unsupported
visit_Set = visit_unsupported
visit_SetComp = visit_unsupported
visit_Str = visit_unsupported
@ -646,6 +661,14 @@ class Inferencer(algorithm.Visitor):
[self._coerce_one(typ, operand, other_node) for operand in operands]
node.type.unify(builtins.TBool())
def visit_ListCompT(self, node):
self.generic_visit(node)
node.type.unify(builtins.TList(node.elt.type)) # should never fail
def visit_comprehension(self, node):
self.generic_visit(node)
self._unify_collection(element=node.target, collection=node.iter)
def visit_Assign(self, node):
self.generic_visit(node)
if len(node.targets) > 1:

View File

@ -47,3 +47,6 @@ True and False
not 1
# CHECK-L: 1:int(width='i):bool
[x for x in [1]]
# CHECK-L: [x:int(width='j) for x:int(width='j) in [1:int(width='j)]:list(elt=int(width='j))]:list(elt=int(width='j))