1 files changed, 42 insertions, 59 deletions
diff --git a/lua/lexers/go.lua b/lua/lexers/go.lua
index 5eaeedb..e440422 100644
--- a/lua/lexers/go.lua
+++ b/lua/lexers/go.lua
@@ -1,78 +1,61 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Go 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 = 'go'}
+local lex = lexer.new('go')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local line_comment = '//' * l.nonnewline^0
-local block_comment = '/*' * (l.any - '*/')^0 * '*/'
-local comment = token(l.COMMENT, line_comment + block_comment)
-
--- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local raw_str = l.delimited_range('`', false, true)
-local string = token(l.STRING, sq_str + dq_str + raw_str)
-
--- Numbers.
-local number = token(l.NUMBER, (l.float + l.integer) * P('i')^-1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'break', 'case', 'chan', 'const', 'continue', 'default', 'defer', 'else',
-  'fallthrough', 'for', 'func', 'go', 'goto', 'if', 'import', 'interface',
-  'map', 'package', 'range', 'return', 'select', 'struct', 'switch', 'type',
-  'var'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'break', 'case', 'chan', 'const', 'continue', 'default', 'defer', 'else', 'fallthrough', 'for',
+  'func', 'go', 'goto', 'if', 'import', 'interface', 'map', 'package', 'range', 'return', 'select',
+  'struct', 'switch', 'type', 'var'
+}))
 
 -- Constants.
-local constant = token(l.CONSTANT, word_match{
-  'true', 'false', 'iota', 'nil'
-})
+lex:add_rule('constant', token(lexer.CONSTANT, word_match('true false iota nil')))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'bool', 'byte', 'complex64', 'complex128', 'error', 'float32', 'float64',
-  'int', 'int8', 'int16', 'int32', 'int64', 'rune', 'string', 'uint', 'uint8',
-  'uint16', 'uint32', 'uint64', 'uintptr'
-})
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'any', 'bool', 'byte', 'comparable', 'complex64', 'complex128', 'error', 'float32', 'float64',
+  'int', 'int8', 'int16', 'int32', 'int64', 'rune', 'string', 'uint', 'uint8', 'uint16', 'uint32',
+  'uint64', 'uintptr'
+}))
 
 -- Functions.
-local func = token(l.FUNCTION, word_match{
-  'append', 'cap', 'close', 'complex', 'copy', 'delete', 'imag', 'len', 'make',
-  'new', 'panic', 'print', 'println', 'real', 'recover'
-})
+lex:add_rule('function', token(lexer.FUNCTION, word_match{
+  'append', 'cap', 'close', 'complex', 'copy', 'delete', 'imag', 'len', 'make', 'new', 'panic',
+  'print', 'println', 'real', 'recover'
+}))
 
 -- 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("'", true)
+local dq_str = lexer.range('"', true)
+local raw_str = lexer.range('`', false, false)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + raw_str))
+
+-- Comments.
+local line_comment = lexer.to_eol('//')
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'constant', constant},
-  {'type', type},
-  {'function', func},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number * P('i')^-1))
+
+-- 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