python-compiler.rs: src/ast_convert.rs comparison

Add ast.DictComp

author	Bastien Orivel <eijebong@bananium.fr>
date	Thu, 02 Jun 2016 22:20:48 +0200
parents	a0fb169fe0f9
children	f1c77634a2eb

comparison

equal deleted inserted replaced

-:a0fb169fe0f9
+:b21a246349f3
 let str_type = ast_module.get(py, "Str").unwrap();
 let list_type = ast_module.get(py, "List").unwrap();
 let compare_type = ast_module.get(py, "Compare").unwrap();
 let call_type = ast_module.get(py, "Call").unwrap();
 let listcomp_type = ast_module.get(py, "ListComp").unwrap();
+let dictcomp_type = ast_module.get(py, "DictComp").unwrap();
 assert!(is_instance(&ast, &ast_type));
 if is_instance(&ast, &arg_type) {
 let arg = ast.getattr(py, "arg").unwrap();
 let gen = gen.unwrap();
 let gen = parse_comprehension(py, gen);
 new_gens.push(gen);
 }
 expr::ListComp(Box::new(elt), new_gens)
-}
+} else if is_instance(&ast, &dictcomp_type) {
-else {
+let key = ast.getattr(py, "key").unwrap();
+let value = ast.getattr(py, "value").unwrap();
+let generators = ast.getattr(py, "generators").unwrap();
+let generators = generators.iter(py).unwrap();
+let key = parse_expr(py, key);
+let value = parse_expr(py, value);
+let mut new_gens = vec!();
+for gen in generators {
+let gen = gen.unwrap();
+let gen = parse_comprehension(py, gen);
+new_gens.push(gen);
+}
+expr::DictComp(Box::new(key), Box::new(value), new_gens)
+} else {
 println!("expr {}", ast);
 unreachable!()
 }
 }

Mercurial > python-compiler.rs