Skip to content

Fix Lua keywords #9

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Lua keywords #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b13fbf7
test/lexers.lua: add the "Keywords II" test
E-Fir Nov 7, 2022
b6c7f25
src/lexers/init.lua: compile_keywords: fix the resulting pattern
E-Fir Nov 7, 2022
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
3 changes: 1 addition & 2 deletions src/lexers/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ local function compile_keywords(context, keywords)
pattern = pattern and (pattern + p) or p
end
local B = context.word_boundary or B
local BB = lpeg.B(B, 1) + SOS -- starting boundary
local AB = B + EOS -- ending boundary
return BB * pattern * AB
return pattern * AB
end

-- Closure to define token type given name and LPeg pattern.
Expand Down
61 changes: 61 additions & 0 deletions test/lexers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,67 @@ check_tokens(lxsh.lexers.lua.gmatch(keywords), {
{ 'keyword', 'while' },
})

-- Keywords II. {{{2
local code_with_keywords = [[if true and not false or nil then
repeat
break
until true
elseif 1 then
local a = 1
else
for k, v in pairs(_G) do
local f = function() end
end
end

while true do end

return 1]]

check_tokens(lxsh.lexers.lua.gmatch(code_with_keywords), {
{ 'keyword', 'if' }, { 'whitespace', ' ' },
{ 'constant', 'true' }, { 'whitespace', ' ' },
{ 'operator', 'and' }, { 'whitespace', ' ' },
{ 'operator', 'not' }, { 'whitespace', ' ' },
{ 'constant', 'false' }, { 'whitespace', ' ' },
{ 'operator', 'or' }, { 'whitespace', ' ' },
{ 'constant', 'nil' }, { 'whitespace', ' ' },
{ 'keyword', 'then' }, { 'whitespace', '\n ' },
{ 'keyword', 'repeat' }, { 'whitespace', '\n ' },
{ 'keyword', 'break' }, { 'whitespace', '\n ' },
{ 'keyword', 'until' }, { 'whitespace', ' ' },
{ 'constant', 'true' }, { 'whitespace', '\n' },
{ 'keyword', 'elseif' }, { 'whitespace', ' ' },
{ 'number', '1' }, { 'whitespace', ' ' },
{ 'keyword', 'then' }, { 'whitespace', '\n ' },
{ 'keyword', 'local' }, { 'whitespace', ' ' },
{ 'identifier', 'a' }, { 'whitespace', ' ' },
{ 'operator', '=' }, { 'whitespace', ' ' },
{ 'number', '1' }, { 'whitespace', '\n' },
{ 'keyword', 'else' }, { 'whitespace', '\n ' },
{ 'keyword', 'for' }, { 'whitespace', ' ' },
{ 'identifier', 'k' }, { 'operator', ',' }, { 'whitespace', ' ' },
{ 'identifier', 'v' }, { 'whitespace', ' ' },
{ 'keyword', 'in' }, { 'whitespace', ' ' },
{ 'identifier', 'pairs' }, { 'operator', '(' }, { 'identifier', '_G' },
{ 'operator', ')' }, { 'whitespace', ' ' },
{ 'keyword', 'do' }, { 'whitespace', '\n ' },
{ 'keyword', 'local' }, { 'whitespace', ' ' },
{ 'identifier', 'f' }, { 'whitespace', ' ' },
{ 'operator', '=' }, { 'whitespace', ' ' },
{ 'keyword', 'function' }, { 'operator', '(' }, { 'operator', ')' },
{ 'whitespace', ' ' },
{ 'keyword', 'end' }, { 'whitespace', '\n ' },
{ 'keyword', 'end' }, { 'whitespace', '\n' },
{ 'keyword', 'end' }, { 'whitespace', '\n\n' },
{ 'keyword', 'while' }, { 'whitespace', ' ' },
{ 'constant', 'true' }, { 'whitespace', ' ' },
{ 'keyword', 'do' }, { 'whitespace', ' ' },
{ 'keyword', 'end' }, { 'whitespace', '\n\n' },
{ 'keyword', 'return' }, { 'whitespace', ' ' },
{ 'number', '1' },
})

-- Identifiers. {{{2
check_tokens(lxsh.lexers.lua.gmatch('io.write'), {
{ 'identifier', 'io' },
Expand Down