1 files changed, 30 insertions, 45 deletions
diff --git a/lua/lexers/haskell.lua b/lua/lexers/haskell.lua
index 62ccd4a..9fd6631 100644
--- a/lua/lexers/haskell.lua
+++ b/lua/lexers/haskell.lua
@@ -1,60 +1,45 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Haskell LPeg lexer.
 -- Modified by Alex Suraci.
 
-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 = 'haskell'}
+local lex = lexer.new('haskell', {fold_by_indentation = true})
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
+lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.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)
+-- Keywords.
+lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+  'case', 'class', 'data', 'default', 'deriving', 'do', 'else', 'if', 'import', 'in', 'infix',
+  'infixl', 'infixr', 'instance', 'let', 'module', 'newtype', 'of', 'then', 'type', 'where', '_',
+  'as', 'qualified', 'hiding'
+}))
 
--- Strings.
-local string = token(l.STRING, l.delimited_range('"'))
+-- Types & type constructors.
+local word = (lexer.alnum + S("._'#"))^0
+local op = lexer.punct - S('()[]{}')
+lex:add_rule('type', token(lexer.TYPE, (lexer.upper * word) + (':' * (op^1 - ':'))))
 
--- Chars.
-local char = token(l.STRING, l.delimited_range("'", true))
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, (lexer.alpha + '_') * word))
 
--- Numbers.
-local number = token(l.NUMBER, l.float + l.integer)
+-- Strings.
+local sq_str = lexer.range("'", true)
+local dq_str = lexer.range('"')
+lex:add_rule('string', token(lexer.STRING, sq_str + dq_str))
 
--- Keywords.
-local keyword = token(l.KEYWORD, word_match{
-  'case', 'class', 'data', 'default', 'deriving', 'do', 'else', 'if', 'import',
-  'in', 'infix', 'infixl', 'infixr', 'instance', 'let', 'module', 'newtype',
-  'of', 'then', 'type', 'where', '_', 'as', 'qualified', 'hiding'
-})
+-- Comments.
+local line_comment = lexer.to_eol('--', true)
+local block_comment = lexer.range('{-', '-}')
+lex:add_rule('comment', token(lexer.COMMENT, line_comment + block_comment))
 
--- Identifiers.
-local word = (l.alnum + S("._'#"))^0
-local identifier = token(l.IDENTIFIER, (l.alpha + '_') * word)
+-- Numbers.
+lex:add_rule('number', token(lexer.NUMBER, lexer.number))
 
 -- Operators.
-local op = l.punct - S('()[]{}')
-local operator = token(l.OPERATOR, op)
+lex:add_rule('operator', token(lexer.OPERATOR, op))
 
--- Types & type constructors.
-local constructor = token(l.TYPE, (l.upper * word) + (P(":") * (op^1 - P(":"))))
-
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'type', constructor},
-  {'identifier', identifier},
-  {'string', string},
-  {'char', char},
-  {'comment', comment},
-  {'number', number},
-  {'operator', operator},
-}
-
-M._FOLDBYINDENTATION = true
-
-return M
+return lex