From aa945f9fd7ea3612f24a1df1ec7c5cae9faeedae Mon Sep 17 00:00:00 2001
From: Reuh <fildadut@reuh.eu>
Date: Fri, 5 Apr 2019 20:10:44 +0200
Subject: [PATCH] Detect Lua version and slight improvement to error messages

---
 candran.can | 4 ++--
 candran.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/candran.can b/candran.can
index 232878f..8de92df 100644
--- a/candran.can
+++ b/candran.can
@@ -15,7 +15,7 @@ local candran = {
 
 --- Default options.
 candran.default = {
-	target = "lua53",
+	target = _VERSION == "Lua 5.1" and "luajit" or "lua53",
 	indentation = "",
 	newline = "\n",
 	variablePrefix = "__CAN_",
@@ -241,7 +241,7 @@ function candran.messageHandler(message)
 			for l in originalFile:gmatch("([^\n]*)") do
 				i = i +1
 				if i == line then
-					local extSource, lineMap = l:match("%-%- (.-)%:(%d+)$")
+					local extSource, lineMap = l:match("%-%- ([^:]-)%:(%d+)$")
 					if lineMap then
 						if extSource ~= source then
 							return indentation .. extSource .. ":" .. lineMap .. "(" .. extSource .. ":" .. line .. "):"
diff --git a/candran.lua b/candran.lua
index 31fbb23..114e6de 100644
--- a/candran.lua
+++ b/candran.lua
@@ -2933,7 +2933,7 @@ 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.7.0-dev" } -- candran.can:13
 candran["default"] = { -- candran.can:17
-["target"] = "lua53", -- candran.can:18
+["target"] = _VERSION == "Lua 5.1" and "luajit" or "lua53", -- candran.can:18
 ["indentation"] = "", -- candran.can:19
 ["newline"] = "\
 ", -- candran.can:20
@@ -3116,7 +3116,7 @@ for l in originalFile:gmatch("([^\
 ]*)") do -- candran.can:241
 i = i + 1 -- candran.can:242
 if i == line then -- candran.can:243
-local extSource, lineMap = l:match("%-%- (.-)%:(%d+)$") -- candran.can:244
+local extSource, lineMap = l:match("%-%- ([^:]-)%:(%d+)$") -- candran.can:244
 if lineMap then -- candran.can:245
 if extSource ~= source then -- candran.can:246
 return indentation .. extSource .. ":" .. lineMap .. "(" .. extSource .. ":" .. line .. "):" -- candran.can:247