1 files changed, 40 insertions, 55 deletions
diff --git a/lua/lexers/dot.lua b/lua/lexers/dot.lua
index aa09fa7..19c4b60 100644
--- a/lua/lexers/dot.lua
+++ b/lua/lexers/dot.lua
@@ -1,71 +1,56 @@
--- Copyright 2006-2017 Brian "Sir Alaran" Schott. See LICENSE.
+-- Copyright 2006-2022 Brian "Sir Alaran" Schott. See LICENSE.
 -- Dot LPeg lexer.
 -- Based off of lexer code by Mitchell.
 
-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 = 'dot'}
+local lex = lexer.new('dot')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.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)
-
--- Strings.
-local sq_str = l.delimited_range("'")
-local dq_str = l.delimited_range('"')
-local string = token(l.STRING, sq_str + dq_str)
-
--- Numbers.
-local number = token(l.NUMBER, l.digit^1 + l.float)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'graph', 'node', 'edge', 'digraph', 'fontsize', 'rankdir',
-  'fontname', 'shape', 'label', 'arrowhead', 'arrowtail', 'arrowsize',
-  'color', 'comment', 'constraint', 'decorate', 'dir', 'headlabel', 'headport',
-  'headURL', 'labelangle', 'labeldistance', 'labelfloat', 'labelfontcolor',
-  'labelfontname', 'labelfontsize', 'layer', 'lhead', 'ltail', 'minlen',
-  'samehead', 'sametail', 'style', 'taillabel', 'tailport', 'tailURL', 'weight',
-  'subgraph'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'graph', 'node', 'edge', 'digraph', 'fontsize', 'rankdir', 'fontname', 'shape', 'label',
+  'arrowhead', 'arrowtail', 'arrowsize', 'color', 'comment', 'constraint', 'decorate', 'dir',
+  'headlabel', 'headport', 'headURL', 'labelangle', 'labeldistance', 'labelfloat', 'labelfontcolor',
+  'labelfontname', 'labelfontsize', 'layer', 'lhead', 'ltail', 'minlen', 'samehead', 'sametail',
+  'style', 'taillabel', 'tailport', 'tailURL', 'weight', 'subgraph'
+}))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-	'box', 'polygon', 'ellipse', 'circle', 'point', 'egg', 'triangle',
-	'plaintext', 'diamond', 'trapezium', 'parallelogram', 'house', 'pentagon',
-	'hexagon', 'septagon', 'octagon', 'doublecircle', 'doubleoctagon',
-	'tripleoctagon', 'invtriangle', 'invtrapezium', 'invhouse', 'Mdiamond',
-	'Msquare', 'Mcircle', 'rect', 'rectangle', 'none', 'note', 'tab', 'folder',
-	'box3d', 'record'
-})
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  '	box', 'polygon', 'ellipse', 'circle', 'point', 'egg', 'triangle', 'plaintext', 'diamond',
+  'trapezium', 'parallelogram', 'house', 'pentagon', 'hexagon', 'septagon', 'octagon',
+  'doublecircle', 'doubleoctagon', 'tripleoctagon', 'invtriangle', 'invtrapezium', 'invhouse',
+  'Mdiamond', 'Msquare', 'Mcircle', 'rect', 'rectangle', 'none', 'note', 'tab', 'folder', 'box3d',
+  'record'
+}))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
--- Operators.
-local operator = token(l.OPERATOR, S('->()[]{};'))
+-- Strings.
+local sq_str = lexer.range("'")
+local dq_str = lexer.range('"')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
+
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
-M._rules = {
-  {'whitespace', ws},
-  {'comment', comment},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'number', number},
-  {'string', string},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.dec_num + lexer.float))
+
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S('->()[]{};')))
 
-M._foldsymbols = {
-  _patterns = {'[{}]', '/%*', '%*/', '//'},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['/*'] = 1, ['*/'] = -1, ['//'] = l.fold_line_comments('//')}
-}
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
 
-return M
+return lex