aboutsummaryrefslogtreecommitdiff
path: root/nomsu.lua
diff options
context:
space:
mode:
authorBruce Hill <bitbucket@bruce-hill.com>2018-01-12 16:45:36 -0800
committerBruce Hill <bitbucket@bruce-hill.com>2018-01-12 16:45:49 -0800
commit90c72074dbb9026d1e56021317e460d9ccfc1e59 (patch)
tree89014d2b8831657e038667fcdb5ed18788a52709 /nomsu.lua
parentb4a0267f7115cd539e0e761f706c808e5f827404 (diff)
Renamed replaced_vars() to be more descriptive.
Diffstat (limited to 'nomsu.lua')
-rw-r--r--nomsu.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/nomsu.lua b/nomsu.lua
index 3ca82f1..7f0d074 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -996,17 +996,17 @@ do
end
return concat(bits, "\n")
end,
- replaced_vars = function(self, tree, vars)
+ tree_with_replaced_vars = function(self, tree, replacements)
if type(tree) ~= 'table' then
return tree
end
local _exp_0 = tree.type
if "Var" == _exp_0 then
- if vars[tree.value] ~= nil then
- tree = vars[tree.value]
+ if replacements[tree.value] ~= nil then
+ tree = replacements[tree.value]
end
elseif "File" == _exp_0 or "Nomsu" == _exp_0 or "Block" == _exp_0 or "List" == _exp_0 or "FunctionCall" == _exp_0 or "Text" == _exp_0 then
- local new_value = self:replaced_vars(tree.value, vars)
+ local new_value = self:tree_with_replaced_vars(tree.value, replacements)
if new_value ~= tree.value then
do
local _tbl_0 = { }
@@ -1019,10 +1019,10 @@ do
end
elseif "Dict" == _exp_0 then
local dirty = false
- local replacements = { }
+ replacements = { }
for i, e in ipairs(tree.value) do
- local new_key = self:replaced_vars(e.dict_key, vars)
- local new_value = self:replaced_vars(e.dict_value, vars)
+ local new_key = self:tree_with_replaced_vars(e.dict_key, replacements)
+ local new_value = self:tree_with_replaced_vars(e.dict_value, replacements)
dirty = dirty or (new_key ~= e.dict_key or new_value ~= e.dict_value)
replacements[i] = {
dict_key = new_key,
@@ -1043,7 +1043,7 @@ do
local new_values = { }
local any_different = false
for k, v in pairs(tree) do
- new_values[k] = self:replaced_vars(v, vars)
+ new_values[k] = self:tree_with_replaced_vars(v, replacements)
any_different = any_different or (new_values[k] ~= tree[k])
end
if any_different then