From 38a72468d9be48dd62fe92db54a902daf35fb284 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 24 Sep 2022 13:41:44 +0100 Subject: [PATCH] =?UTF-8?q?utils:=20rename=20folder=20tables=20=E2=86=92?= =?UTF-8?q?=20table=20to=20match=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldeditadditions_core/init.lua | 2 +- .../utils/strings/split_shell.lua | 2 +- .../utils/{tables => table}/deepcopy.lua | 0 worldeditadditions_core/utils/table/init.lua | 25 +++++++++++++++++++ .../utils/{tables => table}/makeset.lua | 0 .../utils/{tables => table}/shallowcopy.lua | 0 .../utils/{tables => table}/table_apply.lua | 0 .../{tables => table}/table_contains.lua | 0 .../utils/{tables => table}/table_filter.lua | 0 .../{tables => table}/table_get_last.lua | 2 +- .../utils/{tables => table}/table_map.lua | 0 .../{tables => table}/table_tostring.lua | 0 .../utils/{tables => table}/table_unique.lua | 0 .../utils/{tables => table}/table_unpack.lua | 0 worldeditadditions_core/utils/tables/init.lua | 25 ------------------- 15 files changed, 28 insertions(+), 28 deletions(-) rename worldeditadditions_core/utils/{tables => table}/deepcopy.lua (100%) create mode 100644 worldeditadditions_core/utils/table/init.lua rename worldeditadditions_core/utils/{tables => table}/makeset.lua (100%) rename worldeditadditions_core/utils/{tables => table}/shallowcopy.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_apply.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_contains.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_filter.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_get_last.lua (85%) rename worldeditadditions_core/utils/{tables => table}/table_map.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_tostring.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_unique.lua (100%) rename worldeditadditions_core/utils/{tables => table}/table_unpack.lua (100%) delete mode 100644 worldeditadditions_core/utils/tables/init.lua diff --git a/worldeditadditions_core/init.lua b/worldeditadditions_core/init.lua index 3d9e5dd..f8f79da 100644 --- a/worldeditadditions_core/init.lua +++ b/worldeditadditions_core/init.lua @@ -44,7 +44,7 @@ wea_c.terrain = dofile(wea_c.modpath.."/utils/terrain/init.lua") dofile(wea_c.modpath.."/utils/strings/init.lua") dofile(wea_c.modpath.."/utils/format/init.lua") dofile(wea_c.modpath.."/utils/parse/init.lua") -dofile(wea_c.modpath.."/utils/tables/init.lua") +dofile(wea_c.modpath.."/utils/table/init.lua") dofile(wea_c.modpath.."/utils/numbers.lua") dofile(wea_c.modpath.."/utils/nodes.lua") diff --git a/worldeditadditions_core/utils/strings/split_shell.lua b/worldeditadditions_core/utils/strings/split_shell.lua index 9598321..ac0ea4a 100644 --- a/worldeditadditions_core/utils/strings/split_shell.lua +++ b/worldeditadditions_core/utils/strings/split_shell.lua @@ -1,6 +1,6 @@ -- worldeditadditions_core = { modpath="/home/sbrl/.minetest/worlds/Mod-Sandbox/worldmods/WorldEditAdditions/worldeditadditions_core/" } local wea_c = worldeditadditions_core -local table_map = dofile(wea_c.modpath.."/utils/tables/table_map.lua") +local table_map = dofile(wea_c.modpath.."/utils/table/table_map.lua") local function is_whitespace(char) return char:match("%s") diff --git a/worldeditadditions_core/utils/tables/deepcopy.lua b/worldeditadditions_core/utils/table/deepcopy.lua similarity index 100% rename from worldeditadditions_core/utils/tables/deepcopy.lua rename to worldeditadditions_core/utils/table/deepcopy.lua diff --git a/worldeditadditions_core/utils/table/init.lua b/worldeditadditions_core/utils/table/init.lua new file mode 100644 index 0000000..177dfdf --- /dev/null +++ b/worldeditadditions_core/utils/table/init.lua @@ -0,0 +1,25 @@ +-- ████████ █████ ██████ ██ ███████ ███████ +-- ██ ██ ██ ██ ██ ██ ██ ██ +-- ██ ███████ ██████ ██ █████ ███████ +-- ██ ██ ██ ██ ██ ██ ██ ██ +-- ██ ██ ██ ██████ ███████ ███████ ███████ + +-- Functions that operate on tables. +-- Lua doesn't exactly come with batteries included, so this is quite an +-- extensive collection of functions :P + +local wea_c = worldeditadditions_core + +wea_c.table = { + apply = dofile(wea_c.modpath.."/utils/table/table_apply.lua"), + contains = dofile(wea_c.modpath.."/utils/table/table_contains.lua"), + deepcopy = dofile(wea_c.modpath.."/utils/table/deepcopy.lua"), + filter = dofile(wea_c.modpath.."/utils/table/table_filter.lua"), + get_last = dofile(wea_c.modpath.."/utils/table/table_get_last.lua"), + makeset = dofile(wea_c.modpath.."/utils/table/makeset.lua"), + map = dofile(wea_c.modpath.."/utils/table/table_map.lua"), + shallowcopy = dofile(wea_c.modpath.."/utils/table/shallowcopy.lua"), + tostring = dofile(wea_c.modpath.."/utils/table/table_tostring.lua"), + unique = dofile(wea_c.modpath.."/utils/table/table_unique.lua"), + unpack = dofile(wea_c.modpath.."/utils/table/table_unpack.lua"), +} diff --git a/worldeditadditions_core/utils/tables/makeset.lua b/worldeditadditions_core/utils/table/makeset.lua similarity index 100% rename from worldeditadditions_core/utils/tables/makeset.lua rename to worldeditadditions_core/utils/table/makeset.lua diff --git a/worldeditadditions_core/utils/tables/shallowcopy.lua b/worldeditadditions_core/utils/table/shallowcopy.lua similarity index 100% rename from worldeditadditions_core/utils/tables/shallowcopy.lua rename to worldeditadditions_core/utils/table/shallowcopy.lua diff --git a/worldeditadditions_core/utils/tables/table_apply.lua b/worldeditadditions_core/utils/table/table_apply.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_apply.lua rename to worldeditadditions_core/utils/table/table_apply.lua diff --git a/worldeditadditions_core/utils/tables/table_contains.lua b/worldeditadditions_core/utils/table/table_contains.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_contains.lua rename to worldeditadditions_core/utils/table/table_contains.lua diff --git a/worldeditadditions_core/utils/tables/table_filter.lua b/worldeditadditions_core/utils/table/table_filter.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_filter.lua rename to worldeditadditions_core/utils/table/table_filter.lua diff --git a/worldeditadditions_core/utils/tables/table_get_last.lua b/worldeditadditions_core/utils/table/table_get_last.lua similarity index 85% rename from worldeditadditions_core/utils/tables/table_get_last.lua rename to worldeditadditions_core/utils/table/table_get_last.lua index fcf55f1..f8caf69 100644 --- a/worldeditadditions_core/utils/tables/table_get_last.lua +++ b/worldeditadditions_core/utils/table/table_get_last.lua @@ -1,6 +1,6 @@ local wea_c = worldeditadditions_core -local table_unpack = dofile(wea_c.modpath.."/utils/tables/table_unpack.lua") +local table_unpack = dofile(wea_c.modpath.."/utils/table/table_unpack.lua") --- Returns only the last count items in a given numerical table-based list. diff --git a/worldeditadditions_core/utils/tables/table_map.lua b/worldeditadditions_core/utils/table/table_map.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_map.lua rename to worldeditadditions_core/utils/table/table_map.lua diff --git a/worldeditadditions_core/utils/tables/table_tostring.lua b/worldeditadditions_core/utils/table/table_tostring.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_tostring.lua rename to worldeditadditions_core/utils/table/table_tostring.lua diff --git a/worldeditadditions_core/utils/tables/table_unique.lua b/worldeditadditions_core/utils/table/table_unique.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_unique.lua rename to worldeditadditions_core/utils/table/table_unique.lua diff --git a/worldeditadditions_core/utils/tables/table_unpack.lua b/worldeditadditions_core/utils/table/table_unpack.lua similarity index 100% rename from worldeditadditions_core/utils/tables/table_unpack.lua rename to worldeditadditions_core/utils/table/table_unpack.lua diff --git a/worldeditadditions_core/utils/tables/init.lua b/worldeditadditions_core/utils/tables/init.lua deleted file mode 100644 index 837f52b..0000000 --- a/worldeditadditions_core/utils/tables/init.lua +++ /dev/null @@ -1,25 +0,0 @@ --- ████████ █████ ██████ ██ ███████ ███████ --- ██ ██ ██ ██ ██ ██ ██ ██ --- ██ ███████ ██████ ██ █████ ███████ --- ██ ██ ██ ██ ██ ██ ██ ██ --- ██ ██ ██ ██████ ███████ ███████ ███████ - --- Functions that operate on tables. --- Lua doesn't exactly come with batteries included, so this is quite an --- extensive collection of functions :P - -local wea_c = worldeditadditions_core - -wea_c.table = { - apply = dofile(wea_c.modpath.."/utils/tables/table_apply.lua"), - contains = dofile(wea_c.modpath.."/utils/tables/table_contains.lua"), - deepcopy = dofile(wea_c.modpath.."/utils/tables/deepcopy.lua"), - filter = dofile(wea_c.modpath.."/utils/tables/table_filter.lua"), - get_last = dofile(wea_c.modpath.."/utils/tables/table_get_last.lua"), - makeset = dofile(wea_c.modpath.."/utils/tables/makeset.lua"), - map = dofile(wea_c.modpath.."/utils/tables/table_map.lua"), - shallowcopy = dofile(wea_c.modpath.."/utils/tables/shallowcopy.lua"), - tostring = dofile(wea_c.modpath.."/utils/tables/table_tostring.lua"), - unique = dofile(wea_c.modpath.."/utils/tables/table_unique.lua"), - unpack = dofile(wea_c.modpath.."/utils/tables/table_unpack.lua"), -}