From 924a46e15e5296f930159534d8a4e1385114e0e0 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Wed, 6 Apr 2016 23:45:24 +0200
Subject: sync with Context as of 2016-04-06

---
 lualibs-lua.lua | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lualibs-lua.lua')

diff --git a/lualibs-lua.lua b/lualibs-lua.lua
index cb61829..b90f37e 100644
--- a/lualibs-lua.lua
+++ b/lualibs-lua.lua
@@ -19,12 +19,20 @@ if not modules then modules = { } end modules ['l-lua'] = {
 
 -- compatibility hacksand helpers
 
-local major, minor = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$")
+_MAJORVERSION, _MINORVERSION = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$")
 
-_MAJORVERSION = tonumber(major) or 5
-_MINORVERSION = tonumber(minor) or 1
+_MAJORVERSION = tonumber(_MAJORVERSION) or 5
+_MINORVERSION = tonumber(_MINORVERSION) or 1
 _LUAVERSION   = _MAJORVERSION + _MINORVERSION/10
 
+if _LUAVERSION < 5.2 and jit then
+    --
+    -- we want loadstring cum suis to behave like 5.2
+    --
+    _MINORVERSION = 2
+    _LUAVERSION   = 5.2
+end
+
 -- lpeg
 
 if not lpeg then
-- 
cgit v1.2.3