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

annotate src/ast_convert.rs @ 21:7af637f444d1

Add ast.Delete

author	Bastien Orivel <eijebong@bananium.fr>
date	Fri, 03 Jun 2016 10:52:02 +0200
parents	ace12d6b9855
children	5f1d285471af

rev	line source
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	1 use python_ast::{Module, stmt, expr, expr_context, cmpop, boolop, operator, unaryop, arguments, arg, alias, comprehension};
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
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	47 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	48 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	49 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	50
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	51 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	52 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	53 };
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	54
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	55 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	56 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	57 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	58 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	59 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	60 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	61
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	62 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	63
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	64 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	65 unaryop::Invert
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	66 } 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	67 unaryop::Not
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	68 } 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	69 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	70 } 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	71 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	72 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	73 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	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 }
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	76
19 0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	77 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	78 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	79 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	80
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	81 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	82 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	83 };
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	84
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	85 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	86 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	87 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	88 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	89
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	90 assert!(is_instance(&ast, &ast_type));
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	91
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	92 if is_instance(&ast, &and_type) {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	93 boolop::And
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	94 } 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	95 boolop::Or
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	96 } else {
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	97 unreachable!()
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	98 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	99 }
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	100
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	101 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	102 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	103 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	104
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	105 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	106 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	107 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	108
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	109 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	110 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	111 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	112 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	113 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	114 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	115 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	116 let gte_type = ast_module.get(py, "GtE").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	117 let is_type = ast_module.get(py, "Is").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	118 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	119 let in_type = ast_module.get(py, "In").unwrap();
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	120 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	121
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	122 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	123
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	124 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	125 cmpop::Eq
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	126 } 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	127 cmpop::NotEq
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	128 } 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	129 cmpop::Lt
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	130 } else if is_instance(&ast, &lte_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	131 cmpop::LtE
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	132 } 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	133 cmpop::Gt
15 a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	134 } else if is_instance(&ast, &gte_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	135 cmpop::GtE
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	136 } else if is_instance(&ast, &is_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	137 cmpop::Is
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	138 } else if is_instance(&ast, &is_not_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	139 cmpop::IsNot
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	140 } else if is_instance(&ast, &in_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	141 cmpop::In
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	142 } else if is_instance(&ast, &not_in_type) {
a0fb169fe0f9 Add forgotten cmpop values. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 14 diff changeset	143 cmpop::NotIn
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	144 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	145 unreachable!()
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	146 }
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
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	149 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	150 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	151 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	152 let ifs = ast.getattr(py, "ifs").unwrap();
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	153
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	154 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	155 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	156 let ifs = parse_list(py, ifs, parse_expr);
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	157
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	158 comprehension {target: target, iter: iter, ifs: ifs}
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	159 }
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	160
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	161 fn parse_operator(py: Python, ast: PyObject) -> operator {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	162 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	163 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	164
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	165 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	166 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	167 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	168
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	169 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	170 let ast_type = ast_module.get(py, "AST").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	171 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	172 let sub_type = ast_module.get(py, "Sub").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	173 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	174 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	175 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	176 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	177 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	178 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	179 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	180 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	181 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	182 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	183 let floordiv_type = ast_module.get(py, "FloorDiv").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	184
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	185 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	186
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	187 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	188 operator::Add
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	189 } 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	190 operator::Sub
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	191 } 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	192 operator::Mult
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	193 } 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	194 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	195 } 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	196 operator::Div
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	197 } 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	198 operator::Mod
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	199 } 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	200 operator::Pow
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	201 } 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	202 operator::LShift
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	203 } 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	204 operator::RShift
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	205 } 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	206 operator::BitOr
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	207 } 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	208 operator::BitXor
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	209 } 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	210 operator::BitAnd
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	211 } 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	212 operator::FloorDiv
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	213 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	214 println!("operator {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	215 panic!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	216 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	217 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	218
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	219 fn parse_expr(py: Python, ast: PyObject) -> expr {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	220 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	221 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	222
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	223 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	224 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
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
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	227 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	228 let ast_type = ast_module.get(py, "AST").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	229 let arg_type = ast_module.get(py, "arg").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	230 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	231 let bool_op_type = ast_module.get(py, "BoolOp").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	232 let bin_op_type = ast_module.get(py, "BinOp").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	233 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	234 let attribute_type = ast_module.get(py, "Attribute").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	235 let name_type = ast_module.get(py, "Name").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	236 let num_type = ast_module.get(py, "Num").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	237 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	238 let list_type = ast_module.get(py, "List").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	239 let compare_type = ast_module.get(py, "Compare").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	240 let call_type = ast_module.get(py, "Call").unwrap();
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	241 let listcomp_type = ast_module.get(py, "ListComp").unwrap();
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	242 let dictcomp_type = ast_module.get(py, "DictComp").unwrap();
17 f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	243 let tuple_type = ast_module.get(py, "Tuple").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	244
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	245 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	246
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	247 if is_instance(&ast, &arg_type) {
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	248 let arg = ast.getattr(py, "arg").unwrap();
b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	249 let arg = get_str(py, arg);
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	250 expr::Name(arg, get_ctx(py, ast))
4 f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	251 } else if is_instance(&ast, &attribute_type) {
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	252 let value = ast.getattr(py, "value").unwrap();
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	253 let attr = ast.getattr(py, "attr").unwrap();
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	254
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	255 let value = parse_expr(py, value);
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	256 let attr = get_str(py, attr);
f27a4aee9dfa Add ast.Attribute. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3 diff changeset	257
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	258 expr::Attribute(Box::new(value), attr, get_ctx(py, ast))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	259 } 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	260 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	261 let id = get_str(py, id);
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	262 expr::Name(id, get_ctx(py, ast))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	263 } 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	264 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	265 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	266 expr::NameConstant(value)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	267 } 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	268 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	269 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	270 expr::Num(n)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	271 } 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	272 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	273 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	274 expr::Str(s)
7 680d15073f55 Add ast.List literal. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6 diff changeset	275 } else if is_instance(&ast, &list_type) {
680d15073f55 Add ast.List literal. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6 diff changeset	276 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	277 let elements = parse_list(py, elts, parse_expr);
18 51ef651266b1 Fix expr_contexts. Bastien Orivel <eijebong@bananium.fr> parents: 17 diff changeset	278 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	279 } 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	280 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	281 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	282
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	283 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	284 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	285
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	286 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	287 } 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	288 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	289 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	290
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	291 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	292 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	293
0cb53a31ac12 Implement ast.BoolOp, and improve its display. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 18 diff changeset	294 expr::BoolOp(op, values)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	295 } else if is_instance(&ast, &bin_op_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	296 let left = ast.getattr(py, "left").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	297 let op = ast.getattr(py, "op").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	298 let right = ast.getattr(py, "right").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	299
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	300 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	301 let op = parse_operator(py, op);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	302 let right = parse_expr(py, right);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	303
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	304 expr::BinOp(Box::new(left), op, Box::new(right))
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	305 } else if is_instance(&ast, &call_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	306 let func = ast.getattr(py, "func").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	307 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	308 let keywords = ast.getattr(py, "keywords").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	309
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	310 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	311 let args = parse_list(py, args, parse_expr);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	312
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	313 /*
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	314 let mut kwargs = vec!();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	315 for arg in keywords.iter(py).unwrap() {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	316 let arg = arg.unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	317 kwargs.push(parse_expr(py, arg));
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	318 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	319 */
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	320
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	321 expr::Call(Box::new(func), args, vec!())
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	322 } else if is_instance(&ast, &compare_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	323 let left = ast.getattr(py, "left").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	324 let ops = ast.getattr(py, "ops").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	325 let comparators = ast.getattr(py, "comparators").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	326
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	327 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	328 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	329 let comparators = parse_list(py, comparators, parse_expr);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	330
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	331 expr::Compare(Box::new(left), ops, comparators)
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	332 } else if is_instance(&ast, &listcomp_type) {
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	333 let elt = ast.getattr(py, "elt").unwrap();
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	334 let generators = ast.getattr(py, "generators").unwrap();
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	335
719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	336 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	337 let generators = parse_list(py, generators, parse_comprehension);
14 719a27f1c1c7 Add ast.ListComp Bastien Orivel <eijebong@bananium.fr> parents: 13 diff changeset	338
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	339 expr::ListComp(Box::new(elt), generators)
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	340 } else if is_instance(&ast, &dictcomp_type) {
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	341 let key = ast.getattr(py, "key").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	342 let value = ast.getattr(py, "value").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	343 let generators = ast.getattr(py, "generators").unwrap();
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	344
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	345 let key = parse_expr(py, key);
b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	346 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	347 let generators = parse_list(py, generators, parse_comprehension);
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	348
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	349 expr::DictComp(Box::new(key), Box::new(value), generators)
17 f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	350 } else if is_instance(&ast, &tuple_type) {
f1c77634a2eb Add ast.Tuple Bastien Orivel <eijebong@bananium.fr> parents: 16 diff changeset	351 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	352 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	353 expr::Tuple(elts, get_ctx(py, ast))
16 b21a246349f3 Add ast.DictComp Bastien Orivel <eijebong@bananium.fr> parents: 15 diff changeset	354 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	355 println!("expr {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	356 unreachable!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	357 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	358 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	359
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	360 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	361 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	362 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	363
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	364 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	365 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	366 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	367
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	368 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	369 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	370 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	371 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	372
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	373 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	374
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	375 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	376 let args = arguments{
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	377 //args: Vec<arg>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	378 args: {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	379 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	380 let mut arguments = vec!();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	381 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	382 let arg = arg.unwrap();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	383 assert!(is_instance(&arg, &arg_type));
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	384 let arg = get_str(py, arg);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	385 arguments.push(arg{arg: arg, annotation: None});
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	386 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	387 arguments
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	388 },
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	389 //vararg: Option<arg>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	390 vararg: None,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	391 //kwonlyargs: Vec<arg>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	392 kwonlyargs: vec!(),
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	393 //kw_defaults: Vec<expr>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	394 kw_defaults: vec!(),
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	395 //kwarg: Option<arg>,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	396 kwarg: None,
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	397 //defaults: Vec<expr>
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	398 defaults: vec!()
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	399 };
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	400 args
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	401 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	402 println!("arguments {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	403 panic!()
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	404 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	405 }
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	406
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	407 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	408 //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	409 //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	410
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	411 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	412 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	413
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	414 let is_instance = \|object: &PyObject, type_: &PyObject\| {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	415 return isinstance.call(py, (object, type_), None).unwrap().is_true(py).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	416 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	417
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	418 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	419 let ast_type = ast_module.get(py, "AST").unwrap();
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	420 let class_def_type = ast_module.get(py, "ClassDef").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	421 let function_def_type = ast_module.get(py, "FunctionDef").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	422 let global_type = ast_module.get(py, "Global").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	423 let assign_type = ast_module.get(py, "Assign").unwrap();
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	424 let aug_assign_type = ast_module.get(py, "AugAssign").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	425 let return_type = ast_module.get(py, "Return").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	426 let import_from_type = ast_module.get(py, "ImportFrom").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	427 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	428 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	429 let for_type = ast_module.get(py, "For").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	430 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	431 let break_type = ast_module.get(py, "Break").unwrap();
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	432 let delete_type = ast_module.get(py, "Delete").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	433
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	434 assert!(is_instance(&ast, &ast_type));
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	435
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	436 /*
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	437 // TODO: implement Hash for PyObject. (trivial)
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	438 let map = {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	439 let fields = ast.getattr(py, "_fields").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	440 let mut map = HashMap::new();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	441 for field in fields.iter(py).unwrap() {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	442 let field = field.unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	443 let value = ast.getattr(py, field).unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	444 map.insert(field, value);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	445 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	446 map
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	447 };
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	448 */
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	449
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	450 if is_instance(&ast, &class_def_type) {
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	451 let name = ast.getattr(py, "name").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	452 let bases = ast.getattr(py, "bases").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	453 //let keywords = ast.getattr(py, "keywords").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	454 let body = ast.getattr(py, "body").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	455 //let decorator_list = ast.getattr(py, "decorator_list").unwrap();
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	456
5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	457 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	458 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	459 let body = parse_list(py, body, parse_statement);
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	460
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	461 stmt::ClassDef(name, bases, vec!(), body, vec!())
2 5fc7c2790d8c Add class support. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 1 diff changeset	462 } else if is_instance(&ast, &function_def_type) {
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	463 let name = ast.getattr(py, "name").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	464 let args = ast.getattr(py, "args").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	465 let body = ast.getattr(py, "body").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	466
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	467 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	468 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	469 let body = parse_list(py, body, parse_statement);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	470
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	471 let decorators = vec!();
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	472 let returns = None;
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	473
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	474 stmt::FunctionDef(name, args, body, decorators, returns)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	475 } else if is_instance(&ast, &global_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	476 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	477 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	478 stmt::Global(names)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	479 } else if is_instance(&ast, &if_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	480 let test = ast.getattr(py, "test").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	481 let body = ast.getattr(py, "body").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	482 let orelse = ast.getattr(py, "orelse").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	483
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	484 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	485 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	486 let orelse = parse_list(py, orelse, parse_statement);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	487
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	488 stmt::If(test, body, orelse)
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	489 } else if is_instance(&ast, &while_type) {
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	490 let test = ast.getattr(py, "test").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	491 let body = ast.getattr(py, "body").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	492 let orelse = ast.getattr(py, "orelse").unwrap();
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	493
6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	494 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	495 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	496 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	497
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	498 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	499 } 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	500 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	501 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	502 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	503 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	504
ddf372373a77 Add ast.For, ast.UnaryOp, and Sub and Div to ast.BinOp. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 4 diff changeset	505 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	506 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	507 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	508 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	509
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	510 stmt::For(target, iter, body, orelse)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	511 } else if is_instance(&ast, &assign_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	512 let targets = ast.getattr(py, "targets").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	513 let value = ast.getattr(py, "value").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	514
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	515 let targets = parse_list(py, targets, parse_expr);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	516 let value = parse_expr(py, value);
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	517
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	518 stmt::Assign(targets, value)
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	519 } else if is_instance(&ast, &aug_assign_type) {
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	520 let target = ast.getattr(py, "target").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	521 let op = ast.getattr(py, "op").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	522 let value = ast.getattr(py, "value").unwrap();
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	523
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	524 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	525 let op = parse_operator(py, op);
8 94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	526 let value = parse_expr(py, value);
94ff501bf336 Add ast.AugAssign. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7 diff changeset	527
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	528 stmt::AugAssign(target, op, value)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	529 } else if is_instance(&ast, &import_from_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	530 let module = ast.getattr(py, "module").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	531 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	532 let level = ast.getattr(py, "level").unwrap();
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	533
1 b90e49ab734b Factorise conversion of Python str into Rust String. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 0 diff changeset	534 let module = get_str(py, module);
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	535
20 ace12d6b9855 Replace every loop in ast_convert with parse_list. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 19 diff changeset	536 // TODO: move that into another function.
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	537 let mut names_ = vec!();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	538 for alias in names.iter(py).unwrap() {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	539 let alias = alias.unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	540 let alias = parse_expr(py, alias);
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	541 println!("{:?}", alias);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	542 // XXX
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	543 //names_.push(alias{name: alias, asname: alias});
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	544 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	545
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	546 stmt::ImportFrom(module, names_, None)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	547 } else if is_instance(&ast, &return_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	548 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	549 if value == py.None() {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	550 stmt::Return(None)
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	551 } else {
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	552 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	553 stmt::Return(Some(value))
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	554 }
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	555 } else if is_instance(&ast, &expr_type) {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	556 let value = ast.getattr(py, "value").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	557 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	558 stmt::Expr(value)
6 6f2bf13f4cb5 Add ast.While and ast.Break. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 5 diff changeset	559 } 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	560 stmt::Break
21 7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	561 } else if is_instance(&ast, &delete_type) {
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	562 let targets = ast.getattr(py, "targets").unwrap();
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	563 let targets = parse_list(py, targets, parse_expr);
7af637f444d1 Add ast.Delete Bastien Orivel <eijebong@bananium.fr> parents: 20 diff changeset	564 stmt::Delete(targets)
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	565 } else {
13 38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	566 println!("stmt {}", ast);
38b0d63697b1 Import the full AST grammar from CPython 3.5. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 9 diff changeset	567 panic!()
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	568 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	569 }
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	570
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	571 #[allow(dead_code)]
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	572 pub fn convert_ast(name: String, module: &PyObject) -> Module {
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	573 let gil = Python::acquire_gil();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	574 let py = gil.python();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	575
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	576 let builtins_module = py.import("builtins").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	577 let isinstance = builtins_module.get(py, "isinstance").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	578
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	579 let ast_module = py.import("ast").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	580 let module_type = ast_module.get(py, "Module").unwrap();
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	581
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	582 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	583
211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	584 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	585 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	586 Module{name: name, statements: body}
0 211b0df72e64 Hello world! Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	587 }

Mercurial > python-compiler.rs

annotate src/ast_convert.rs @ 21:7af637f444d1