refactor: Lua table as a set convention

KoharaKazuya · Dec 19, 2020 · ae46076 · ae46076
1 parent 4bdc757
commit ae46076
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/control.lua b/control.lua
@@ -8,7 +8,9 @@ script.on_init(function()
     global = {}
     global.entities = {}
     global.locomotive_type_names = {
-        key.locomotive, key.locomotive_mk2, key.locomotive_mk3
+        [key.locomotive] = true,
+        [key.locomotive_mk2] = true,
+        [key.locomotive_mk3] = true
     }
     global.schema_version = 2
 end)
@@ -18,7 +20,9 @@ script.on_configuration_changed(function(data)
     local version = global.schema_version or 1
     if version < 2 then
         global.locomotive_type_names = {
-            key.locomotive, key.locomotive_mk2, key.locomotive_mk3
+            [key.locomotive] = true,
+            [key.locomotive_mk2] = true,
+            [key.locomotive_mk3] = true
         }
     end
     global.schema_version = 2

diff --git a/remote-interface.lua b/remote-interface.lua
@@ -1,11 +1,7 @@
 --- register a new locomotive type
 -- @param name string of lomotive type name
 local function register_locomotive_type(name)
-    local contains = false
-    for _, v in pairs(global.locomotive_type_names) do
-        if v == name then contains = true end
-    end
-    if not (contains) then table.insert(global.locomotive_type_names, name) end
+    global.locomotive_type_names[name] = true
 end
 
 remote.add_interface("BatteryLocomotive",

diff --git a/utils/train.lua b/utils/train.lua
@@ -44,10 +44,7 @@ end
 
 local function is_battery_locomotive(entity)
     if not entity then return false end
-    local name = entity.name
-    for _, v in pairs(global.locomotive_type_names) do
-        if v == name then return true end
-    end
+    if global.locomotive_type_names[entity.name] then return true end
     return false
 end