1 files changed, 33 insertions, 52 deletions
diff --git a/lua/lexers/gtkrc.lua b/lua/lexers/gtkrc.lua
index bedc764..0dcbbd0 100644
--- a/lua/lexers/gtkrc.lua
+++ b/lua/lexers/gtkrc.lua
@@ -1,71 +1,52 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Gtkrc 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 = 'gtkrc'}
+local lex = lexer.new('gtkrc')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local comment = token(l.COMMENT, '#' * l.nonnewline^0)
-
--- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local string = token(l.STRING, sq_str + dq_str)
-
--- Numbers.
-local number = token(l.NUMBER, l.digit^1 * ('.' * l.digit^1)^-1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'binding', 'class', 'include', 'module_path', 'pixmap_path', 'im_module_file',
-  'style', 'widget', 'widget_class'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match(
+  'binding class include module_path pixmap_path im_module_file style widget widget_class')))
 
 -- Variables.
-local variable = token(l.VARIABLE, word_match{
-  'bg', 'fg', 'base', 'text', 'xthickness', 'ythickness', 'bg_pixmap', 'font',
-  'fontset', 'font_name', 'stock', 'color', 'engine'
-})
+lex:add_rule('variable', token(lexer.VARIABLE, word_match{
+  'bg', 'fg', 'base', 'text', 'xthickness', 'ythickness', 'bg_pixmap', 'font', 'fontset',
+  'font_name', 'stock', 'color', 'engine'
+}))
 
 -- States.
-local state = token(l.CONSTANT, word_match{
-  'ACTIVE', 'SELECTED', 'NORMAL', 'PRELIGHT', 'INSENSITIVE', 'TRUE', 'FALSE'
-})
+lex:add_rule('state',
+  token('state', word_match('ACTIVE SELECTED NORMAL PRELIGHT INSENSITIVE TRUE FALSE')))
+lex:add_style('state', lexer.styles.constant)
 
 -- Functions.
-local func = token(l.FUNCTION, word_match{
-  'mix', 'shade', 'lighter', 'darker'
-})
+lex:add_rule('function', token(lexer.FUNCTION, word_match('mix shade lighter darker')))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.alpha * (l.alnum + S('_-'))^0)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.alpha * (lexer.alnum + S('_-'))^0))
 
--- Operators.
-local operator = token(l.OPERATOR, S(':=,*()[]{}'))
+-- Strings.
+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('#')))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'variable', variable},
-  {'state', state},
-  {'function', func},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.digit^1 * ('.' * lexer.digit^1)^-1))
+
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S(':=,*()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'[{}]', '#'},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['#'] = l.fold_line_comments('#')}
-}
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('#'))
 
-return M
+return lex