From 2dc9d24a5fadcd4789a137be6d91a79ae019aa1b Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Thu, 14 Sep 2017 05:49:01 -0700
Subject: [PATCH] Fixed error message, added another convenience accessor.

---
 core.nom   | 4 ++--
 nomsu.lua  | 2 +-
 nomsu.moon | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core.nom b/core.nom
index 08115fa..51ecb84 100644
--- a/core.nom
+++ b/core.nom
@@ -182,13 +182,13 @@ rule ["max of %items with respect to %keys"]:
 
 macro [..]
     "%list 's %index", "%index st in %list", "%index nd in %list", "%index rd in %list"
-    "%index th in %list"
+    "%index th in %list", "%index in %list"
 ..:
     ".."|\%list as lua expr\[\%index as lua expr\]
 
 macro block [..]
     "%list 's %index = %value", "%index st in %list = %value", "%index nd in %list = %value"
-    "%index rd in %list = %value", "%index th in %list = %value"
+    "%index rd in %list = %value", "%index th in %list = %value", "%index in %list = %value"
 ..:
     ".."|\%list as lua expr\[\%index as lua expr\] = \%value as lua expr\
 
diff --git a/nomsu.lua b/nomsu.lua
index 161deac..9fcf8ad 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -223,7 +223,7 @@ do
         table.insert(invocations, invocation)
         if prev_arg_names then
           if not utils.equivalent(utils.set(prev_arg_names), utils.set(_arg_names)) then
-            self:error("Conflicting argument names " .. tostring(utils.repr(arg_names)) .. " and " .. tostring(utils.repr(_arg_names)) .. " for " .. tostring(utils.repr(text)))
+            self:error("Conflicting argument names " .. tostring(utils.repr(prev_arg_names)) .. " and " .. tostring(utils.repr(_arg_names)) .. " for " .. tostring(utils.repr(text)))
           end
         else
           prev_arg_names = _arg_names
diff --git a/nomsu.moon b/nomsu.moon
index 2a9a21d..18d65e9 100755
--- a/nomsu.moon
+++ b/nomsu.moon
@@ -144,7 +144,7 @@ class NomsuCompiler
             table.insert(invocations, invocation)
             if prev_arg_names
                 if not utils.equivalent(utils.set(prev_arg_names), utils.set(_arg_names))
-                    @error("Conflicting argument names #{utils.repr(arg_names)} and #{utils.repr(_arg_names)} for #{utils.repr(text)}")
+                    @error("Conflicting argument names #{utils.repr(prev_arg_names)} and #{utils.repr(_arg_names)} for #{utils.repr(text)}")
             else prev_arg_names = _arg_names
             arg_names[invocation] = _arg_names
         return invocations, arg_names