2 files changed, 10 insertions, 5 deletions

diff --git a/relabel.lua b/relabel.lua
index 3f3894d..d038531 100644
--- a/relabel.lua
+++ b/relabel.lua
@@ -360,13 +360,19 @@ local function lineno (s, i)
   return 1 + num, (r ~= 0 and r or 1) + adjust
 end
 
+local function splitlines(str)
+  local t = {}
+  local function helper(line) tinsert(t, line) return "" end
+  helper((str:gsub("(.-)\r?\n", helper)))
+  return t
+end
+
 local function compile (p, defs)
   if mm.type(p) == "pattern" then return p end   -- already compiled
   p = p .. " " -- for better reporting of column numbers in errors when at EOF
   local cp, label, suffix = pattern:match(p, 1, defs)
   if #errfound > 0 then
-    local lines = {}
-    for line in p:gmatch("[^\r\n]+") do tinsert(lines, line) end
+    local lines = splitlines(p)
     local errors = {}
     for i, err in ipairs(errfound) do
       if #err == 1 then
diff --git a/testerrors.lua b/testerrors.lua
index d37cc0a..9c10aa6 100644
--- a/testerrors.lua
+++ b/testerrors.lua
@@ -589,7 +589,7 @@ L2:C9: unexpected characters after the pattern
 
 testerror([[
   A <- 'A' /{'lab'} B / !
-  
+
   B <- %{1, 2 3} 'b' / '6' & / 'B'
 
   C <- A^B
@@ -611,6 +611,5 @@ L5:C10: expected a number after '^', '+' or '-' (no space)
          ^
 ]])
 
-  
+
 print 'OK'
-  
\ No newline at end of file