aboutsummaryrefslogtreecommitdiff
path: root/nomsu.moon
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.moon
parentb4a0267f7115cd539e0e761f706c808e5f827404 (diff)
Renamed replaced_vars() to be more descriptive.
Diffstat (limited to 'nomsu.moon')
-rwxr-xr-xnomsu.moon14
1 files changed, 7 insertions, 7 deletions
diff --git a/nomsu.moon b/nomsu.moon
index c69853c..23ecede 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -677,14 +677,14 @@ class NomsuCompiler
insert bits, close
return concat(bits)
- replaced_vars: (tree, vars)=>
+ tree_with_replaced_vars: (tree, replacements)=>
if type(tree) != 'table' then return tree
switch tree.type
when "Var"
- if vars[tree.value] ~= nil
- tree = vars[tree.value]
+ if replacements[tree.value] ~= nil
+ tree = replacements[tree.value]
when "File", "Nomsu", "Block", "List", "FunctionCall", "Text"
- new_value = @replaced_vars tree.value, vars
+ new_value = @tree_with_replaced_vars tree.value, replacements
if new_value != tree.value
tree = {k,v for k,v in pairs(tree)}
tree.value = new_value
@@ -692,8 +692,8 @@ class NomsuCompiler
dirty = false
replacements = {}
for i,e in ipairs tree.value
- new_key = @replaced_vars e.dict_key, vars
- new_value = @replaced_vars e.dict_value, vars
+ new_key = @tree_with_replaced_vars e.dict_key, replacements
+ new_value = @tree_with_replaced_vars e.dict_value, replacements
dirty or= new_key != e.dict_key or new_value != e.dict_value
replacements[i] = {dict_key:new_key, dict_value:new_value}
if dirty
@@ -703,7 +703,7 @@ class NomsuCompiler
new_values = {}
any_different = false
for k,v in pairs tree
- new_values[k] = @replaced_vars v, vars
+ new_values[k] = @tree_with_replaced_vars v, replacements
any_different or= (new_values[k] != tree[k])
if any_different
tree = new_values