allow whitespace around function argument declaration, fixes #227

Author: leafo

moonscript/parse.lua

@@ -187,8 +187,8 @@ local build_grammar = wrap_env(debug_grammar, function(root)
     KeyValue = (sym(":") * -SomeSpace * Name * lpeg.Cp()) / self_assign + Ct((KeyName + sym("[") * Exp * sym("]") + Space * DoubleString + Space * SingleString) * symx(":") * (Exp + TableBlock + SpaceBreak ^ 1 * Exp)),
     KeyValueList = KeyValue * (sym(",") * KeyValue) ^ 0,
     KeyValueLine = CheckIndent * KeyValueList * sym(",") ^ -1,
-    FnArgsDef = sym("(") * Ct(FnArgDefList ^ -1) * (key("using") * Ct(NameList + Space * "nil") + Ct("")) * sym(")") + Ct("") * Ct(""),
-    FnArgDefList = FnArgDef * (sym(",") * FnArgDef) ^ 0 * (sym(",") * Ct(VarArg)) ^ 0 + Ct(VarArg),
+    FnArgsDef = sym("(") * White * Ct(FnArgDefList ^ -1) * (key("using") * Ct(NameList + Space * "nil") + Ct("")) * White * sym(")") + Ct("") * Ct(""),
+    FnArgDefList = FnArgDef * (sym(",") * White * FnArgDef) ^ 0 * (sym(",") * White * Ct(VarArg)) ^ 0 + Ct(VarArg),
     FnArgDef = Ct((Name + SelfName) * (sym("=") * Exp) ^ -1),
     FunLit = FnArgsDef * (sym("->") * Cc("slim") + sym("=>") * Cc("fat")) * (Body + Ct("")) / mark("fndef"),
     NameList = Name * (sym(",") * Name) ^ 0,

moonscript/parse.moon

@@ -292,11 +292,11 @@ build_grammar = wrap_env debug_grammar, (root) ->
     KeyValueList: KeyValue * (sym"," * KeyValue)^0
     KeyValueLine: CheckIndent * KeyValueList * sym","^-1
 
-    FnArgsDef: sym"(" * Ct(FnArgDefList^-1) *
+    FnArgsDef: sym"(" * White * Ct(FnArgDefList^-1) *
       (key"using" * Ct(NameList + Space * "nil") + Ct"") *
-      sym")" + Ct"" * Ct""
+      White * sym")" + Ct"" * Ct""
 
-    FnArgDefList: FnArgDef * (sym"," * FnArgDef)^0 * (sym"," * Ct(VarArg))^0 + Ct(VarArg)
+    FnArgDefList: FnArgDef * (sym"," * White * FnArgDef)^0 * (sym"," * White * Ct(VarArg))^0 + Ct(VarArg)
     FnArgDef: Ct((Name + SelfName) * (sym"=" * Exp)^-1)
 
     FunLit: FnArgsDef *

spec/inputs/funcs.moon

@@ -95,5 +95,26 @@ f(
 
 --
 
+x = (a,
+  b) ->
+    print "what"
+
+
+y = (a="hi",
+  b=23) ->
+    print "what"
+
+z = (
+  a="hi",
+  b=23) ->
+    print "what"
+
+
+j = (f,g,m,
+  a="hi",
+  b=23
+) ->
+    print "what"
+
 
 nil

spec/outputs/funcs.lua

@@ -125,4 +125,37 @@ end)(), 10, 20)
 f()()(what)(function()
   return print("srue")
 end, 123)
+x = function(a, b)
+  return print("what")
+end
+local y
+y = function(a, b)
+  if a == nil then
+    a = "hi"
+  end
+  if b == nil then
+    b = 23
+  end
+  return print("what")
+end
+local z
+z = function(a, b)
+  if a == nil then
+    a = "hi"
+  end
+  if b == nil then
+    b = 23
+  end
+  return print("what")
+end
+local j
+j = function(f, g, m, a, b)
+  if a == nil then
+    a = "hi"
+  end
+  if b == nil then
+    b = 23
+  end
+  return print("what")
+end
 return nil