From c6819cf1e96f471ef0c278c2063a02ab429094fe Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Fri, 20 Oct 2017 15:10:04 -0700
Subject: [PATCH] More callstack fixin

---
 nomsu.lua  | 6 ++++--
 nomsu.moon | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nomsu.lua b/nomsu.lua
index 8597d5b..9b4b2f1 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -808,8 +808,10 @@ end)]]):format(concat(lua_bits, "\n"))
         local _list_0 = self.callstack
         for _index_0 = 1, #_list_0 do
           local c = _list_0[_index_0]
-          _accum_0[_len_0] = #c[2]
-          _len_0 = _len_0 + 1
+          if c ~= "#macro" then
+            _accum_0[_len_0] = #c[2]
+            _len_0 = _len_0 + 1
+          end
         end
         return _accum_0
       end)())
diff --git a/nomsu.moon b/nomsu.moon
index 8512fd7..1f5c05d 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -584,7 +584,7 @@ end)]])\format(concat(lua_bits, "\n"))
         if msg
             @errorln(colored.bright colored.yellow colored.onred msg)
         @errorln("Callstack:")
-        maxlen = utils.max([#c[2] for c in *@callstack])
+        maxlen = utils.max([#c[2] for c in *@callstack when c != "#macro"])
         for i=#@callstack,1,-1
             if @callstack[i] != "#macro"
                 @errorln "    #{"%-#{maxlen}s"\format @callstack[i][2]}| #{@callstack[i][1]}"