Use prefix instead of _module suffix

vallode · vallode · commit 690a97ef3c22 · 2024-05-10T22:03:37.000+02:00
diff --git a/dist/library/modules/buildings.lua b/dist/library/modules/buildings.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class buildings_module
+---@class dfhack.buildings
 ---@field containsTile function
 dfhack.buildings = {}
 
diff --git a/dist/library/modules/burrows.lua b/dist/library/modules/burrows.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class burrows_module
+---@class dfhack.burrows
 ---@field isAssignedBlockTile function
 ---@field setAssignedBlockTile function
 dfhack.burrows = {}
diff --git a/dist/library/modules/constructions.lua b/dist/library/modules/constructions.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class constructions_module
+---@class dfhack.constructions
 dfhack.constructions = {}
 
 ---@param pos df.coord
diff --git a/dist/library/modules/designations.lua b/dist/library/modules/designations.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class designations_module
+---@class dfhack.designations
 dfhack.designations = {}
 
 ---@param plant df.plant
diff --git a/dist/library/modules/filesystem.lua b/dist/library/modules/filesystem.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class filesystem_module
+---@class dfhack.filesystem
 dfhack.filesystem = {}
 
 ---@param dir string
diff --git a/dist/library/modules/gui.lua b/dist/library/modules/gui.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class gui_module
+---@class dfhack.gui
 ---@field addCombatReport function
 ---@field addCombatReportAuto function
 dfhack.gui = {}
diff --git a/dist/library/modules/internal.lua b/dist/library/modules/internal.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class internal_module
+---@class dfhack.internal
 ---@field strerror function
 ---@field md5 function
 ---@field heapTakeSnapshot function
diff --git a/dist/library/modules/items.lua b/dist/library/modules/items.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class items_module
+---@class dfhack.items
 ---@field moveToGround function
 ---@field moveToContainer function
 ---@field moveToInventory function
diff --git a/dist/library/modules/job.lua b/dist/library/modules/job.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class job_module
+---@class dfhack.job
 ---@field is_equal function
 ---@field is_item_equal function
 dfhack.job = {}
diff --git a/dist/library/modules/kitchen.lua b/dist/library/modules/kitchen.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class kitchen_module
+---@class dfhack.kitchen
 dfhack.kitchen = {}
 
 ---@param type df.kitchen_exc_type
diff --git a/dist/library/modules/maps.lua b/dist/library/modules/maps.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class maps_module
+---@class dfhack.maps
 ---@field getBlock function
 ---@field hasTileAssignment function
 ---@field getTileAssignment function
diff --git a/dist/library/modules/matinfo.lua b/dist/library/modules/matinfo.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class matinfo_module
+---@class dfhack.matinfo
 ---@field find function
 ---@field decode function
 ---@field getToken function
diff --git a/dist/library/modules/military.lua b/dist/library/modules/military.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class military_module
+---@class dfhack.military
 dfhack.military = {}
 
 ---@param assignment_id number
diff --git a/dist/library/modules/pen.lua b/dist/library/modules/pen.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class pen_module
+---@class dfhack.pen
 ---@field parse function
 ---@field make function
 ---@field __index function
diff --git a/dist/library/modules/penarray.lua b/dist/library/modules/penarray.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class penarray_module
+---@class dfhack.penarray
 ---@field new function
 ---@field clear function
 ---@field get_dims function
diff --git a/dist/library/modules/persistent.lua b/dist/library/modules/persistent.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class persistent_module
+---@class dfhack.persistent
 ---@field getSiteDataString function
 ---@field saveSiteDataString function
 ---@field deleteSiteData function
diff --git a/dist/library/modules/random.lua b/dist/library/modules/random.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class random_module
+---@class dfhack.random
 ---@field new function
 ---@field init function
 ---@field random function
diff --git a/dist/library/modules/screen.lua b/dist/library/modules/screen.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class screen_module
+---@class dfhack.screen
 dfhack.screen = {}
 
 ---@return df.coord2d
diff --git a/dist/library/modules/textures.lua b/dist/library/modules/textures.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class textures_module
+---@class dfhack.textures
 dfhack.textures = {}
 
 ---@param tile_px_w integer
diff --git a/dist/library/modules/units.lua b/dist/library/modules/units.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class units_module
+---@class dfhack.units
 dfhack.units = {}
 
 ---@param unit df.unit
diff --git a/dist/library/modules/world.lua b/dist/library/modules/world.lua
@@ -1,7 +1,7 @@
 -- THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT EDIT.
 ---@meta
 
----@class world_module
+---@class dfhack.world
 dfhack.world = {}
 
 ---@return boolean
diff --git a/lib/cpp.rb b/lib/cpp.rb
@@ -46,10 +46,9 @@ def parse_cpp_modules(entry_point)
             output << "---@meta\n\n"
 
             prefix = module_name == 'dfhack' ? '' : 'dfhack.'
-            suffix = module_name == 'dfhack' ? '' : '_module'
             namespace = is_module ? "#{module_name.capitalize}::" : ''
 
-            output << "---@class #{module_name}#{suffix}\n"
+            output << "---@class #{prefix}#{module_name}\n"
 
             functions = []
 
