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

annotate src/ast_convert.rs @ 59:407b3b217928

Add ast.With.

author	Bastien Orivel <eijebong@bananium.fr>
date	Sun, 12 Jun 2016 20:14:27 +0200
parents	e5a808ec31c0
children	9f0f457a67f6

rev	line source
59 407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	1 use python_ast::{Module, stmt, expr, expr_context, cmpop, boolop, operator, unaryop, arguments, arg, alias, comprehension, keyword, withitem};
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	2
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	3 use cpython::{Python, PyObject};
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	4 use cpython::ObjectProtocol; //for call method
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	5
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	6 fn get_str(py: Python, object: PyObject) -> String {
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	7 let pystring = object.str(py).unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	8 let mut string = pystring.to_string(py).unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	9 string.to_mut().to_string()
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	10 }
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	11
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	12 fn get_ctx(py: Python, object: PyObject) -> expr_context {
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	13 let builtins_module = py.import("builtins").unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	14 let isinstance = builtins_module.get(py, "isinstance").unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	15
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	16 let is_instance = \|object: &PyObject, type_: &PyObject\| {
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	17 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	18 };
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	19
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	20 let ast_module = py.import("ast").unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	21 let store_type = ast_module.get(py, "Store").unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	22 let load_type = ast_module.get(py, "Load").unwrap();
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	23 let del_type = ast_module.get(py, "Del").unwrap();
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	24
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	25 let ctx = object.getattr(py, "ctx").unwrap();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	26 if is_instance(&ctx, &store_type) {
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	27 expr_context::Store
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	28 } else if is_instance(&ctx, &load_type) {
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	29 expr_context::Load
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	30 } else if is_instance(&ctx, &del_type) {
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	31 expr_context::Del
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	32 } else{
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	33 unreachable!();
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	34 }
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	35 }
51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	36
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	37 fn parse_list<T, F: Fn(Python, PyObject) -> T>(py: Python, list: PyObject, parse: F) -> Vec<T> {
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	38 let mut exprs = vec!();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	39 for item in list.iter(py).unwrap() {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	40 let item = item.unwrap();
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	41 let item = parse(py, item);
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	42 exprs.push(item);
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	43 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	44 exprs
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	45 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	46
44 5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	47 fn parse_alias(py: Python, ast: PyObject) -> alias {
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	48 let ast_alias = get_str(py, ast.getattr(py, "name").unwrap());
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	49 let asname = ast.getattr(py, "asname").unwrap();
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	50 if asname == py.None() {
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	51 alias{name: ast_alias, asname: None}
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	52 } else {
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	53 alias{name: ast_alias, asname: Some(get_str(py, asname))}
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	54 }
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	55 }
5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	56
59 407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	57 fn parse_withitem(py: Python, ast: PyObject) -> withitem {
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	58 let context_expr = ast.getattr(py, "context_expr").unwrap();
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	59 let optional_vars = ast.getattr(py, "optional_vars").unwrap();
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	60
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	61 let context_expr = parse_expr(py, context_expr);
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	62
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	63 if optional_vars == py.None() {
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	64 withitem{context_expr: context_expr, optional_vars: None}
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	65 } else {
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	66 let optional_vars = parse_expr(py, optional_vars);
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	67 withitem{context_expr: context_expr, optional_vars: Some(optional_vars)}
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	68 }
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	69 }
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	70
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	71 fn parse_unaryop(py: Python, ast: PyObject) -> unaryop {
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	72 let builtins_module = py.import("builtins").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	73 let isinstance = builtins_module.get(py, "isinstance").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	74
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	75 let is_instance = \|object: &PyObject, type_: &PyObject\| {
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	76 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	77 };
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	78
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	79 let ast_module = py.import("ast").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	80 let ast_type = ast_module.get(py, "AST").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	81 let invert_type = ast_module.get(py, "Invert").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	82 let not_type = ast_module.get(py, "Not").unwrap();
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	83 let uadd_type = ast_module.get(py, "UAdd").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	84 let usub_type = ast_module.get(py, "USub").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	85
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	86 assert!(is_instance(&ast, &ast_type));
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	87
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	88 if is_instance(&ast, &invert_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	89 unaryop::Invert
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	90 } else if is_instance(&ast, &not_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	91 unaryop::Not
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	92 } else if is_instance(&ast, &uadd_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	93 unaryop::UAdd
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	94 } else if is_instance(&ast, &usub_type) {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	95 unaryop::USub
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	96 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	97 unreachable!()
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	98 }
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	99 }
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	100
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	101 fn parse_boolop(py: Python, ast: PyObject) -> boolop {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	102 let builtins_module = py.import("builtins").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	103 let isinstance = builtins_module.get(py, "isinstance").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	104
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	105 let is_instance = \|object: &PyObject, type_: &PyObject\| {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	106 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	107 };
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	108
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	109 let ast_module = py.import("ast").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	110 let ast_type = ast_module.get(py, "AST").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	111 let and_type = ast_module.get(py, "And").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	112 let or_type = ast_module.get(py, "Or").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	113
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	114 assert!(is_instance(&ast, &ast_type));
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	115
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	116 if is_instance(&ast, &and_type) {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	117 boolop::And
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	118 } else if is_instance(&ast, &or_type) {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	119 boolop::Or
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	120 } else {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	121 unreachable!()
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	122 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	123 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	124
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	125 fn parse_cmpop(py: Python, ast: PyObject) -> cmpop {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	126 let builtins_module = py.import("builtins").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	127 let isinstance = builtins_module.get(py, "isinstance").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	128
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	129 let is_instance = \|object: &PyObject, type_: &PyObject\| {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	130 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	131 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	132
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	133 let ast_module = py.import("ast").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	134 let ast_type = ast_module.get(py, "AST").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	135 let eq_type = ast_module.get(py, "Eq").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	136 let noteq_type = ast_module.get(py, "NotEq").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	137 let lt_type = ast_module.get(py, "Lt").unwrap();
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	138 let lte_type = ast_module.get(py, "LtE").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	139 let gt_type = ast_module.get(py, "Gt").unwrap();
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	140 let gte_type = ast_module.get(py, "GtE").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	141 let is_type = ast_module.get(py, "Is").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	142 let is_not_type = ast_module.get(py, "IsNot").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	143 let in_type = ast_module.get(py, "In").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	144 let not_in_type = ast_module.get(py, "NotIn").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	145
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	146 assert!(is_instance(&ast, &ast_type));
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	147
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	148 if is_instance(&ast, &eq_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	149 cmpop::Eq
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	150 } else if is_instance(&ast, &noteq_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	151 cmpop::NotEq
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	152 } else if is_instance(&ast, &lt_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	153 cmpop::Lt
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	154 } else if is_instance(&ast, &lte_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	155 cmpop::LtE
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	156 } else if is_instance(&ast, &gt_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	157 cmpop::Gt
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	158 } else if is_instance(&ast, &gte_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	159 cmpop::GtE
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	160 } else if is_instance(&ast, &is_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	161 cmpop::Is
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	162 } else if is_instance(&ast, &is_not_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	163 cmpop::IsNot
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	164 } else if is_instance(&ast, &in_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	165 cmpop::In
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	166 } else if is_instance(&ast, &not_in_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	167 cmpop::NotIn
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	168 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	169 unreachable!()
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	170 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	171 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	172
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	173 fn parse_comprehension(py: Python, ast: PyObject) -> comprehension {
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	174 let target = ast.getattr(py, "target").unwrap();
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	175 let iter = ast.getattr(py, "iter").unwrap();
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	176 let ifs = ast.getattr(py, "ifs").unwrap();
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	177
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	178 let target = parse_expr(py, target);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	179 let iter = parse_expr(py, iter);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	180 let ifs = parse_list(py, ifs, parse_expr);
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	181
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	182 comprehension {target: target, iter: iter, ifs: ifs}
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	183 }
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	184
53 1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	185 fn parse_keyword(py: Python, ast: PyObject) -> keyword {
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	186 let arg = ast.getattr(py, "arg").unwrap();
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	187 let value = ast.getattr(py, "value").unwrap();
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	188
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	189 let arg = if arg == py.None() {
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	190 None
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	191 } else {
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	192 let arg = get_str(py, arg);
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	193 Some(arg)
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	194 };
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	195 let value = parse_expr(py, value);
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	196
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	197 keyword {arg: arg, value: value}
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	198 }
1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	199
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	200 fn parse_operator(py: Python, ast: PyObject) -> operator {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	201 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	202 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	203
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	204 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	205 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	206 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	207
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	208 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	209 let ast_type = ast_module.get(py, "AST").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	210 let add_type = ast_module.get(py, "Add").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	211 let sub_type = ast_module.get(py, "Sub").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	212 let mult_type = ast_module.get(py, "Mult").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	213 let matmult_type = ast_module.get(py, "MatMult").unwrap();
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	214 let div_type = ast_module.get(py, "Div").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	215 let mod_type = ast_module.get(py, "Mod").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	216 let pow_type = ast_module.get(py, "Pow").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	217 let lshift_type = ast_module.get(py, "LShift").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	218 let rshift_type = ast_module.get(py, "RShift").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	219 let bitor_type = ast_module.get(py, "BitOr").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	220 let bitxor_type = ast_module.get(py, "BitXor").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	221 let bitand_type = ast_module.get(py, "BitAnd").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	222 let floordiv_type = ast_module.get(py, "FloorDiv").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	223
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	224 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	225
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	226 if is_instance(&ast, &add_type) {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	227 operator::Add
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	228 } else if is_instance(&ast, &sub_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	229 operator::Sub
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	230 } else if is_instance(&ast, &mult_type) {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	231 operator::Mult
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	232 } else if is_instance(&ast, &matmult_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	233 operator::MatMult
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	234 } else if is_instance(&ast, &div_type) {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	235 operator::Div
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	236 } else if is_instance(&ast, &mod_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	237 operator::Mod
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	238 } else if is_instance(&ast, &pow_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	239 operator::Pow
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	240 } else if is_instance(&ast, &lshift_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	241 operator::LShift
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	242 } else if is_instance(&ast, &rshift_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	243 operator::RShift
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	244 } else if is_instance(&ast, &bitor_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	245 operator::BitOr
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	246 } else if is_instance(&ast, &bitxor_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	247 operator::BitXor
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	248 } else if is_instance(&ast, &bitand_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	249 operator::BitAnd
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	250 } else if is_instance(&ast, &floordiv_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	251 operator::FloorDiv
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	252 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	253 println!("operator {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	254 panic!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	255 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	256 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	257
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	258 fn parse_expr(py: Python, ast: PyObject) -> expr {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	259 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	260 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	261
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	262 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	263 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	264 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	265
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	266 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	267 let ast_type = ast_module.get(py, "AST").unwrap();
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	268 let unary_op_type = ast_module.get(py, "UnaryOp").unwrap();
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	269 let bool_op_type = ast_module.get(py, "BoolOp").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	270 let bin_op_type = ast_module.get(py, "BinOp").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	271 let name_constant_type = ast_module.get(py, "NameConstant").unwrap();
4 f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	272 let attribute_type = ast_module.get(py, "Attribute").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	273 let name_type = ast_module.get(py, "Name").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	274 let num_type = ast_module.get(py, "Num").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	275 let str_type = ast_module.get(py, "Str").unwrap();
7 680d15073f55 Add ast.List literal. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6 diff changeset	276 let list_type = ast_module.get(py, "List").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	277 let compare_type = ast_module.get(py, "Compare").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	278 let call_type = ast_module.get(py, "Call").unwrap();
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	279 let listcomp_type = ast_module.get(py, "ListComp").unwrap();
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	280 let dictcomp_type = ast_module.get(py, "DictComp").unwrap();
17 f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	281 let tuple_type = ast_module.get(py, "Tuple").unwrap();
52 d9838e8b3ec5 Add ast.Ellipsis. Bastien Orivel <eijebong@bananium.fr> parents: 51 diff changeset	282 let ellipsis_type = ast_module.get(py, "Ellipsis").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	283
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	284 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	285
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	286 if is_instance(&ast, &attribute_type) {
4 f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	287 let value = ast.getattr(py, "value").unwrap();
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	288 let attr = ast.getattr(py, "attr").unwrap();
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	289
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	290 let value = parse_expr(py, value);
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	291 let attr = get_str(py, attr);
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	292
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	293 expr::Attribute(Box::new(value), attr, get_ctx(py, ast))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	294 } else if is_instance(&ast, &name_type) {
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	295 let id = ast.getattr(py, "id").unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	296 let id = get_str(py, id);
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	297 expr::Name(id, get_ctx(py, ast))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	298 } else if is_instance(&ast, &name_constant_type) {
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	299 let value = ast.getattr(py, "value").unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	300 let value = get_str(py, value);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	301 expr::NameConstant(value)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	302 } else if is_instance(&ast, &num_type) {
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	303 let n = ast.getattr(py, "n").unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	304 let n = get_str(py, n);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	305 expr::Num(n)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	306 } else if is_instance(&ast, &str_type) {
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	307 let s = ast.getattr(py, "s").unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	308 let s = get_str(py, s);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	309 expr::Str(s)
7 680d15073f55 Add ast.List literal. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6 diff changeset	310 } else if is_instance(&ast, &list_type) {
680d15073f55 Add ast.List literal. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6 diff changeset	311 let elts = ast.getattr(py, "elts").unwrap();
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	312 let elements = parse_list(py, elts, parse_expr);
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	313 expr::List(elements, get_ctx(py, ast))
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	314 } else if is_instance(&ast, &unary_op_type) {
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	315 let op = ast.getattr(py, "op").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	316 let operand = ast.getattr(py, "operand").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	317
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	318 let op = parse_unaryop(py, op);
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	319 let operand = parse_expr(py, operand);
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	320
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	321 expr::UnaryOp(op, Box::new(operand))
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	322 } else if is_instance(&ast, &bool_op_type) {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	323 let op = ast.getattr(py, "op").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	324 let values = ast.getattr(py, "values").unwrap();
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	325
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	326 let op = parse_boolop(py, op);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	327 let values = parse_list(py, values, parse_expr);
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	328
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	329 expr::BoolOp(op, values)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	330 } else if is_instance(&ast, &bin_op_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	331 let left = ast.getattr(py, "left").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	332 let op = ast.getattr(py, "op").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	333 let right = ast.getattr(py, "right").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	334
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	335 let left = parse_expr(py, left);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	336 let op = parse_operator(py, op);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	337 let right = parse_expr(py, right);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	338
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	339 expr::BinOp(Box::new(left), op, Box::new(right))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	340 } else if is_instance(&ast, &call_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	341 let func = ast.getattr(py, "func").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	342 let args = ast.getattr(py, "args").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	343 let keywords = ast.getattr(py, "keywords").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	344
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	345 let func = parse_expr(py, func);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	346 let args = parse_list(py, args, parse_expr);
53 1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	347 let keywords = parse_list(py, keywords, parse_keyword);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	348
53 1a815946c2e5 Implement keywords in expr::Call, and add some tests. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 52 diff changeset	349 expr::Call(Box::new(func), args, keywords)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	350 } else if is_instance(&ast, &compare_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	351 let left = ast.getattr(py, "left").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	352 let ops = ast.getattr(py, "ops").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	353 let comparators = ast.getattr(py, "comparators").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	354
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	355 let left = parse_expr(py, left);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	356 let ops = parse_list(py, ops, parse_cmpop);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	357 let comparators = parse_list(py, comparators, parse_expr);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	358
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	359 expr::Compare(Box::new(left), ops, comparators)
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	360 } else if is_instance(&ast, &listcomp_type) {
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	361 let elt = ast.getattr(py, "elt").unwrap();
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	362 let generators = ast.getattr(py, "generators").unwrap();
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	363
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	364 let elt = parse_expr(py, elt);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	365 let generators = parse_list(py, generators, parse_comprehension);
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	366
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	367 expr::ListComp(Box::new(elt), generators)
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	368 } else if is_instance(&ast, &dictcomp_type) {
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	369 let key = ast.getattr(py, "key").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	370 let value = ast.getattr(py, "value").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	371 let generators = ast.getattr(py, "generators").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	372
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	373 let key = parse_expr(py, key);
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	374 let value = parse_expr(py, value);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	375 let generators = parse_list(py, generators, parse_comprehension);
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	376
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	377 expr::DictComp(Box::new(key), Box::new(value), generators)
17 f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	378 } else if is_instance(&ast, &tuple_type) {
f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	379 let elts = ast.getattr(py, "elts").unwrap();
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	380 let elts = parse_list(py, elts, parse_expr);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	381 expr::Tuple(elts, get_ctx(py, ast))
52 d9838e8b3ec5 Add ast.Ellipsis. Bastien Orivel <eijebong@bananium.fr> parents: 51 diff changeset	382 } else if is_instance(&ast, &ellipsis_type) {
d9838e8b3ec5 Add ast.Ellipsis. Bastien Orivel <eijebong@bananium.fr> parents: 51 diff changeset	383 expr::Ellipsis
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	384 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	385 println!("expr {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	386 unreachable!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	387 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	388 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	389
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	390 fn parse_arg(py: Python, ast: PyObject) -> arg {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	391 let arg = ast.getattr(py, "arg").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	392 let annotation = ast.getattr(py, "annotation").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	393
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	394 let arg = get_str(py, arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	395 let annotation = if annotation == py.None() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	396 None
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	397 } else {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	398 Some(parse_expr(py, annotation))
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	399 };
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	400
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	401 arg{arg: arg, annotation: annotation}
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	402 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	403
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	404 fn parse_arguments(py: Python, ast: PyObject) -> arguments {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	405 let builtins_module = py.import("builtins").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	406 let isinstance = builtins_module.get(py, "isinstance").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	407
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	408 let is_instance = \|object: &PyObject, type_: &PyObject\| {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	409 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	410 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	411
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	412 let ast_module = py.import("ast").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	413 let ast_type = ast_module.get(py, "AST").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	414 let arguments_type = ast_module.get(py, "arguments").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	415 let arg_type = ast_module.get(py, "arg").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	416
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	417 assert!(is_instance(&ast, &ast_type));
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	418
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	419 if is_instance(&ast, &arguments_type) {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	420 let args = arguments{
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	421 //args: Vec<arg>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	422 args: {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	423 let args = ast.getattr(py, "args").unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	424 let mut arguments = vec!();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	425 for arg in args.iter(py).unwrap() {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	426 let arg = arg.unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	427 assert!(is_instance(&arg, &arg_type));
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	428 let arg = parse_arg(py, arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	429 arguments.push(arg);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	430 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	431 arguments
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	432 },
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	433 //vararg: Option<arg>,
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	434 vararg: {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	435 let vararg = ast.getattr(py, "vararg").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	436 if vararg == py.None() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	437 None
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	438 } else {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	439 let arg = parse_arg(py, vararg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	440 Some(arg)
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	441 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	442 },
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	443 //kwonlyargs: Vec<arg>,
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	444 kwonlyargs: {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	445 let kwonlyargs = ast.getattr(py, "kwonlyargs").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	446 let mut arguments = vec!();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	447 for arg in kwonlyargs.iter(py).unwrap() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	448 let arg = arg.unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	449 assert!(is_instance(&arg, &arg_type));
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	450 let arg = parse_arg(py, arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	451 arguments.push(arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	452 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	453 arguments
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	454 },
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	455 //kw_defaults: Vec<Option<expr>>,
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	456 kw_defaults: {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	457 let kw_defaults = ast.getattr(py, "kw_defaults").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	458 let mut arguments = vec!();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	459 for arg in kw_defaults.iter(py).unwrap() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	460 let arg = arg.unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	461 let arg = if arg == py.None() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	462 None
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	463 } else {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	464 Some(parse_expr(py, arg))
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	465 };
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	466 arguments.push(arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	467 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	468 arguments
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	469 },
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	470 //kwarg: Option<arg>,
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	471 kwarg: {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	472 let kwarg = ast.getattr(py, "kwarg").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	473 if kwarg == py.None() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	474 None
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	475 } else {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	476 let arg = parse_arg(py, kwarg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	477 Some(arg)
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	478 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	479 },
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	480 //defaults: Vec<expr>
56 c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	481 defaults: {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	482 let defaults = ast.getattr(py, "defaults").unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	483 let mut arguments = vec!();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	484 for arg in defaults.iter(py).unwrap() {
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	485 let arg = arg.unwrap();
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	486 let arg = parse_expr(py, arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	487 arguments.push(arg);
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	488 }
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	489 arguments
c3cc16b933d2 Implement function arguments of all kinds. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 53 diff changeset	490 }
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	491 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	492 args
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	493 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	494 println!("arguments {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	495 panic!()
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	496 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	497 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	498
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	499 fn parse_statement(py: Python, ast: PyObject) -> stmt {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	500 //stmt::FunctionDef(expr::Name("function".to_string()), vec!(expr::Name("a".to_string()), expr::Name("b".to_string())), vec!())
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	501 //stmt::If(expr::BinOp(BinOp::BinEq, Box::new(expr::Name("__name__".to_string())), Box::new(expr::Str("__main__".to_string()))), vec!(stmt::Expr(expr::Call(Box::new(expr::Name("function".to_string())), vec!(expr::Num(1), expr::Num(2))))))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	502
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	503 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	504 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	505
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	506 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	507 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	508 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	509
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	510 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	511 let ast_type = ast_module.get(py, "AST").unwrap();
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	512 let class_def_type = ast_module.get(py, "ClassDef").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	513 let function_def_type = ast_module.get(py, "FunctionDef").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	514 let global_type = ast_module.get(py, "Global").unwrap();
51 ded1907b7a69 Add ast.Nonlocal. Bastien Orivel <eijebong@bananium.fr> parents: 50 diff changeset	515 let nonlocal_type = ast_module.get(py, "Nonlocal").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	516 let assign_type = ast_module.get(py, "Assign").unwrap();
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	517 let aug_assign_type = ast_module.get(py, "AugAssign").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	518 let return_type = ast_module.get(py, "Return").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	519 let import_from_type = ast_module.get(py, "ImportFrom").unwrap();
47 38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	520 let import_type = ast_module.get(py, "Import").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	521 let if_type = ast_module.get(py, "If").unwrap();
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	522 let while_type = ast_module.get(py, "While").unwrap();
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	523 let for_type = ast_module.get(py, "For").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	524 let expr_type = ast_module.get(py, "Expr").unwrap();
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	525 let break_type = ast_module.get(py, "Break").unwrap();
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	526 let delete_type = ast_module.get(py, "Delete").unwrap();
49 141f1769e1f0 Add ast.Pass. Bastien Orivel <eijebong@bananium.fr> parents: 48 diff changeset	527 let pass_type = ast_module.get(py, "Pass").unwrap();
50 5edbc24b625f Add ast.Continue. Bastien Orivel <eijebong@bananium.fr> parents: 49 diff changeset	528 let continue_type = ast_module.get(py, "Continue").unwrap();
57 e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	529 let assert_type = ast_module.get(py, "Assert").unwrap();
59 407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	530 let with_type = ast_module.get(py, "With").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	531
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	532 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	533
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	534 /*
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	535 // TODO: implement Hash for PyObject. (trivial)
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	536 let map = {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	537 let fields = ast.getattr(py, "_fields").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	538 let mut map = HashMap::new();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	539 for field in fields.iter(py).unwrap() {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	540 let field = field.unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	541 let value = ast.getattr(py, field).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	542 map.insert(field, value);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	543 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	544 map
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	545 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	546 */
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	547
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	548 if is_instance(&ast, &class_def_type) {
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	549 let name = ast.getattr(py, "name").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	550 let bases = ast.getattr(py, "bases").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	551 //let keywords = ast.getattr(py, "keywords").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	552 let body = ast.getattr(py, "body").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	553 //let decorator_list = ast.getattr(py, "decorator_list").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	554
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	555 let name = get_str(py, name);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	556 let bases = parse_list(py, bases, parse_expr);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	557 let body = parse_list(py, body, parse_statement);
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	558
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	559 stmt::ClassDef(name, bases, vec!(), body, vec!())
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	560 } else if is_instance(&ast, &function_def_type) {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	561 let name = ast.getattr(py, "name").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	562 let args = ast.getattr(py, "args").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	563 let body = ast.getattr(py, "body").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	564
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	565 let name = get_str(py, name);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	566 let args = parse_arguments(py, args);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	567 let body = parse_list(py, body, parse_statement);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	568
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	569 let decorators = vec!();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	570 let returns = None;
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	571
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	572 stmt::FunctionDef(name, args, body, decorators, returns)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	573 } else if is_instance(&ast, &global_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	574 let names = ast.getattr(py, "names").unwrap();
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	575 let names = parse_list(py, names, get_str);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	576 stmt::Global(names)
51 ded1907b7a69 Add ast.Nonlocal. Bastien Orivel <eijebong@bananium.fr> parents: 50 diff changeset	577 } else if is_instance(&ast, &nonlocal_type) {
ded1907b7a69 Add ast.Nonlocal. Bastien Orivel <eijebong@bananium.fr> parents: 50 diff changeset	578 let names = ast.getattr(py, "names").unwrap();
ded1907b7a69 Add ast.Nonlocal. Bastien Orivel <eijebong@bananium.fr> parents: 50 diff changeset	579 let names = parse_list(py, names, get_str);
ded1907b7a69 Add ast.Nonlocal. Bastien Orivel <eijebong@bananium.fr> parents: 50 diff changeset	580 stmt::Nonlocal(names)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	581 } else if is_instance(&ast, &if_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	582 let test = ast.getattr(py, "test").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	583 let body = ast.getattr(py, "body").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	584 let orelse = ast.getattr(py, "orelse").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	585
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	586 let test = parse_expr(py, test);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	587 let body = parse_list(py, body, parse_statement);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	588 let orelse = parse_list(py, orelse, parse_statement);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	589
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	590 stmt::If(test, body, orelse)
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	591 } else if is_instance(&ast, &while_type) {
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	592 let test = ast.getattr(py, "test").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	593 let body = ast.getattr(py, "body").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	594 let orelse = ast.getattr(py, "orelse").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	595
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	596 let test = parse_expr(py, test);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	597 let body = parse_list(py, body, parse_statement);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	598 let orelse = parse_list(py, orelse, parse_statement);
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	599
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	600 stmt::While(test, body, orelse)
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	601 } else if is_instance(&ast, &for_type) {
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	602 let target = ast.getattr(py, "target").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	603 let iter = ast.getattr(py, "iter").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	604 let body = ast.getattr(py, "body").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	605 let orelse = ast.getattr(py, "orelse").unwrap();
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	606
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	607 let target = parse_expr(py, target);
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	608 let iter = parse_expr(py, iter);
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	609 let body = parse_list(py, body, parse_statement);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	610 let orelse = parse_list(py, orelse, parse_statement);
5 ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	611
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	612 stmt::For(target, iter, body, orelse)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	613 } else if is_instance(&ast, &assign_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	614 let targets = ast.getattr(py, "targets").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	615 let value = ast.getattr(py, "value").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	616
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	617 let targets = parse_list(py, targets, parse_expr);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	618 let value = parse_expr(py, value);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	619
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	620 stmt::Assign(targets, value)
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	621 } else if is_instance(&ast, &aug_assign_type) {
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	622 let target = ast.getattr(py, "target").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	623 let op = ast.getattr(py, "op").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	624 let value = ast.getattr(py, "value").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	625
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	626 let target = parse_expr(py, target);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	627 let op = parse_operator(py, op);
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	628 let value = parse_expr(py, value);
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	629
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	630 stmt::AugAssign(target, op, value)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	631 } else if is_instance(&ast, &import_from_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	632 let module = ast.getattr(py, "module").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	633 let names = ast.getattr(py, "names").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	634 let level = ast.getattr(py, "level").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	635
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	636 let module = get_str(py, module);
44 5f1d285471af Finish ImportFrom conversion and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 21 diff changeset	637 let names = parse_list(py, names, parse_alias);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	638
48 039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	639 if level == py.None() {
039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	640 stmt::ImportFrom(module, names, None)
039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	641 } else {
039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	642 let level = level.extract(py).unwrap();
039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	643 stmt::ImportFrom(module, names, Some(level))
039f85b187f2 Also handle relative imports. Bastien Orivel <eijebong@bananium.fr> parents: 47 diff changeset	644 }
47 38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	645 } else if is_instance(&ast, &import_type) {
38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	646 let names = ast.getattr(py, "names").unwrap();
38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	647 let names = parse_list(py, names, parse_alias);
38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	648
38f59b0efc2c Handle Import and add a test for it. Bastien Orivel <eijebong@bananium.fr> parents: 44 diff changeset	649 stmt::Import(names)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	650 } else if is_instance(&ast, &return_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	651 let value = ast.getattr(py, "value").unwrap();
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	652 if value == py.None() {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	653 stmt::Return(None)
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	654 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	655 let value = parse_expr(py, value);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	656 stmt::Return(Some(value))
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	657 }
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	658 } else if is_instance(&ast, &expr_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	659 let value = ast.getattr(py, "value").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	660 let value = parse_expr(py, value);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	661 stmt::Expr(value)
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	662 } else if is_instance(&ast, &break_type) {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	663 stmt::Break
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	664 } else if is_instance(&ast, &delete_type) {
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	665 let targets = ast.getattr(py, "targets").unwrap();
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	666 let targets = parse_list(py, targets, parse_expr);
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	667 stmt::Delete(targets)
49 141f1769e1f0 Add ast.Pass. Bastien Orivel <eijebong@bananium.fr> parents: 48 diff changeset	668 } else if is_instance(&ast, &pass_type) {
141f1769e1f0 Add ast.Pass. Bastien Orivel <eijebong@bananium.fr> parents: 48 diff changeset	669 stmt::Pass
50 5edbc24b625f Add ast.Continue. Bastien Orivel <eijebong@bananium.fr> parents: 49 diff changeset	670 } else if is_instance(&ast, &continue_type) {
5edbc24b625f Add ast.Continue. Bastien Orivel <eijebong@bananium.fr> parents: 49 diff changeset	671 stmt::Continue
57 e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	672 } else if is_instance(&ast, &assert_type) {
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	673 let test = ast.getattr(py, "test").unwrap();
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	674 let test = parse_expr(py, test);
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	675 let msg = ast.getattr(py, "msg").unwrap();
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	676
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	677 if msg == py.None() {
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	678 stmt::Assert(test, None)
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	679 } else {
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	680 let msg = parse_expr(py, msg);
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	681 stmt::Assert(test, Some(msg))
e5a808ec31c0 Add ast.Assert. Bastien Orivel <eijebong@bananium.fr> parents: 56 diff changeset	682 }
59 407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	683 } else if is_instance(&ast, &with_type) {
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	684 let items = ast.getattr(py, "items").unwrap();
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	685 let body = ast.getattr(py, "body").unwrap();
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	686
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	687 let items = parse_list(py, items, parse_withitem);
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	688 let body = parse_list(py, body, parse_statement);
407b3b217928 Add ast.With. Bastien Orivel <eijebong@bananium.fr> parents: 57 diff changeset	689 stmt::With(items, body)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	690 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	691 println!("stmt {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	692 panic!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	693 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	694 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	695
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	696 #[allow(dead_code)]
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	697 pub fn convert_ast(name: String, module: &PyObject) -> Module {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	698 let gil = Python::acquire_gil();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	699 let py = gil.python();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	700
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	701 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	702 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	703
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	704 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	705 let module_type = ast_module.get(py, "Module").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	706
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	707 assert!(isinstance.call(py, (module, module_type), None).unwrap().is_true(py).unwrap());
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	708
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	709 let body = module.getattr(py, "body").unwrap();
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	710 let body = parse_list(py, body, parse_statement);
ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	711 Module{name: name, statements: body}
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	712 }

Mercurial > python-compiler.rs

annotate src/ast_convert.rs @ 59:407b3b217928