1 files changed, 41 insertions, 57 deletions
diff --git a/lua/lexers/actionscript.lua b/lua/lexers/actionscript.lua
index e92ab75..24aef11 100644
--- a/lua/lexers/actionscript.lua
+++ b/lua/lexers/actionscript.lua
@@ -1,75 +1,59 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Actionscript 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 = 'actionscript'}
+local lex = lexer.new('actionscript')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local line_comment = '//' * 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("'", true)
-local dq_str = l.delimited_range('"', true)
-local ml_str = '<![CDATA[' * (l.any - ']]>')^0 * ']]>'
-local string = token(l.STRING, sq_str + dq_str + ml_str)
-
--- Numbers.
-local number = token(l.NUMBER, (l.float + l.integer) * S('LlUuFf')^-2)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'break', 'continue', 'delete', 'do', 'else', 'for', 'function', 'if', 'in',
-  'new', 'on', 'return', 'this', 'typeof', 'var', 'void', 'while', 'with',
-  'NaN', 'Infinity', 'false', 'null', 'true', 'undefined',
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'break', 'continue', 'delete', 'do', 'else', 'for', 'function', 'if', 'in', 'new', 'on', 'return',
+  'this', 'typeof', 'var', 'void', 'while', 'with', 'NaN', 'Infinity', 'false', 'null', 'true',
+  'undefined',
   -- Reserved for future use.
-  'abstract', 'case', 'catch', 'class', 'const', 'debugger', 'default',
-  'export', 'extends', 'final', 'finally', 'goto', 'implements', 'import',
-  'instanceof', 'interface', 'native', 'package', 'private', 'Void',
-  'protected', 'public', 'dynamic', 'static', 'super', 'switch', 'synchonized',
-  'throw', 'throws', 'transient', 'try', 'volatile'
-})
+  'abstract', 'case', 'catch', 'class', 'const', 'debugger', 'default', 'export', 'extends',
+  'final', 'finally', 'goto', 'implements', 'import', 'instanceof', 'interface', 'native',
+  'package', 'private', 'Void', 'protected', 'public', 'dynamic', 'static', 'super', 'switch',
+  'synchonized', 'throw', 'throws', 'transient', 'try', 'volatile'
+}))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'Array', 'Boolean', 'Color', 'Date', 'Function', 'Key', 'MovieClip', 'Math',
-  'Mouse', 'Number', 'Object', 'Selection', 'Sound', 'String', 'XML', 'XMLNode',
-  'XMLSocket',
+lex:add_rule('type', token(lexer.TYPE, word_match{
+  'Array', 'Boolean', 'Color', 'Date', 'Function', 'Key', 'MovieClip', 'Math', 'Mouse', 'Number',
+  'Object', 'Selection', 'Sound', 'String', 'XML', 'XMLNode', 'XMLSocket',
   -- Reserved for future use.
   'boolean', 'byte', 'char', 'double', 'enum', 'float', 'int', 'long', 'short'
-})
+}))
 
 -- 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 ml_str = lexer.range('<![CDATA[', ']]>')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + ml_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},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number * S('LlUuFf')^-2))
+
+-- Operators.
+lex:add_rule('operator', token(lexer.OPERATOR, S('=!<>+-/*%&|^~.,;?()[]{}')))
 
-M._foldsymbols = {
-  _patterns = {'[{}]', '/%*', '%*/', '//', '<!%[CDATA%[', '%]%]>'},
-  [l.OPERATOR] = {['{'] = 1, ['}'] = -1},
-  [l.COMMENT] = {
-    ['/*'] = 1, ['*/'] = -1, ['//'] = l.fold_line_comments('//')
-  },
-  [l.STRING] = {['<![CDATA['] = 1, [']]>'] = -1}
-}
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '{', '}')
+lex:add_fold_point(lexer.COMMENT, '/*', '*/')
+lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))
+lex:add_fold_point(lexer.STRING, '<![CDATA[', ']]>')
 
-return M
+return lex