From e293b90d2cefafc580692e3555a7773b906f40d4 Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <d.kolesa@samsung.com>
Date: Thu, 2 Oct 2014 15:26:15 +0100
Subject: [PATCH] elua: when combining ctor params, do not allow repeated param
 names

---
 src/bin/elua/modules/lualian.lua | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua
index 3acf76f061..0b6d2cf8b6 100644
--- a/src/bin/elua/modules/lualian.lua
+++ b/src/bin/elua/modules/lualian.lua
@@ -395,6 +395,16 @@ local Mixin = Node:clone {
     end
 }
 
+local incr_pc = function(upars, pn)
+    if upars[pn] then
+        upars[pn] = upars[pn] + 1
+        return pn .. upars[pn]
+    else
+        upars[pn] = 1
+        return pn
+    end
+end
+
 local Class = Node:clone {
     __ctor = function(self, klass, parent, mixins, ch, evs)
         self.klass      = klass
@@ -440,7 +450,7 @@ end
         local ftp = eolian.function_type
         local dir = eolian.parameter_dir
         s:write("    __eo_ctor = function(")
-        local cfuncs, parnames = {}, {}
+        local cfuncs, parnames, upars = {}, {}, {}
         for ctor in ctors do
             local cfunc = ctor:function_get()
             local tp = cfunc:type_get()
@@ -448,12 +458,14 @@ end
                 cfuncs[#cfuncs + 1] = cfunc
                 if tp ~= ftp.METHOD then
                     for par in cfunc:property_keys_get() do
-                        parnames[#parnames + 1] = kw_t(par:name_get())
+                        parnames[#parnames + 1] = incr_pc(upars,
+                            kw_t(par:name_get()))
                     end
                 end
                 for par in cfunc:parameters_get() do
                     if par:direction_get() ~= dir.OUT then
-                        parnames[#parnames + 1] = kw_t(par:name_get())
+                        parnames[#parnames + 1] = incr_pc(upars,
+                            kw_t(par:name_get()))
                     end
                 end
             end
@@ -461,6 +473,7 @@ end
         s:write(table.concat(parnames, ", "))
         s:write(")\n")
         -- write ctor body
+        local j = 1
         for i, cfunc in ipairs(cfuncs) do
             s:write("        self:", cfunc:name_get())
             if cfunc:type_get() ~= ftp.METHOD then
@@ -470,12 +483,14 @@ end
             local fpars = {}
             if cfunc:type_get() ~= ftp.METHOD then
                 for par in cfunc:property_keys_get() do
-                    fpars[#fpars + 1] = kw_t(par:name_get())
+                    fpars[#fpars + 1] = parnames[j]
+                    j = j + 1
                 end
             end
             for par in cfunc:parameters_get() do
                 if par:direction_get() ~= dir.OUT then
-                    fpars[#fpars + 1] = kw_t(par:name_get())
+                    fpars[#fpars + 1] = parnames[j]
+                    j = j + 1
                 end
             end
             s:write(table.concat(fpars, ", "))