1 files changed, 35 insertions, 53 deletions
diff --git a/lua/lexers/idl.lua b/lua/lexers/idl.lua
index a3ce325..9a2250c 100644
--- a/lua/lexers/idl.lua
+++ b/lua/lexers/idl.lua
@@ -1,68 +1,50 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- IDL 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 = 'idl'}
+local lex = lexer.new('idl')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.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)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'abstract', 'attribute', 'case', 'const', 'context', 'custom', 'default', 'enum', 'exception',
+  'factory', 'FALSE', 'in', 'inout', 'interface', 'local', 'module', 'native', 'oneway', 'out',
+  'private', 'public', 'raises', 'readonly', 'struct', 'support', 'switch', 'TRUE', 'truncatable',
+  'typedef', 'union', 'valuetype'
+}))
 
--- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local string = token(l.STRING, sq_str + dq_str)
+-- Types.
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'any', 'boolean', 'char', 'double', 'fixed', 'float', 'long', 'Object', 'octet', 'sequence',
+  'short', 'string', 'unsigned', 'ValueBase', 'void', 'wchar', 'wstring'
+}))
 
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
--- Preprocessor.
-local preproc_word = word_match{
-  'define', 'undef', 'ifdef', 'ifndef', 'if', 'elif', 'else', 'endif',
-  'include', 'warning', 'pragma'
-}
-local preproc = token(l.PREPROCESSOR,
-                      l.starts_line('#') * preproc_word * l.nonnewline^0)
+-- Strings.
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'abstract', 'attribute', 'case', 'const', 'context', 'custom', 'default',
-  'exception', 'enum', 'factory', 'FALSE', 'in', 'inout', 'interface', 'local',
-  'module', 'native', 'oneway', 'out', 'private', 'public', 'raises',
-  'readonly', 'struct', 'support', 'switch', 'TRUE', 'truncatable', 'typedef',
-  'union', 'valuetype'
-})
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
--- Types.
-local type = token(l.TYPE, word_match{
-  'any', 'boolean', 'char', 'double', 'fixed', 'float', 'long', 'Object',
-  'octet', 'sequence', 'short', 'string', 'unsigned', 'ValueBase', 'void',
-  'wchar', 'wstring'
-})
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
--- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+-- Preprocessor.
+lex:add_rule('preproc', token(lexer.PREPROCESSOR, lexer.starts_line('#') *
+  word_match('define undef ifdef ifndef if elif else endif include warning pragma')))
 
 -- Operators.
-local operator = token(l.OPERATOR, S('!<>=+-/*%&|^~.,:;?()[]{}'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'preprocessor', preproc},
-  {'operator', operator},
-}
+lex:add_rule('operator', token(lexer.OPERATOR, S('!<>=+-/*%&|^~.,:;?()[]{}')))
 
-return M
+return lex