fixes #2068

compiler/ccgcalls.nim

@@ -430,15 +430,27 @@ proc genNamedParamCall(p: BProc, ri: PNode, d: var TLoc) =
   assert(typ.kind == tyProc)
   var length = sonsLen(ri)
   assert(sonsLen(typ) == sonsLen(typ.n))
-  
+
-  if length > 1:
+  # don't call 'ropeToStr' here for efficiency:
-    app(pl, genArg(p, ri.sons[1], typ.n.sons[1].sym, ri))
+  let pat = ri.sons[0].sym.loc.r.data
-    app(pl, ~" ")
+  internalAssert pat != nil
-  app(pl, op.r)
+  var start = 3
-  if length > 2:
+  if ' ' in pat:
-    app(pl, ~": ")
+    start = 1
-    app(pl, genArg(p, ri.sons[2], typ.n.sons[2].sym, ri))
+    app(pl, op.r)
-  for i in countup(3, length-1):
+    if length > 1:
+      app(pl, ~": ")
+      app(pl, genArg(p, ri.sons[1], typ.n.sons[1].sym, ri))
+      start = 2
+  else:
+    if length > 1:
+      app(pl, genArg(p, ri.sons[1], typ.n.sons[1].sym, ri))
+      app(pl, ~" ")
+    app(pl, op.r)
+    if length > 2:
+      app(pl, ~": ")
+      app(pl, genArg(p, ri.sons[2], typ.n.sons[2].sym, ri))
+  for i in countup(start, length-1):
     assert(sonsLen(typ) == sonsLen(typ.n))
     if i >= sonsLen(typ):
       internalError(ri.info, "varargs for objective C method?")

todo.txt

@@ -4,6 +4,7 @@ version 0.10.4
 - improve GC-unsafety warnings
 - make 'nil' work for 'add' and 'len'
 - get rid of 'mget'; aka priority of 'var' needs to be 'var{lvalue}'
+- 'result' shadowing warning
 
 
 version 1.0