Skip to content

Fix bug in tokenizer #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
levno-710 merged 1 commit into from
Aug 18, 2022
Merged

Fix bug in tokenizer #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/prometheus/parser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion src/prometheus/pipeline.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 1 addition & 40 deletions src/prometheus/tokenizer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down