1 files changed, 29 insertions, 47 deletions
diff --git a/lua/lexers/smalltalk.lua b/lua/lexers/smalltalk.lua
index a5d22d5..982a514 100644
--- a/lua/lexers/smalltalk.lua
+++ b/lua/lexers/smalltalk.lua
@@ -1,62 +1,44 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Smalltalk 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 = 'smalltalk'}
+local lex = lexer.new('smalltalk')
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local comment = token(l.COMMENT, l.delimited_range('"', false, true))
-
--- Strings.
-local sq_str = l.delimited_range("'")
-local literal = '$' * l.word
-local string = token(l.STRING, sq_str + literal)
-
--- 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{
-  'true', 'false', 'nil', 'self', 'super', 'isNil', 'not', 'Smalltalk',
-  'Transcript'
-})
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match(
+  'true false nil self super isNil not Smalltalk Transcript')))
 
 -- Types.
-local type = token(l.TYPE, word_match{
-  'Date', 'Time', 'Boolean', 'True', 'False', 'Character', 'String', 'Array',
-  'Symbol', 'Integer', 'Object'
-})
+lex:add_rule('type', token(lexer.TYPE, word_match(
+  'Date Time Boolean True False Character String Array Symbol Integer Object')))
 
 -- Identifiers.
-local identifier = token(l.IDENTIFIER, l.word)
+lex:add_rule('identifier', token(lexer.IDENTIFIER, lexer.word))
+
+-- Strings.
+local sq_str = lexer.range("'")
+local word_str = '$' * lexer.word
+lex:add_rule('string', token(lexer.STRING, sq_str + word_str))
+
+-- Comments.
+lex:add_rule('comment', token(lexer.COMMENT, lexer.range('"', false, false)))
+
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
-local operator = token(l.OPERATOR, S(':=_<>+-/*!()[]'))
+lex:add_rule('operator', token(lexer.OPERATOR, S(':=_<>+-/*!()[]')))
 
 -- Labels.
-local label = token(l.LABEL, '#' * l.word)
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', type},
-  {'identifier', identifier},
-  {'string', string},
-  {'comment', comment},
-  {'number', number},
-  {'label', label},
-  {'operator', operator},
-}
-
-M._foldsymbols = {
-  _patterns = {'[%[%]]'},
-  [l.OPERATOR] = {['['] = 1, [']'] = -1}
-}
-
-return M
+lex:add_rule('label', token(lexer.LABEL, '#' * lexer.word))
+
+-- Fold points.
+lex:add_fold_point(lexer.OPERATOR, '[', ']')
+
+return lex