1 files changed, 17 insertions, 28 deletions
diff --git a/lua/lexers/asp.lua b/lua/lexers/asp.lua
index 6fb5800..a16f4b6 100644
--- a/lua/lexers/asp.lua
+++ b/lua/lexers/asp.lua
@@ -1,42 +1,31 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- ASP 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 = 'asp'}
-
--- Embedded in HTML.
-local html = l.load('html')
+local html = lexer.load('html')
+local lex = lexer.new('asp', {inherit = html}) -- proxy for HTML
 
 -- Embedded VB.
-local vb = l.load('vb')
+local vb = lexer.load('vb')
 local vb_start_rule = token('asp_tag', '<%' * P('=')^-1)
 local vb_end_rule = token('asp_tag', '%>')
-l.embed_lexer(html, vb, vb_start_rule, vb_end_rule)
+lex:embed(vb, vb_start_rule, vb_end_rule)
+lex:add_style('asp_tag', lexer.styles.embedded)
 
 -- Embedded VBScript.
-local vbs = l.load('vbscript')
-local script_element = word_match({'script'}, nil, html.case_insensitive_tags)
+local vbs = lexer.load('vb', 'vbscript')
+local script_element = word_match('script', true)
 local vbs_start_rule = #(P('<') * script_element * (P(function(input, index)
   if input:find('^%s+language%s*=%s*(["\'])vbscript%1', index) or
-     input:find('^%s+type%s*=%s*(["\'])text/vbscript%1', index) then
-    return index
-  end
+    input:find('^%s+type%s*=%s*(["\'])text/vbscript%1', index) then return index end
 end) + '>')) * html.embed_start_tag -- <script language="vbscript">
-local vbs_end_rule = #('</' * script_element * l.space^0 * '>') *
-                     html.embed_end_tag -- </script>
-l.embed_lexer(html, vbs, vbs_start_rule, vbs_end_rule)
-
-M._tokenstyles = {
-  asp_tag = l.STYLE_EMBEDDED
-}
+local vbs_end_rule = #('</' * script_element * lexer.space^0 * '>') * html.embed_end_tag -- </script>
+lex:embed(vbs, vbs_start_rule, vbs_end_rule)
 
-local _foldsymbols = html._foldsymbols
-_foldsymbols._patterns[#_foldsymbols._patterns + 1] = '<%%'
-_foldsymbols._patterns[#_foldsymbols._patterns + 1] = '%%>'
-_foldsymbols.asp_tag = {['<%'] = 1, ['%>'] = -1}
-M._foldsymbols = _foldsymbols
+-- Fold points.
+lex:add_fold_point('asp_tag', '<%', '%>')
 
-return M
+return lex