diff Parser/Python.asdl @ 40529:54cd47788811

PEP 3107 - Function Annotations thanks to Tony Lownds
author Neal Norwitz <nnorwitz@gmail.com>
date Thu, 28 Dec 2006 06:47:50 +0000
parents 1cce0526d9b0
children 4bab65fcca8e
line wrap: on
line diff
--- a/Parser/Python.asdl	Thu Dec 28 04:47:50 2006 +0000
+++ b/Parser/Python.asdl	Thu Dec 28 06:47:50 2006 +0000
@@ -10,7 +10,7 @@
 	    | Suite(stmt* body)
 
 	stmt = FunctionDef(identifier name, arguments args, 
-                           stmt* body, expr* decorators)
+                           stmt* body, expr* decorators, expr? returns)
 	      | ClassDef(identifier name, expr* bases, stmt* body)
 	      | Return(expr? value)
 
@@ -100,8 +100,12 @@
 	excepthandler = (expr? type, expr? name, stmt* body, int lineno,
 	                 int col_offset)
 
-	arguments = (expr* args, identifier? vararg, expr* kwonlyargs,
-		         identifier? kwarg, expr* defaults, expr* kw_defaults)
+	arguments = (arg* args, identifier? vararg, expr? varargannotation,
+                     arg* kwonlyargs, identifier? kwarg,
+                     expr? kwargannotation, expr* defaults,
+                     expr* kw_defaults)
+	arg = SimpleArg(identifier arg, expr? annotation)
+            | NestedArgs(arg* args)
 
         -- keyword arguments supplied to call
         keyword = (identifier arg, expr value)