aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Hill <bitbucket@bruce-hill.com>2017-10-20 15:07:57 -0700
committerBruce Hill <bitbucket@bruce-hill.com>2017-10-20 15:07:57 -0700
commitb909dce5d11e1b9ae15ae68ec8646e162c30b56d (patch)
tree3adef40acc0c753b838ffc9b93443853482e5726
parent9f61e7f90d4729a9afba1c08d6ce45af460e5d8f (diff)
Fix for callstack.
-rw-r--r--nomsu.lua4
-rwxr-xr-xnomsu.moon4
2 files changed, 4 insertions, 4 deletions
diff --git a/nomsu.lua b/nomsu.lua
index 52767cf..8597d5b 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -348,7 +348,7 @@ do
local _list_0 = self.callstack
for _index_0 = 1, #_list_0 do
local caller = _list_0[_index_0]
- if whiteset[caller[1]] then
+ if caller ~= "#macro" and whiteset[caller[1]] then
return true
end
end
@@ -369,7 +369,7 @@ do
local _list_0 = self.callstack
for _index_0 = 1, #_list_0 do
local caller = _list_0[_index_0]
- if whiteset[caller[1]] then
+ if caller ~= "#macro" and whiteset[caller[1]] then
return true
end
end
diff --git a/nomsu.moon b/nomsu.moon
index 45099d0..8512fd7 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -274,7 +274,7 @@ class NomsuCompiler
-- TODO: maybe optimize this by making the callstack a Counter and using a
-- move-to-front optimization on the whitelist to check most likely candidates sooner
for caller in *@callstack
- if whiteset[caller[1]] then return true
+ if caller != "#macro" and whiteset[caller[1]] then return true
@error "You do not have the authority to call: #{stub}"
check_permission: (fn_def)=>
@@ -288,7 +288,7 @@ class NomsuCompiler
-- TODO: maybe optimize this by making the callstack a Counter and using a
-- move-to-front optimization on the whitelist to check most likely candidates sooner
for caller in *@callstack
- if whiteset[caller[1]] then return true
+ if caller != "#macro" and whiteset[caller[1]] then return true
return false
parse: (str, filename)=>