changeset 63:5df52b40fe54

Implement FunctionDef.returns.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Mon, 13 Jun 2016 00:55:04 +0100
parents d255a932553f
children 53817b39f139
files src/ast_convert.rs src/ast_dump.rs tests/test_parse_files/test_functiondef.py
diffstat 3 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ast_convert.rs
+++ b/src/ast_convert.rs
@@ -564,13 +564,14 @@ fn parse_statement(py: Python, ast: PyOb
         let name = ast.getattr(py, "name").unwrap();
         let args = ast.getattr(py, "args").unwrap();
         let body = ast.getattr(py, "body").unwrap();
+        let returns = ast.getattr(py, "returns").unwrap();
 
         let name = get_str(py, name);
         let args = parse_arguments(py, args);
         let body = parse_list(py, body, parse_statement);
 
         let decorators = vec!();
-        let returns = None;
+        let returns = parse_optional_expr(py, returns);
 
         stmt::FunctionDef(name, args, body, decorators, returns)
     } else if is_instance(&ast, &global_type) {
--- a/src/ast_dump.rs
+++ b/src/ast_dump.rs
@@ -226,7 +226,18 @@ impl stmt {
         let current_indent = make_indent(indent);
         match self.clone() {
             stmt::ClassDef(name, bases, keywords, body, decorator_list) => format!("{}class {}({}):\n{}", current_indent, name, vec_to_strings_vec(bases).join(", "), statements_to_string(indent, body)),
-            stmt::FunctionDef(name, arguments, body, decorator_list, returns) => format!("{}def {}({}):\n{}", current_indent, name, arguments.to_string(), statements_to_string(indent, body)),
+            stmt::FunctionDef(name, arguments, body, decorator_list, returns) => {
+                format!("{}def {}({}){}:\n{}",
+                    current_indent,
+                    name,
+                    arguments.to_string(),
+                    match returns {
+                        None => String::new(),
+                        Some(returns) => format!(" -> {}", returns.to_string())
+                    },
+                    statements_to_string(indent, body)
+                )
+            }
             stmt::Global(names) => format!("{}global {}", current_indent, names.join(", ")),
             stmt::Nonlocal(names) => format!("{}nonlocal {}", current_indent, names.join(", ")),
             stmt::If(test, body, orelse) => format!("{}if {}:\n{}", current_indent, test.to_string(), if_else_statements_to_string(indent, body, orelse)),
--- a/tests/test_parse_files/test_functiondef.py
+++ b/tests/test_parse_files/test_functiondef.py
@@ -1,6 +1,6 @@
 def func0():
     pass
-def func1(a, b: str):
+def func1(a, b: str) -> None:
     pass
 def func2(a, *, b: composite.type, c=2, d: int=3):
     pass