From ca7bf3be8b5641716b9c9e75b0fdca9ca308c0e0 Mon Sep 17 00:00:00 2001
From: Jasper Jenkins <jasper.vs.jenkins@gmail.com>
Date: Wed, 11 Sep 2019 23:19:53 -0700
Subject: no commas for empty importcpp splat params (#12183)

---
 compiler/ccgcalls.nim | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'compiler')

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 {'+', '@'}:
-- 
cgit 1.4.1-2-gfad0

ahoang@tilde.institute&gt;</td></tr></table>
<table class='tabs'><tr><td>
<a href='/ahoang/Nim/?h=devel'>summary</a> <a href='/ahoang/Nim/refs/?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>refs</a> <a href='/ahoang/Nim/log/tests/js/t8231.nim?h=devel'>log</a> <a class='active' href='/ahoang/Nim/tree/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>tree</a> <a href='/ahoang/Nim/commit/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>commit</a> <a href='/ahoang/Nim/diff/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>diff</a> <a href='/ahoang/Nim/stats/tests/js/t8231.nim?h=devel'>stats</a></td><td class='form'><form class='right' method='get' action='/ahoang/Nim/log/tests/js/t8231.nim'>
<input type='hidden' name='h' value='devel'/><input type='hidden' name='id' value='d6a71a10671b66ee4f5be09f99234b3d834e7fce'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/ahoang/Nim/tree/?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>root</a>/<a href='/ahoang/Nim/tree/tests?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>tests</a>/<a href='/ahoang/Nim/tree/tests/js?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>js</a>/<a href='/ahoang/Nim/tree/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>t8231.nim</a></div><div class='content'>blob: b0625a621900692215505a43169fa0496a9a63c5 (<a href='/ahoang/Nim/plain/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>plain</a>) (<a href='/ahoang/Nim/blame/tests/js/t8231.nim?h=devel&amp;id=d6a71a10671b66ee4f5be09f99234b3d834e7fce'>blame</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
</pre></td>
<td class='lines'><pre><code>