Merge pull request #489 from OddCoincidence/decorator-paths

windelbouwman · web-flow · commit 1af9cc01739f · 2019-02-17T08:01:25.000+01:00
Allow attributes to be used as decorators
diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -613,17 +613,26 @@ ClassDef: ast::LocatedStatement = {
     },
 };
 
+Path: ast::Expression = {
+    <n:Identifier> => ast::Expression::Identifier { name: n },
+    <p:Path> "." <n:name> => {
+        ast::Expression::Attribute {
+            value: Box::new(p),
+            name: n,
+        }
+    },
+};
+
 // Decorators:
 Decorator: ast::Expression = {
-    "@" <n:DottedName> <a: ("(" ArgumentList ")")?> "\n" => {
-        let name = ast::Expression::Identifier { name: n };
+    "@" <p:Path> <a: ("(" ArgumentList ")")?> "\n" => {
         match a {
             Some((_, args, _)) => ast::Expression::Call {
-                function: Box::new(name),
+                function: Box::new(p),
                 args: args.0,
                 keywords: args.1,
             },
-            None => name,
+            None => p,
         }
     },
 };
diff --git a/tests/snippets/decorators.py b/tests/snippets/decorators.py
@@ -14,3 +14,15 @@ def add(a, b):
 
 assert c == 14
 
+
+def f(func): return lambda: 42
+class A: pass
+a = A()
+a.a = A()
+a.a.x = f
+
+@a.a.x
+def func():
+	pass
+
+assert func() == 42
