From 270fb5e84541315fbda69d3c7aacd184fdf7ac00 Mon Sep 17 00:00:00 2001
From: Reuh <fildadut@reuh.eu>
Date: Wed, 8 Aug 2018 16:48:31 +0200
Subject: [PATCH] Updated to latest LPegLabel (fix error messages), Candran
 0.6.2

---
 candran.can                                   |  2 +-
 candran.lua                                   | 23 +++++++++----------
 lib/lua-parser/parser.lua                     |  3 +--
 ....1-1.rockspec => candran-0.6.2-1.rockspec} |  4 ++--
 rockspec/candran-scm-1.rockspec               |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)
 rename rockspec/{candran-0.6.1-1.rockspec => candran-0.6.2-1.rockspec} (96%)

diff --git a/candran.can b/candran.can
index 623ef9e..3eeb3b3 100644
--- a/candran.can
+++ b/candran.can
@@ -10,7 +10,7 @@
 #import("lib.lua-parser.parser")
 
 local candran = {
-	VERSION = "0.6.0"
+	VERSION = "0.6.2"
 }
 
 --- Default options.
diff --git a/candran.lua b/candran.lua
index 5ceb5f6..f706d3a 100644
--- a/candran.lua
+++ b/candran.lua
@@ -2894,19 +2894,18 @@ local errorinfo = { -- ./lib/lua-parser/parser.lua:675
 ["filename"] = filename -- ./lib/lua-parser/parser.lua:675
 } -- ./lib/lua-parser/parser.lua:675
 lpeg["setmaxstack"](1000) -- ./lib/lua-parser/parser.lua:676
-local ast, label, sfail = lpeg["match"](G, subject, nil, errorinfo) -- ./lib/lua-parser/parser.lua:677
+local ast, label, errpos = lpeg["match"](G, subject, nil, errorinfo) -- ./lib/lua-parser/parser.lua:677
 if not ast then -- ./lib/lua-parser/parser.lua:678
-local errpos = # subject - # sfail + 1 -- ./lib/lua-parser/parser.lua:679
-local errmsg = labels[label][2] -- ./lib/lua-parser/parser.lua:680
-return ast, syntaxerror(errorinfo, errpos, errmsg) -- ./lib/lua-parser/parser.lua:681
-end -- ./lib/lua-parser/parser.lua:681
-return validate(ast, errorinfo) -- ./lib/lua-parser/parser.lua:683
-end -- ./lib/lua-parser/parser.lua:683
-return parser -- ./lib/lua-parser/parser.lua:686
-end -- ./lib/lua-parser/parser.lua:686
-local parser = _() or parser -- ./lib/lua-parser/parser.lua:690
-package["loaded"]["lib.lua-parser.parser"] = parser or true -- ./lib/lua-parser/parser.lua:691
-local candran = { ["VERSION"] = "0.6.0" } -- candran.can:13
+local errmsg = labels[label][2] -- ./lib/lua-parser/parser.lua:679
+return ast, syntaxerror(errorinfo, errpos, errmsg) -- ./lib/lua-parser/parser.lua:680
+end -- ./lib/lua-parser/parser.lua:680
+return validate(ast, errorinfo) -- ./lib/lua-parser/parser.lua:682
+end -- ./lib/lua-parser/parser.lua:682
+return parser -- ./lib/lua-parser/parser.lua:685
+end -- ./lib/lua-parser/parser.lua:685
+local parser = _() or parser -- ./lib/lua-parser/parser.lua:689
+package["loaded"]["lib.lua-parser.parser"] = parser or true -- ./lib/lua-parser/parser.lua:690
+local candran = { ["VERSION"] = "0.6.2" } -- candran.can:13
 candran["default"] = { -- candran.can:17
 ["target"] = "lua53", -- candran.can:18
 ["indentation"] = "", -- candran.can:19
diff --git a/lib/lua-parser/parser.lua b/lib/lua-parser/parser.lua
index 7ca6fa9..e991c90 100644
--- a/lib/lua-parser/parser.lua
+++ b/lib/lua-parser/parser.lua
@@ -674,9 +674,8 @@ local syntaxerror = validator.syntaxerror
 function parser.parse (subject, filename)
   local errorinfo = { subject = subject, filename = filename }
   lpeg.setmaxstack(1000)
-  local ast, label, sfail = lpeg.match(G, subject, nil, errorinfo)
+  local ast, label, errpos = lpeg.match(G, subject, nil, errorinfo)
   if not ast then
-    local errpos = #subject-#sfail+1
     local errmsg = labels[label][2]
     return ast, syntaxerror(errorinfo, errpos, errmsg)
   end
diff --git a/rockspec/candran-0.6.1-1.rockspec b/rockspec/candran-0.6.2-1.rockspec
similarity index 96%
rename from rockspec/candran-0.6.1-1.rockspec
rename to rockspec/candran-0.6.2-1.rockspec
index e510277..205d8c1 100644
--- a/rockspec/candran-0.6.1-1.rockspec
+++ b/rockspec/candran-0.6.2-1.rockspec
@@ -17,12 +17,12 @@ description = {
 
 source = {
 	url = "git://github.com/Reuh/candran",
-	tag = "v0.6.1"
+	tag = "v0.6.2"
 }
 
 dependencies = {
 	"lua >= 5.1",
-	"lpeglabel >= 1.0.0"
+	"lpeglabel >= 1.5.0"
 }
 
 build = {
diff --git a/rockspec/candran-scm-1.rockspec b/rockspec/candran-scm-1.rockspec
index de5252a..6071e50 100644
--- a/rockspec/candran-scm-1.rockspec
+++ b/rockspec/candran-scm-1.rockspec
@@ -21,7 +21,7 @@ source = {
 
 dependencies = {
 	"lua >= 5.1",
-	"lpeglabel >= 1.0.0"
+	"lpeglabel >= 1.5.0"
 }
 
 build = {