summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorJasper Jenkins <jasper.vs.jenkins@gmail.com>2019-09-11 23:19:53 -0700
committerAndreas Rumpf <rumpf_a@web.de>2019-09-12 08:19:53 +0200
commitca7bf3be8b5641716b9c9e75b0fdca9ca308c0e0 (patch)
tree78cc1cb3c9656acc7972564eae4cb9877a6ac92f /compiler
parent5783cd67a8eeed8597b0f5d97784c6382aa43396 (diff)
downloadNim-ca7bf3be8b5641716b9c9e75b0fdca9ca308c0e0.tar.gz
no commas for empty importcpp splat params (#12183)
Diffstat (limited to 'compiler')
-rw-r--r--compiler/ccgcalls.nim13
1 files changed, 8 insertions, 5 deletions
diff --git a/compiler/ccgcalls.nim b/compiler/ccgcalls.nim
index 84b59d632..686eb8fde 100644
--- a/compiler/ccgcalls.nim
+++ b/compiler/ccgcalls.nim
@@ -394,11 +394,14 @@ proc genPatternCall(p: BProc; ri: PNode; pat: string; typ: PType): Rope =
   while i < pat.len:
     case pat[i]
     of '@':
-      if j < ri.len:
-        result.add genOtherArg(p, ri, j, typ)
-        for k in j+1 ..< ri.len:
-          result.add(~", ")
-          result.add genOtherArg(p, ri, k, typ)
+      var first = true
+      for k in j ..< ri.len:
+        let arg = genOtherArg(p, ri, k, typ)
+        if arg.len > 0:
+          if not first:
+            result.add(~", ")
+          first = false
+          result.add arg
       inc i
     of '#':
       if i+1 < pat.len and pat[i+1] in {'+', '@'}: