diff --git a/src/prometheus/parser.lua b/src/prometheus/parser.lua index 7ff3ad5..7562fa2 100644 --- a/src/prometheus/parser.lua +++ b/src/prometheus/parser.lua @@ -56,7 +56,7 @@ local function generateWarning(token, message) end function Parser:new(settings) - local luaVersion = (settings and settings.LuaVersion) or LuaVersion.LuaU; + local luaVersion = (settings and (settings.luaVersion or settings.LuaVersion)) or LuaVersion.LuaU; local parser = { luaVersion = luaVersion, tokenizer = Tokenizer:new({ diff --git a/src/prometheus/pipeline.lua b/src/prometheus/pipeline.lua index b896b79..221ba5d 100644 --- a/src/prometheus/pipeline.lua +++ b/src/prometheus/pipeline.lua @@ -44,7 +44,7 @@ local Pipeline = { function Pipeline:new(settings) - local luaVersion = settings.luaVersion or Pipeline.DefaultSettings.LuaVersion; + local luaVersion = settings.luaVersion or settings.LuaVersion or Pipeline.DefaultSettings.LuaVersion; local conventions = Enums.Conventions[luaVersion]; if(not conventions) then logger:error("The Lua Version \"" .. luaVersion diff --git a/src/prometheus/tokenizer.lua b/src/prometheus/tokenizer.lua index 9f92107..7c544ba 100644 --- a/src/prometheus/tokenizer.lua +++ b/src/prometheus/tokenizer.lua @@ -430,46 +430,7 @@ function Tokenizer:multiLineString() local value = ""; while true do local char = get(self); - if(char == "\\") then - char = get(self); - - local escape = self.EscapeSequences[char]; - if(type(escape) == "string") then - char = escape; - - elseif(self.NumericalEscapes and self.NumberCharsLookup[char]) then - local numstr = char; - - if(is(self, self.NumberCharsLookup)) then - char = get(self); - numstr = numstr .. char; - end - - if(is(self, self.NumberCharsLookup)) then - char = get(self); - numstr = numstr .. char; - end - - char = string.char(tonumber(numstr)); - - elseif(self.UnicodeEscapes and char == "u") then - expect(self, "{"); - local num = ""; - while (is(self, self.HexNumberCharsLookup)) do - num = num .. get(self); - end - expect(self, "}"); - char = util.utf8char(tonumber(num, 16)); - elseif(self.HexEscapes and char == "x") then - local hex = expect(self, self.HexNumberCharsLookup) .. expect(self, self.HexNumberCharsLookup); - char = string.char(tonumber(hex, 16)); - elseif(self.EscapeZIgnoreNextWhitespace and char == "z") then - char = ""; - while(is(self, Tokenizer.WHITESPACE_CHARS)) do - self.index = self.index + 1; - end - end - elseif(char == ']') then + if(char == ']') then local eqCount2 = 0; while(is(self, "=")) do char = char .. get(self);