1 files changed, 47 insertions, 67 deletions
diff --git a/lua/lexers/csharp.lua b/lua/lexers/csharp.lua
index cdae6ab..1d209ed 100644
--- a/lua/lexers/csharp.lua
+++ b/lua/lexers/csharp.lua
@@ -1,84 +1,64 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- C# 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 = 'csharp'}
+local lex = lexer.new('csharp')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
+
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'class', 'delegate', 'enum', 'event', 'interface', 'namespace', 'struct', 'using', 'abstract',
+  'const', 'explicit', 'extern', 'fixed', 'implicit', 'internal', 'lock', 'out', 'override',
+  'params', 'partial', 'private', 'protected', 'public', 'ref', 'sealed', 'static', 'readonly',
+  'unsafe', 'virtual', 'volatile', 'add', 'as', 'assembly', 'base', 'break', 'case', 'catch',
+  'checked', 'continue', 'default', 'do', 'else', 'finally', 'for', 'foreach', 'get', 'goto', 'if',
+  'in', 'is', 'new', 'remove', 'return', 'set', 'sizeof', 'stackalloc', 'super', 'switch', 'this',
+  'throw', 'try', 'typeof', 'unchecked', 'value', 'var', 'void', 'while', 'yield', 'null', 'true',
+  'false'
+}))
+
+-- Types.
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'bool', 'byte', 'char', 'decimal', 'double', 'float', 'int', 'long', 'object', 'operator',
+  'sbyte', 'short', 'string', 'uint', 'ulong', 'ushort'
+}))
+
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
 -- 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)
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
 -- Strings.
-local sq_str = l.delimited_range("'", true)
-local dq_str = l.delimited_range('"', true)
-local ml_str = P('@')^-1 * l.delimited_range('"', false, true)
-local string = token(l.STRING, sq_str + dq_str + ml_str)
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"', true)
+local ml_str = P('@')^-1 * lexer.range('"', false, false)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + ml_str))
 
 -- Numbers.
-local number = token(l.NUMBER, (l.float + l.integer) * S('lLdDfFMm')^-1)
+lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('lLdDfFmM')^-1))
 
 -- Preprocessor.
-local preproc_word = word_match{
-  'define', 'elif', 'else', 'endif', 'error', 'if', 'line', 'undef', 'warning',
-  'region', 'endregion'
-}
-local preproc = token(l.PREPROCESSOR,
-                      l.starts_line('#') * S('\t ')^0 * preproc_word *
-                      (l.nonnewline_esc^1 + l.space * l.nonnewline_esc^0))
-
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'class', 'delegate', 'enum', 'event', 'interface', 'namespace', 'struct',
-  'using', 'abstract', 'const', 'explicit', 'extern', 'fixed', 'implicit',
-  'internal', 'lock', 'out', 'override', 'params', 'partial', 'private',
-  'protected', 'public', 'ref', 'sealed', 'static', 'readonly', 'unsafe',
-  'virtual', 'volatile', 'add', 'as', 'assembly', 'base', 'break', 'case',
-  'catch', 'checked', 'continue', 'default', 'do', 'else', 'finally', 'for',
-  'foreach', 'get', 'goto', 'if', 'in', 'is', 'new', 'remove', 'return', 'set',
-  'sizeof', 'stackalloc', 'super', 'switch', 'this', 'throw', 'try', 'typeof',
-  'unchecked', 'value', 'void', 'while', 'yield',
-  'null', 'true', 'false'
-})
-
--- Types.
-local type = token(l.TYPE, word_match{
-  'bool', 'byte', 'char', 'decimal', 'double', 'float', 'int', 'long', 'object',
-  'operator', 'sbyte', 'short', 'string', 'uint', 'ulong', 'ushort'
-})
-
--- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('preprocessor', token(lexer.PREPROCESSOR, '#' * S('\t ')^0 *
+  word_match('define elif else endif error if line undef warning region endregion')))
 
 -- Operators.
-local operator = token(l.OPERATOR, S('~!.,:;+-*/<>=\\^|&%?()[]{}'))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'preproc', preproc},
-  {'operator', operator},
-}
+lex:add_rule('operator', token(lexer.OPERATOR, S('~!.,:;+-*/<>=\\^|&%?()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'%l+', '[{}]', '/%*', '%*/', '//'},
-  [l.PREPROCESSOR] = {
-    region = 1, endregion = -1,
-    ['if'] = 1, ifdef = 1, ifndef = 1, endif = -1
-  },
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {['/*'] = 1, ['*/'] = -1, ['//'] = l.fold_line_comments('//')}
-}
+-- Fold points.
+lex:add_fold_point(lexer.PREPROCESSOR, 'if', 'endif')
+lex:add_fold_point(lexer.PREPROCESSOR, 'ifdef', 'endif')
+lex:add_fold_point(lexer.PREPROCESSOR, 'ifndef', 'endif')
+lex:add_fold_point(lexer.PREPROCESSOR, 'region', 'endregion')
+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