1 files changed, 59 insertions, 74 deletions
diff --git a/lua/lexers/cpp.lua b/lua/lexers/cpp.lua
index ec3daad..73ee0b1 100644
--- a/lua/lexers/cpp.lua
+++ b/lua/lexers/cpp.lua
@@ -1,90 +1,75 @@
--- 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 = 'cpp'}
+local lex = lexer.new('cpp')
 
 -- 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 = P('L')^-1 * l.delimited_range("'", true)
-local dq_str = P('L')^-1 * l.delimited_range('"', true)
-local string = token(l.STRING, sq_str + dq_str)
-
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
-
--- Preprocessor.
-local preproc_word = word_match{
-  'define', 'elif', 'else', 'endif', 'error', 'if', 'ifdef', 'ifndef', 'import',
-  'line', 'pragma', 'undef', 'using', 'warning'
-}
-local preproc = #l.starts_line('#') *
-                (token(l.PREPROCESSOR, '#' * S('\t ')^0 * preproc_word) +
-                 token(l.PREPROCESSOR, '#' * S('\t ')^0 * 'include') *
-                 (token(l.WHITESPACE, S('\t ')^1) *
-                  token(l.STRING, l.delimited_range('<>', true, true)))^-1)
+local ws = token(lexer.WHITESPACE, lexer.space^1)
+lex:add_rule('whitespace', ws)
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'asm', 'auto', 'break', 'case', 'catch', 'class', 'const', 'const_cast',
-  'continue', 'default', 'delete', 'do', 'dynamic_cast', 'else', 'explicit',
-  'export', 'extern', 'false', 'for', 'friend', 'goto', 'if', 'inline',
-  'mutable', 'namespace', 'new', 'operator', 'private', 'protected', 'public',
-  'register', 'reinterpret_cast', 'return', 'sizeof', 'static', 'static_cast',
-  'switch', 'template', 'this', 'throw', 'true', 'try', 'typedef', 'typeid',
-  'typename', 'using', 'virtual', 'volatile', 'while',
-  -- Operators
-  'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', 'not_eq', 'or', 'or_eq',
-  'xor', 'xor_eq',
-  -- C++11
-  'alignas', 'alignof', 'constexpr', 'decltype', 'final', 'noexcept',
-  'override', 'static_assert', 'thread_local'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'asm', 'auto', 'break', 'case', 'catch', 'class', 'const', 'const_cast', 'continue', 'default',
+  'delete', 'do', 'dynamic_cast', 'else', 'explicit', 'export', 'extern', 'false', 'for', 'friend',
+  'goto', 'if', 'inline', 'mutable', 'namespace', 'new', 'operator', 'private', 'protected',
+  'public', 'register', 'reinterpret_cast', 'return', 'sizeof', 'static', 'static_cast', 'switch',
+  'template', 'this', 'throw', 'true', 'try', 'typedef', 'typeid', 'typename', 'using', 'virtual',
+  'volatile', 'while',
+  -- Operators.
+  'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', 'not_eq', 'or', 'or_eq', 'xor', 'xor_eq',
+  -- C++11.
+  'alignas', 'alignof', 'constexpr', 'decltype', 'final', 'noexcept', 'override', 'static_assert',
+  'thread_local'
+}))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'bool', 'char', 'double', 'enum', 'float', 'int', 'long', 'short', 'signed',
-  'struct', 'union', 'unsigned', 'void', 'wchar_t',
-  -- C++11
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'bool', 'char', 'double', 'enum', 'float', 'int', 'long', 'short', 'signed', 'struct', 'union',
+  'unsigned', 'void', 'wchar_t',
+  -- C++11.
   'char16_t', 'char32_t', 'nullptr'
-})
+}))
+
+-- Strings.
+local sq_str = P('L')^-1 * lexer.range("'", true)
+local dq_str = P('L')^-1 * lexer.range('"', true)
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
 
--- Operators.
-local operator = token(l.OPERATOR, S('+-/*%<>!=^&|?~:;,.()[]{}'))
+-- Comments.
+local line_comment = lexer.to_eol('//', true)
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
+
+-- Numbers.
+local dec = lexer.digit^1 * ("'" * lexer.digit^1)^0
+local hex = '0' * S('xX') * lexer.xdigit^1 * ("'" * lexer.xdigit^1)^0
+local bin = '0' * S('bB') * S('01')^1 * ("'" * S('01')^1)^0 * -lexer.xdigit
+local integer = S('+-')^-1 * (hex + bin + dec)
+lex:add_rule('number', token(lexer.NUMBER, lexer.float + integer))
+
+-- Preprocessor.
+local include = token(lexer.PREPROCESSOR, '#' * S('\t ')^0 * 'include') *
+  (ws * token(lexer.STRING, lexer.range('<', '>', true)))^-1
+local preproc = token(lexer.PREPROCESSOR, '#' * S('\t ')^0 *
+  word_match('define elif else endif error if ifdef ifndef import line pragma undef using warning'))
+lex:add_rule('preprocessor', include + preproc)
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'preproc', preproc},
-  {'operator', operator},
-}
+-- Operators.
+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.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
 
-return M
+return lex