1 files changed, 31 insertions, 43 deletions
diff --git a/lua/lexers/gap.lua b/lua/lexers/gap.lua
index a4117d3..29cfdf9 100644
--- a/lua/lexers/gap.lua
+++ b/lua/lexers/gap.lua
@@ -1,56 +1,44 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Gap 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 = 'gap'}
+local lex = lexer.new('gap')
 
 -- 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.nonnewline^0)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'and', 'break', 'continue', 'do', 'elif', 'else', 'end', 'fail', 'false', 'fi', 'for', 'function',
+  'if', 'in', 'infinity', 'local', 'not', 'od', 'or', 'rec', 'repeat', 'return', 'then', 'true',
+  'until', 'while'
+}))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local string = token(l.STRING, sq_str + dq_str)
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
+
+-- Comments.
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Numbers.
-local number = token(l.NUMBER, l.digit^1 * -l.alpha)
+lex:add_rule('number', token(lexer.NUMBER, lexer.dec_num * -lexer.alpha))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'and', 'break', 'continue', 'do', 'elif', 'else', 'end', 'fail', 'false',
-  'fi', 'for', 'function', 'if', 'in', 'infinity', 'local', 'not', 'od', 'or',
-  'rec', 'repeat', 'return', 'then', 'true', 'until', 'while'
-})
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S('*+-,./:;<=>~^#()[]{}')))
 
--- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+-- Fold points.
+lex:add_fold_point(lexer.KEYWORD, 'function', 'end')
+lex:add_fold_point(lexer.KEYWORD, 'do', 'od')
+lex:add_fold_point(lexer.KEYWORD, 'if', 'fi')
+lex:add_fold_point(lexer.KEYWORD, 'repeat', 'until')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('#'))
 
--- Operators.
-local operator = token(l.OPERATOR, S('*+-,./:;<=>~^#()[]{}'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
-
-M._foldsymbols = {
-  _patterns = {'[a-z]+', '#'},
-  [l.KEYWORD] = {
-    ['function'] = 1, ['end'] = -1, ['do'] = 1, od = -1, ['if'] = 1, fi = -1,
-    ['repeat'] = 1, ['until'] = -1
-  },
-  [l.COMMENT] = {['#'] = l.fold_line_comments('#')}
-}
-
-return M
+return lex