1 files changed, 27 insertions, 41 deletions
diff --git a/lua/lexers/faust.lua b/lua/lexers/faust.lua
index d685c49..ff47149 100644
--- a/lua/lexers/faust.lua
+++ b/lua/lexers/faust.lua
@@ -1,58 +1,44 @@
--- Copyright 2015-2017 David B. Lamkins <david@lamkins.net>. See LICENSE.
+-- Copyright 2015-2022 David B. Lamkins <david@lamkins.net>. See LICENSE.
 -- Faust LPeg lexer, see http://faust.grame.fr/
 
-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 = 'faust'}
+local lex = lexer.new('faust')
 
 -- 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^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{
+  'declare', 'import', 'mdoctags', 'dependencies', 'distributed', 'inputs', 'outputs', 'par', 'seq',
+  'sum', 'prod', 'xor', 'with', 'environment', 'library', 'component', 'ffunction', 'fvariable',
+  'fconstant', 'int', 'float', 'case', 'waveform', 'h:', 'v:', 't:'
+}))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-local string = token(l.STRING, l.delimited_range('"', true))
+lex:add_rule('string', token(lexer.STRING, lexer.range('"', true)))
+
+-- Comments.
+local line_comment = lexer.to_eol('//')
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Numbers.
-local int = R('09')^1
+local int = lexer.digit^1
 local rad = P('.')
 local exp = (P('e') * S('+-')^-1 * int)^-1
 local flt = int * (rad * int)^-1 * exp + int^-1 * rad * int * exp
-local number = token(l.NUMBER, flt + int)
+lex:add_rule('number', token(lexer.NUMBER, flt + int))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'declare', 'import', 'mdoctags', 'dependencies', 'distributed', 'inputs',
-  'outputs', 'par', 'seq', 'sum', 'prod', 'xor', 'with', 'environment',
-  'library', 'component', 'ffunction', 'fvariable', 'fconstant', 'int', 'float',
-  'case', 'waveform', 'h:', 'v:', 't:'
-})
-
--- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+-- Pragmas.
+lex:add_rule('pragma', token(lexer.PREPROCESSOR, lexer.range('<mdoc>', '</mdoc>')))
 
 -- Operators.
-local punct = S('+-/*%<>~!=^&|?~:;,.()[]{}@#$`\\\'')
-local operator = token(l.OPERATOR, punct)
+lex:add_rule('operator', token(lexer.OPERATOR, S('+-/*%<>~!=^&|?~:;,.()[]{}@#$`\\\'')))
 
--- Pragmas.
-local mdoc = P('<mdoc>') * (l.any - P('</mdoc>'))^0 * P('</mdoc>')
-local pragma = token(l.PREPROCESSOR, mdoc)
-
-M._rules = {
-  {'whitespace', ws},
-  {'comment', comment},
-  {'pragma', pragma},
-  {'keyword', keyword},
-  {'number', number},
-  {'operator', operator},
-  {'identifier', identifier},
-  {'string', string},
-}
-
-return M
+return lex