1 files changed, 25 insertions, 38 deletions
diff --git a/lua/lexers/ini.lua b/lua/lexers/ini.lua
index 291f0b2..a2b107e 100644
--- a/lua/lexers/ini.lua
+++ b/lua/lexers/ini.lua
@@ -1,52 +1,39 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Ini 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 = 'ini'}
+local lex = lexer.new('ini')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
--- Comments.
-local comment = token(l.COMMENT, l.starts_line(S(';#')) * l.nonnewline^0)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match('true false on off yes no')))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, (lexer.alpha + '_') * (lexer.alnum + S('_.'))^0))
 
 -- Strings.
-local sq_str = l.delimited_range("'")
-local dq_str = l.delimited_range('"')
-local label = l.delimited_range('[]', true, true)
-local string = token(l.STRING, sq_str + dq_str + label)
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
--- Numbers.
-local dec = l.digit^1 * ('_' * l.digit^1)^0
-local oct_num = '0' * S('01234567_')^1
-local integer = S('+-')^-1 * (l.hex_num + oct_num + dec)
-local number = token(l.NUMBER, (l.float + integer))
+-- Labels.
+lex:add_rule('label', token(lexer.LABEL, lexer.range('[', ']', true)))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'true', 'false', 'on', 'off', 'yes', 'no'
-})
+-- Comments.
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol(lexer.starts_line(S(';#')))))
 
--- Identifiers.
-local word = (l.alpha + '_') * (l.alnum + S('_.'))^0
-local identifier = token(l.IDENTIFIER, word)
+-- Numbers.
+local dec = lexer.digit^1 * ('_' * lexer.digit^1)^0
+local oct_num = '0' * S('01234567_')^1
+local integer = S('+-')^-1 * (lexer.hex_num + oct_num + dec)
+lex:add_rule('number', token(lexer.NUMBER, lexer.float + integer))
 
 -- Operators.
-local operator = token(l.OPERATOR, '=')
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
-
-M._LEXBYLINE = true
+lex:add_rule('operator', token(lexer.OPERATOR, '='))
 
-return M
+return lex