# HG changeset patch # User Bastien Orivel # Date 1465838579 -7200 # Node ID 7d1406181aae96235d959081de0e1ce6abea6784 # Parent efd42fc280e857a4bec75bd27c223b75aa6a5856 Add ast.SetComp. diff --git a/src/ast_convert.rs b/src/ast_convert.rs --- a/src/ast_convert.rs +++ b/src/ast_convert.rs @@ -305,6 +305,7 @@ fn parse_expr(py: Python, ast: PyObject) let yield_type = ast_module.get(py, "Yield").unwrap(); let yield_from_type = ast_module.get(py, "YieldFrom").unwrap(); let set_type = ast_module.get(py, "Set").unwrap(); + let setcomp_type = ast_module.get(py, "SetComp").unwrap(); assert!(is_instance(&ast, &ast_type)); @@ -426,6 +427,14 @@ fn parse_expr(py: Python, ast: PyObject) let elements = parse_list(py, elts, parse_expr); expr::Set(elements) + } else if is_instance(&ast, &setcomp_type) { + let elt = ast.getattr(py, "elt").unwrap(); + let generators = ast.getattr(py, "generators").unwrap(); + + let elt = parse_expr(py, elt); + let generators = parse_list(py, generators, parse_comprehension); + + expr::SetComp(Box::new(elt), generators) } else { println!("expr {}", ast); unreachable!() diff --git a/src/ast_dump.rs b/src/ast_dump.rs --- a/src/ast_dump.rs +++ b/src/ast_dump.rs @@ -195,6 +195,7 @@ impl to_string_able for expr { }, expr::YieldFrom(value) => format!("yield from {}", value.to_string()), expr::Set(elts) => format!("{{{}}}", vec_to_strings_vec(elts).join(", ")), + expr::SetComp(elt, generators) => format!("{{{} {}}}", elt.to_string(), vec_to_strings_vec(generators).join(" ")), } } } diff --git a/src/python_ast.rs b/src/python_ast.rs --- a/src/python_ast.rs +++ b/src/python_ast.rs @@ -86,7 +86,7 @@ pub enum expr { //Dict(Vec, Vec) Set(Vec), ListComp(Box, Vec), - //SetComp(Box, Vec) + SetComp(Box, Vec), DictComp(Box, Box, Vec), //GeneratorExp(Box, Vec) diff --git a/tests/test_parse_files/test_setcomp.py b/tests/test_parse_files/test_setcomp.py new file mode 100644 --- /dev/null +++ b/tests/test_parse_files/test_setcomp.py @@ -0,0 +1,1 @@ +a = {(a, b) for a in range(5) for b in range(6)}