Stop interfering with short closures

preprocess · Aug 16, 2017 · f6f26d2 · f6f26d2
1 parent 782364c
commit f6f26d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/macros.yay b/src/macros.yay
@@ -32,7 +32,16 @@ macro ·recursion {
             ·token("("),
             ·token(","),
             ·token("="),
-            ·operator("=>")
+            ·chain(
+                ·either(
+                    ·token(T_CONSTANT_ENCAPSED_STRING),
+                    ·token(T_LNUMBER),
+                    ·token(T_DNUMBER),
+                    ·token(T_STRING),
+                    ·token(T_VARIABLE)
+                ),
+                ·operator("=>")
+            )
         )·before,
         ·token("{"),
         ·optional(·angle_layer())·values,

diff --git a/tests/specs/collections.spec b/tests/specs/collections.spec
@@ -38,13 +38,17 @@ $d = {
 
 { $a, $b, $c } = ["a" => 1, "b" => 2, "c" => 3];
 
+() => {}
+
+["foo" => {"bar" => "baz"}]
+
 --EXPECT--
 
-((new \Pre\Collections\Collection()));
+( (new \Pre\Collections\Collection()));
 
 [ (new \Pre\Collections\Collection())];
 
-((new \Pre\Collections\Collection(["foo" => "bar"])));
+( (new \Pre\Collections\Collection(["foo" => "bar"])));
 
 [ (new \Pre\Collections\Collection(["foo" => "bar"]))];
 
@@ -71,3 +75,7 @@ $d = (new \Pre\Collections\Collection(["hello" => "world",
 ]));
 
 ['a' => $a, 'b' => $b, 'c' => $c] = ["a" => 1, "b" => 2, "c" => 3];
+
+() => {}
+
+["foo"=> (new \Pre\Collections\Collection(["bar" => "baz"]))]