Fix issue #243

edubart · Nov 19, 2023 · e82695a · e82695a
1 parent 19917ed
commit e82695a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lualib/nelua/analyzer.lua b/lualib/nelua/analyzer.lua
@@ -601,6 +601,8 @@ function visitors.Annotation(context, node, opts)
       context.cmainimports = context.cmainimports or {}
       table.insert(context.cmainimports, (codename:gsub('nelua_', '')))
     end
+    context.cimports = context.cimports or {}
+    context.cimports[codename] = true
   elseif name == 'nickname' then
     assert(objattr._type and objattr.is_nameable)
     local type, nickname = objattr, params

diff --git a/lualib/nelua/ccontext.lua b/lualib/nelua/ccontext.lua
@@ -74,7 +74,8 @@ function CContext:declname(attr)
   assert(attr._attr and attr.codename)
   if not attr.nodecl and not attr.cimport then
     declname = cdefs.quotename(declname)
-    if attr.shadows and not attr.staticstorage then
+    local cshadows = self.cimports and self.cimports[declname]
+    if (attr.shadows or cshadows) and not attr.staticstorage then
       declname = self:genuniquename(declname)
     end
   end

diff --git a/spec/cgenerator_spec.lua b/spec/cgenerator_spec.lua
@@ -1970,6 +1970,12 @@ it("variable shadowing", function()
     local function exit(code: cint) <cimport> end
     local function exit(code: cint) <cimport> end
     exit(0)
+
+    do -- issue #243
+      local function time(timer: *ctime_t): ctime_t <cimport,cinclude'<time.h>',nodecl> end
+      local time = time(nilptr)
+      assert(time > 0)
+    end
   ]])
 end)