do block syntax: tuple arguments (#19)

Author: fonsp

src/julia.grammar

@@ -216,7 +216,7 @@ array {
 }
 
 
-DoClause[group=CompoundStatement]{ kw<'do'> Parameters { sep1<',', Identifier | operation<expr>>? } _t block? end }
+DoClause[group=CompoundStatement]{ kw<'do'> Parameters { sep1<',', Identifier | TupleExpression | operation<expr>>? } _t block? end }
 
 CallExpression {
   (primary-expr (immediateDot '.')? | Operator)

test/definitions.txt

@@ -419,6 +419,29 @@ Program(
 )
 
 
+# Function definitions - exploded parameters
+
+function f((x,(y1,y2)), (u,v)=2)
+  x, y
+end
+
+==>
+Program(
+  FunctionDefinition(
+    function,
+    Signature(
+      CallExpression(Identifier, Arguments(
+        TupleExpression(Identifier,TupleExpression(Identifier,Identifier)), 
+        KwArg(TupleExpression(Identifier,Identifier), AssignmentOp, IntegerLiteral),
+      ))
+    ),
+    OpenTuple(Identifier, Identifier),
+    end
+  )
+)
+
+
+
 # Function definitions - keyword parameters
 
 function a(; x, y) end

test/macros.txt

@@ -169,7 +169,12 @@ Program(
 
 # Closed macro call expressions - Do blocks
 
-@test() do x, y
+
+@test() do x
+  xs
+end
+
+@test() do x, (y,z)
   body
 end
 
@@ -181,11 +186,22 @@ Program(
     Arguments,
     DoClause(
       do,
-      Parameters(Identifier, Identifier),
+      Parameters(Identifier),
       Identifier,
       end
     )
-  )
+  ),
+  
+  MacrocallExpression(
+    MacroIdentifier(Identifier),
+    Arguments,
+    DoClause(
+      do,
+      Parameters(Identifier, TupleExpression(Identifier,Identifier)),
+      Identifier,
+      end
+    )
+  ),
 )
 
 

test/primary.txt

@@ -244,7 +244,7 @@ Program(
 
 # Function call expressions with do blocks
 
-reduce(xs) do x, y
+reduce(xs) do x, (y,(z,w))
   f(x, y)
 end
 
@@ -255,7 +255,9 @@ Program(
     Arguments(Identifier),
     DoClause(
       do,
-      Parameters(Identifier, Identifier),
+      Parameters(Identifier, 
+        TupleExpression(Identifier, TupleExpression(Identifier, Identifier)),
+      ),
       CallExpression(
         Identifier,
         Arguments(Identifier, Identifier),
@@ -302,6 +304,29 @@ Program(
 )
 
 
+# Function call expressions with do blocks - typed and exploded parameter
+
+f(xs) do (x,y)::Int; end
+
+==>
+Program(
+  CallExpression(
+    Identifier,
+    Arguments(Identifier),
+    DoClause(
+      do,
+      Parameters(
+        BinaryExpression(
+          TupleExpression(Identifier, Identifier),
+          Type(Identifier),
+        )
+      ),
+      end
+    )
+  )
+)
+
+
 # Quote expressions and symbols
 
 :foo