From 7112af7cb6ee52f4ef9664db9c03db52d8c73ac9 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Fri, 14 Sep 2018 15:24:24 -0700
Subject: [PATCH] Fixed comments in nomsu codegen.

---
 nomsu_compiler.lua  | 6 +++---
 nomsu_compiler.moon | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua
index c7b7dc6..f01edf7 100644
--- a/nomsu_compiler.lua
+++ b/nomsu_compiler.lua
@@ -1078,7 +1078,7 @@ do
         comments = _accum_0
       end
       table.sort(comments, function(a, b)
-        return (a.pos > b.pos)
+        return (a.source.start > b.source.start)
       end)
       pop_comments = function(pos, prefix, suffix)
         if prefix == nil then
@@ -1089,11 +1089,11 @@ do
         end
         local nomsu = NomsuCode(tree.source)
         for i = #comments, 1, -1 do
-          if comments[i].pos > pos then
+          if comments[i].source.start > pos then
             break
           end
           local comment
-          comment, comments[i] = comments[i].comment, nil
+          comment, comments[i] = comments[i][1], nil
           nomsu:append("#" .. (gsub(comment, "\n", "\n    ")) .. "\n")
           if comment:match("^\n.") then
             nomsu:append("\n")
diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon
index b5168a5..b6faba3 100644
--- a/nomsu_compiler.moon
+++ b/nomsu_compiler.moon
@@ -672,13 +672,13 @@ with NomsuCompiler
             find_comments(tree)
             -- Sort in reversed order so they can be easily popped
             comments = [c for c in pairs comment_set]
-            table.sort(comments, (a,b)->(a.pos > b.pos))
+            table.sort(comments, (a,b)->(a.source.start > b.source.start))
 
             pop_comments = (pos, prefix='', suffix='')->
                 nomsu = NomsuCode(tree.source)
                 for i=#comments,1,-1
-                    break if comments[i].pos > pos
-                    comment, comments[i] = comments[i].comment, nil
+                    break if comments[i].source.start > pos
+                    comment, comments[i] = comments[i][1], nil
                     nomsu\append("#"..(gsub(comment, "\n", "\n    ")).."\n")
                     if comment\match("^\n.") then nomsu\append("\n") -- for aesthetics
                 return '' if #nomsu.bits == 0