1 files changed, 42 insertions, 56 deletions

diff --git a/lua/lexers/vala.lua b/lua/lexers/vala.lua
index 51e30fa..4ff50b0 100644
--- a/lua/lexers/vala.lua
+++ b/lua/lexers/vala.lua
@@ -1,75 +1,61 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Vala LPeg lexer.
 
-local l = require('lexer')
-local token, word_match = l.token, l.word_match
-local P, R, S = lpeg.P, lpeg.R, lpeg.S
+local lexer = require('lexer')
+local token, word_match = lexer.token, lexer.word_match
+local P, S = lpeg.P, lpeg.S
 
-local M = {_NAME = 'vala'}
+local lex = lexer.new('vala')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local line_comment = '//' * l.nonnewline_esc^0
-local block_comment = '/*' * (l.any - '*/')^0 * P('*/')^-1
-local comment = token(l.COMMENT, line_comment + block_comment)
-
--- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local tq_str = '"""' * (l.any - '"""')^0 * P('"""')^-1
-local ml_str = '@' * l.delimited_range('"', false, true)
-local string = token(l.STRING, tq_str + sq_str + dq_str + ml_str)
-
--- Numbers.
-local number = token(l.NUMBER, (l.float + l.integer) * S('uUlLfFdDmM')^-1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'class', 'delegate', 'enum', 'errordomain', 'interface', 'namespace',
-  'signal', 'struct', 'using',
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'class', 'delegate', 'enum', 'errordomain', 'interface', 'namespace', 'signal', 'struct', 'using',
   -- Modifiers.
-  'abstract', 'const', 'dynamic', 'extern', 'inline', 'out', 'override',
-  'private', 'protected', 'public', 'ref', 'static', 'virtual', 'volatile',
-  'weak',
+  'abstract', 'const', 'dynamic', 'extern', 'inline', 'out', 'override', 'private', 'protected',
+  'public', 'ref', 'static', 'virtual', 'volatile', 'weak',
   -- Other.
-  'as', 'base', 'break', 'case', 'catch', 'construct', 'continue', 'default',
-  'delete', 'do', 'else', 'ensures', 'finally', 'for', 'foreach', 'get', 'if',
-  'in', 'is', 'lock', 'new', 'requires', 'return', 'set', 'sizeof', 'switch',
-  'this', 'throw', 'throws', 'try', 'typeof', 'value', 'var', 'void', 'while',
+  'as', 'base', 'break', 'case', 'catch', 'construct', 'continue', 'default', 'delete', 'do',
+  'else', 'ensures', 'finally', 'for', 'foreach', 'get', 'if', 'in', 'is', 'lock', 'new',
+  'requires', 'return', 'set', 'sizeof', 'switch', 'this', 'throw', 'throws', 'try', 'typeof',
+  'value', 'var', 'void', 'while',
   -- Etc.
   'null', 'true', 'false'
-})
+}))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'bool', 'char', 'double', 'float', 'int', 'int8', 'int16', 'int32', 'int64',
-  'long', 'short', 'size_t', 'ssize_t', 'string', 'uchar', 'uint', 'uint8',
-  'uint16', 'uint32', 'uint64', 'ulong', 'unichar', 'ushort'
-})
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'bool', 'char', 'double', 'float', 'int', 'int8', 'int16', 'int32', 'int64', 'long', 'short',
+  'size_t', 'ssize_t', 'string', 'uchar', 'uint', 'uint8', 'uint16', 'uint32', 'uint64', 'ulong',
+  'unichar', 'ushort'
+}))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
--- Operators.
-local operator = token(l.OPERATOR, S('+-/*%<>!=^&|?~:;.()[]{}'))
+-- Strings.
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+local tq_str = lexer.range('"""')
+local ml_str = '@' * lexer.range('"', false, false)
+lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str + ml_str))
+
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('uUlLfFdDmM')^-1))
+
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%<>!=^&|?~:;.()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'[{}]', '/%*', '%*/', '//'},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['/*'] = 1, ['*/'] = -1, ['//'] = l.fold_line_comments('//')}
-}
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
 
-return M
+return lex