Account for whitespace in pointer first argument

Author: vallode

dist/library/modules/textures.lua

@@ -4,12 +4,11 @@
 ---@class textures_module
 dfhack.textures = {}
 
----@param file string
 ---@param tile_px_w integer
 ---@param tile_px_h integer
 ---@param reserved boolean|nil
----@return { [integer]: unknown }
-function dfhack.textures.loadTileset(file, tile_px_w, tile_px_h, reserved) end
+---@return unknown
+function dfhack.textures.loadTileset(tile_px_w, tile_px_h, reserved) end
 
 ---@param handle unknown
 ---@return number
@@ -19,19 +18,17 @@ function dfhack.textures.getTexposByHandle(handle) end
 ---@return nil
 function dfhack.textures.deleteHandle(handle) end
 
----@param pixels { [integer]: integer }
 ---@param tile_px_w integer
 ---@param tile_px_h integer
 ---@param reserved boolean|nil
----@return unknown
-function dfhack.textures.createTile(pixels, tile_px_w, tile_px_h, reserved) end
+---@return { [integer]: integer }
+function dfhack.textures.createTile(tile_px_w, tile_px_h, reserved) end
 
----@param pixels { [integer]: integer }
 ---@param texture_px_w integer
 ---@param texture_px_h integer
 ---@param tile_px_w integer
 ---@param tile_px_h integer
 ---@param reserved boolean|nil
----@return { [integer]: unknown }
-function dfhack.textures.createTileset(pixels, texture_px_w, texture_px_h, tile_px_w, tile_px_h, reserved) end
+---@return { [integer]: integer }
+function dfhack.textures.createTileset(texture_px_w, texture_px_h, tile_px_w, tile_px_h, reserved) end
 

dist/library/modules/units.lua

@@ -27,11 +27,10 @@ function dfhack.units.getNoblePositions(pvec, unit) end
 ---@return { [integer]: df.unit }
 function dfhack.units.getUnitsInBox(x1, y1, z1, x2, y2, z2) end
 
----@param citizens { [integer]: df.unit }
 ---@param exclude_residents boolean|nil
 ---@param include_insane boolean|nil
----@return boolean
-function dfhack.units.getCitizens(citizens, exclude_residents, include_insane) end
+---@return { [integer]: df.unit }
+function dfhack.units.getCitizens(exclude_residents, include_insane) end
 
 ---@param noble string
 ---@return { [integer]: df.unit }

lib/cpp.rb

@@ -161,9 +161,9 @@ def parse_function(match, module_name:, prefix:, function_name:)
           # We're accounting for pointers as first arguments _usually_ being a
           # way of avoiding copy semantics. When these are wrapped as Lua
           # functions the pointer is returned.
-          if /&\w+/.match(arguments[0])
+          if /&\s*\w+/.match(arguments[0])
             return_type = parse_type(arguments[0].gsub(%r{/\*[^/]+/}, '').gsub(/const\s+|[*&]/, '').strip)
-            arguments.shift(1)
+            arguments.shift
           end
 
           arguments = arguments.map { |arg| arg.gsub(%r{/\*[^/]+/}, '').gsub(/const\s+|[*&]/, '').strip }