1 files changed, 33 insertions, 28 deletions
diff --git a/lua/lexers/vb.lua b/lua/lexers/vb.lua
index 5289558..bc9d704 100644
--- a/lua/lexers/vb.lua
+++ b/lua/lexers/vb.lua
@@ -1,49 +1,31 @@
--- Copyright 2006-2022 Mitchell. See LICENSE.
+-- Copyright 2006-2024 Mitchell. See LICENSE.
 -- VisualBasic LPeg lexer.
 
-local lexer = require('lexer')
-local token, word_match = lexer.token, lexer.word_match
+local lexer = lexer
 local P, S = lpeg.P, lpeg.S
 
-local lex = lexer.new('vb', {case_insensitive_fold_points = true})
-
--- Whitespace.
-lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+local lex = lexer.new(..., {case_insensitive_fold_points = true})
 
 -- Keywords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match({
-  -- Control.
-  'If', 'Then', 'Else', 'ElseIf', 'While', 'Wend', 'For', 'To', 'Each', 'In', 'Step', 'Case',
-  'Select', 'Return', 'Continue', 'Do', 'Until', 'Loop', 'Next', 'With', 'Exit',
-  -- Operators.
-  'Mod', 'And', 'Not', 'Or', 'Xor', 'Is',
-  -- Storage types.
-  'Call', 'Class', 'Const', 'Dim', 'ReDim', 'Preserve', 'Function', 'Sub', 'Property', 'End', 'Set',
-  'Let', 'Get', 'New', 'Randomize', 'Option', 'Explicit', 'On', 'Error', 'Execute', 'Module',
-  -- Storage modifiers.
-  'Private', 'Public', 'Default',
-  -- Constants.
-  'Empty', 'False', 'Nothing', 'Null', 'True'
-}, true)))
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lex:word_match(lexer.KEYWORD, true)))
 
 -- Types.
-lex:add_rule('type', token(lexer.TYPE, word_match(
-  'Boolean Byte Char Date Decimal Double Long Object Short Single String', true)))
+lex:add_rule('type', lex:tag(lexer.TYPE, lex:word_match(lexer.TYPE, true)))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol("'" + word_match('rem', true))))
+lex:add_rule('comment', lex:tag(lexer.COMMENT, lexer.to_eol("'" + lexer.word_match('rem', true))))
 
 -- Identifiers.
-lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
+lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, lexer.range('"', true, false)))
+lex:add_rule('string', lex:tag(lexer.STRING, lexer.range('"', true, false)))
 
 -- Numbers.
-lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('LlUuFf')^-2))
+lex:add_rule('number', lex:tag(lexer.NUMBER, lexer.number * S('LlUuFf')^-2))
 
 -- Operators.
-lex:add_rule('operator', token(lexer.OPERATOR, S('=><+-*^&:.,_()')))
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('=><+-*^&:.,_()')))
 
 -- Fold points.
 lex:add_fold_point(lexer.KEYWORD, 'If', 'End If')
@@ -60,4 +42,27 @@ lex:add_fold_point(lexer.KEYWORD, 'Module', 'End Module')
 lex:add_fold_point(lexer.KEYWORD, 'Class', 'End Class')
 lex:add_fold_point(lexer.KEYWORD, 'Try', 'End Try')
 
+-- Word lists.
+lex:set_word_list(lexer.KEYWORD, {
+  -- Control.
+  'If', 'Then', 'Else', 'ElseIf', 'While', 'Wend', 'For', 'To', 'Each', 'In', 'Step', 'Case',
+  'Select', 'Return', 'Continue', 'Do', 'Until', 'Loop', 'Next', 'With', 'Exit',
+  -- Operators.
+  'Mod', 'And', 'Not', 'Or', 'Xor', 'Is',
+  -- Storage types.
+  'Call', 'Class', 'Const', 'Dim', 'ReDim', 'Preserve', 'Function', 'Sub', 'Property', 'End', 'Set',
+  'Let', 'Get', 'New', 'Randomize', 'Option', 'Explicit', 'On', 'Error', 'Execute', 'Module',
+  -- Storage modifiers.
+  'Private', 'Public', 'Default',
+  -- Constants.
+  'Empty', 'False', 'Nothing', 'Null', 'True'
+})
+
+lex:set_word_list(lexer.TYPE, {
+  'Boolean', 'Byte', 'Char', 'Date', 'Decimal', 'Double', 'Long', 'Object', 'Short', 'Single',
+  'String'
+})
+
+lexer.property['scintillua.comment'] = "'"
+
 return lex