1 files changed, 35 insertions, 51 deletions
diff --git a/lua/lexers/io_lang.lua b/lua/lexers/io_lang.lua
index 2a0f7f8..18648fc 100644
--- a/lua/lexers/io_lang.lua
+++ b/lua/lexers/io_lang.lua
@@ -1,66 +1,50 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Io 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 = 'io_lang'}
+local lex = lexer.new('io_lang')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local line_comment = (P('#') + '//') * l.nonnewline^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 tq_str = '"""' * (l.any - '"""')^0 * P('"""')^-1
-local string = token(l.STRING, tq_str + sq_str + dq_str)
-
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'block', 'method', 'while', 'foreach', 'if', 'else', 'do', 'super', 'self',
-  'clone', 'proto', 'setSlot', 'hasSlot', 'type', 'write', 'print', 'forward'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'block', 'method', 'while', 'foreach', 'if', 'else', 'do', 'super', 'self', 'clone', 'proto',
+  'setSlot', 'hasSlot', 'type', 'write', 'print', 'forward'
+}))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'Block', 'Buffer', 'CFunction', 'Date', 'Duration', 'File', 'Future', 'List',
-  'LinkedList', 'Map', 'Nop', 'Message', 'Nil', 'Number', 'Object', 'String',
-  'WeakLink'
-})
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'Block', 'Buffer', 'CFunction', 'Date', 'Duration', 'File', 'Future', 'LinkedList', 'List', 'Map',
+  'Message', 'Nil', 'Nop', 'Number', 'Object', 'String', 'WeakLink'
+}))
 
 -- 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('"')
+local tq_str = lexer.range('"""')
+lex:add_rule('string', token(lexer.STRING, tq_str + sq_str + dq_str))
+
+-- Comments.
+local line_comment = lexer.to_eol(P('#') + '//')
+local block_comment = lexer.range('/*', '*/')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
+
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S('`~@$%^&*-+/=\\<>?.,:;()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'[%(%)]', '/%*', '%*/', '#', '//'},
-  [l.OPERATOR] = {['('] = 1, [')'] = -1},
-  [l.COMMENT] = {
-    ['/*'] = 1, ['*/'] = -1, ['#'] = l.fold_line_comments('#'),
-    ['//'] = 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