Make boolean arguments optional

Author: vallode

lib/cpp.rb

@@ -31,7 +31,7 @@ class CPP
       'ulong' => 'number',
       'ptr-string' => 'DFPointer<string>',
       'static-string' => 'string',
-      'stl-string' => 'string',
+      'stl-string' => 'string'
       # 'stl-bit-vector' => 'boolean',
       # 'df-flagarray' => 'boolean',
       # 'stl-function' => 'function',
@@ -45,7 +45,9 @@ class CPP
     class << self
       def parse_type(string)
         return TYPE_MAP[string] if TYPE_MAP[string]
-        return string.gsub(/df::/, '') if string =~ /df::/
+
+        string = string.gsub(/df::/, '') if string
+        string = string.gsub(/std::vector/, 'DFVector') if string
 
         string
       end

lib/generate.rb

@@ -61,14 +61,18 @@ def parse_cpp_modules(files)
           type, name = argument.split(' ')
           type = DFHackLuaDefinitions::CPP.parse_type(type)
 
-          {
-            name: DFHackLuaDefinitions::LuaLS.safe_name(DFHackLuaDefinitions::CPP.sanitize(name)),
-            type: type == 'boolean' ? 'boolean|nil' : type
-          }
-        end
+          if name == 'out'
+            nil
+          else
+            {
+              name: DFHackLuaDefinitions::LuaLS.safe_name(DFHackLuaDefinitions::CPP.sanitize(name)),
+              type: type == 'boolean' ? 'boolean|nil' : type
+            }
+          end
+        end&.compact
 
         arguments&.each do |argument|
-          output << "---@param #{argument[:name]} #{argument[:type]} \n"
+          output << "---@param #{argument[:name]} #{argument[:type]}\n"
         end
         output << "---@return #{return_type.gsub(/const|[*&]/, '')}\n" if return_type
         output << "function #{prefix}#{module_name}.#{function_name}("