diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-04-07 23:26:48 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2016-04-07 23:26:48 +0200 |
| commit | 0cf41dff08cdc61119a2598cf1fa501cd15bfc54 (patch) | |
| tree | cf5e7b2da764716b9d026550a69f7ec559937c89 /src/fontloader/misc/fontloader-l-lua.lua | |
| parent | 1b031eb27c3b5e2e45ed97e5be8c8d951f283462 (diff) | |
| download | luaotfload-0cf41dff08cdc61119a2598cf1fa501cd15bfc54.tar.gz | |
[fontloader] sync Context as of 2016-04-07
Diffstat (limited to 'src/fontloader/misc/fontloader-l-lua.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-l-lua.lua | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/fontloader/misc/fontloader-l-lua.lua b/src/fontloader/misc/fontloader-l-lua.lua index cb61829..b90f37e 100644 --- a/src/fontloader/misc/fontloader-l-lua.lua +++ b/src/fontloader/misc/fontloader-l-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 |