lace.builtin: Offset anyof/allof error messages

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/lace/builtin.lua b/lib/lace/builtin.lua
index 147da6a..5f91086 100644
--- a/lib/lace/builtin.lua
+++ b/lib/lace/builtin.lua
@@ -208,7 +208,15 @@ local function _compile_any_all_of(compcontext, mtype, first, second, ...)
    end
 
    return {
-      fn = run_conditions,
+      fn = (function(exec_context, cond, anyof)
+         local pass, msg = run_conditions(exec_context, cond, anyof)
+         if pass == nil then
+            -- Offset error location by anyof/allof word
+            err.offset(msg, 1)
+            return nil, msg
+         end
+         return pass, msg
+      end),
       args = { { first, second, ...}, mtype == "anyof" }
    }
 end