From 8a420ecc4c1ed50111464ec66901bd983eaf2dbd Mon Sep 17 00:00:00 2001
From: qiu-x <alex@alexslomka.xyz>
Date: Wed, 29 Jun 2022 07:56:51 +0200
Subject: Resync the lexers with Scintillua

- Resync the lexers with Scintillua

- Update the lexer readme

- Update `zenburn` theme to fix some highlighting issues

- lexers: redirect print function to vis:info()

- Fix support for custom style names

- As per error message "lexer.delimited_range() is deprecated, use lexer.range()".

- Remove remaining `lexer.delimited_range()` call

- Set syntax to `nil` if the file type has no matching lexer

- Updated Go lexer for Go 1.18.

- lexers/dsv: convert to new lexer format

  (cherry picked from commit 9edbc3cd9ea1d7142b1305840432a3d2739e755a)

- lexers/gemini: disable legacy gemini lexer

  This reverts commit 468f9ee1b027a7ce98b1a249fa1af5888feeb989.

  It is in legacy format and of questionable quality. Ideally it
  should be contributed upstream from where it will eventually
  trickle down to us.

- lexers/git-rebase: convert to new lexer format

  (cherry picked from commit 4000a4cc9ac4a4c2869dfae772b977a82aee8d8c)

- lexers/strace: convert to new lexer format

  (cherry picked from commit e420451320d97eb164f5629c1bcfab0b595be29d)

- lexers/typescript: add new upstream lexer revision 28e2b60

  (cherry picked from commit 7326e6deecdaa75fa94ae9ebdb653f9f907b33f2)

- use `package.searchpath` instead of a local `searchpath` function

- Restore `filetype: support filetype detection via hashbang`

- Remove redundant comment

- Restore gemini lexer
---
 lua/lexers/makefile.lua | 139 ++++++++++++++++++++----------------------------
 1 file changed, 59 insertions(+), 80 deletions(-)

(limited to 'lua/lexers/makefile.lua')

diff --git a/lua/lexers/makefile.lua b/lua/lexers/makefile.lua
index aaf2dc0..9c5f332 100644
--- a/lua/lexers/makefile.lua
+++ b/lua/lexers/makefile.lua
@@ -1,109 +1,88 @@
--- Copyright 2006-2017 Mitchell mitchell.att.foicica.com. See LICENSE.
+-- Copyright 2006-2022 Mitchell. See LICENSE.
 -- Makefile 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 = 'makefile'}
+local lex = lexer.new('makefile', {lex_by_line = true})
 
 -- Whitespace.
-local ws = token(l.WHITESPACE, l.space^1)
-
--- Comments.
-local comment = token(l.COMMENT, '#' * l.nonnewline^0)
+local ws = token(lexer.WHITESPACE, lexer.space^1)
+lex:add_rule('whitespace', ws)
 
 -- Keywords.
-local keyword = token(l.KEYWORD, P('!')^-1 * l.word_match({
+lex:add_rule('keyword', token(lexer.KEYWORD, P('!')^-1 * word_match({
   -- GNU Make conditionals.
   'ifeq', 'ifneq', 'ifdef', 'ifndef', 'else', 'endif',
   -- Other conditionals.
   'if', 'elseif', 'elseifdef', 'elseifndef',
   -- Directives and other keywords.
-  'define', 'endef', 'export', 'include', 'override', 'private', 'undefine',
-  'unexport', 'vpath'
-}, nil, true))
+  'define', 'endef', 'export', 'include', 'override', 'private', 'undefine', 'unexport', 'vpath'
+}, true)))
 
--- Functions.
-local func = token(l.FUNCTION, l.word_match({
-  -- Functions for String Substitution and Analysis.
-  'subst', 'patsubst', 'strip', 'findstring', 'filter', 'filter-out', 'sort',
-  'word', 'wordlist', 'words', 'firstword', 'lastword',
-  -- Functions for File Names.
-  'dir', 'notdir', 'suffix', 'basename', 'addsuffix', 'addprefix', 'join',
-  'wildcard', 'realpath', 'abspath',
-  -- Functions for Conditionals.
-  'if', 'or', 'and',
-  -- Miscellaneous Functions.
-  'foreach', 'call', 'value', 'eval', 'origin', 'flavor', 'shell',
-  -- Functions That Control Make.
-  'error', 'warning', 'info'
-}), '-')
+-- Targets.
+local special_target = token(lexer.CONSTANT, word_match{
+  '.PHONY', '.SUFFIXES', '.DEFAULT', '.PRECIOUS', '.INTERMEDIATE', '.SECONDARY', '.SECONDEXPANSION',
+  '.DELETE_ON_ERROR', '.IGNORE', '.LOW_RESOLUTION_TIME', '.SILENT', '.EXPORT_ALL_VARIABLES',
+  '.NOTPARALLEL', '.ONESHELL', '.POSIX'
+})
+local normal_target = token('target', (lexer.any - lexer.space - S(':#='))^1)
+local target_list = normal_target * (ws * normal_target)^0
+lex:add_rule('target', lexer.starts_line((special_target + target_list) * ws^0 * #(':' * -P('='))))
+lex:add_style('target', lexer.styles.label)
 
 -- Variables.
-local word_char, assign = l.any - l.space - S(':#=(){}'), S(':+?')^-1 * '='
+local word_char = lexer.any - lexer.space - S(':#=(){}')
+local assign = S(':+?')^-1 * '='
 local expanded_var = '$' * ('(' * word_char^1 * ')' + '{' * word_char^1 * '}')
 local auto_var = '$' * S('@%<?^+|*')
-local special_var = l.word_match({
-  'MAKEFILE_LIST', '.DEFAULT_GOAL', 'MAKE_RESTARTS', '.RECIPEPREFIX',
-  '.VARIABLES', '.FEATURES', '.INCLUDE_DIRS',
-  'GPATH', 'MAKECMDGOALS', 'MAKESHELL', 'SHELL', 'VPATH'
-}, '.') * #(ws^0 * assign)
-local implicit_var = l.word_match{
+local special_var = word_match{
+  'MAKEFILE_LIST', '.DEFAULT_GOAL', 'MAKE_RESTARTS', '.RECIPEPREFIX', '.VARIABLES', '.FEATURES',
+  '.INCLUDE_DIRS', 'GPATH', 'MAKECMDGOALS', 'MAKESHELL', 'SHELL', 'VPATH'
+} * #(ws^0 * assign)
+local implicit_var = word_match{
   -- Some common variables.
-  'AR', 'AS', 'CC', 'CXX', 'CPP', 'FC', 'M2C', 'PC', 'CO', 'GET', 'LEX', 'YACC',
-  'LINT', 'MAKEINFO', 'TEX', 'TEXI2DVI', 'WEAVE', 'CWEAVE', 'TANGLE', 'CTANGLE',
-  'RM',
+  'AR', 'AS', 'CC', 'CXX', 'CPP', 'FC', 'M2C', 'PC', 'CO', 'GET', 'LEX', 'YACC', 'LINT', 'MAKEINFO',
+  'TEX', 'TEXI2DVI', 'WEAVE', 'CWEAVE', 'TANGLE', 'CTANGLE', 'RM',
   -- Some common flag variables.
-  'ARFLAGS', 'ASFLAGS', 'CFLAGS', 'CXXFLAGS', 'COFLAGS', 'CPPFLAGS', 'FFLAGS',
-  'GFLAGS', 'LDFLAGS', 'LFLAGS', 'YFLAGS', 'PFLAGS', 'RFLAGS', 'LINTFLAGS',
+  'ARFLAGS', 'ASFLAGS', 'CFLAGS', 'CXXFLAGS', 'COFLAGS', 'CPPFLAGS', 'FFLAGS', 'GFLAGS', 'LDFLAGS',
+  'LDLIBS', 'LFLAGS', 'YFLAGS', 'PFLAGS', 'RFLAGS', 'LINTFLAGS',
   -- Other.
   'DESTDIR', 'MAKE', 'MAKEFLAGS', 'MAKEOVERRIDES', 'MFLAGS'
 } * #(ws^0 * assign)
-local computed_var = token(l.OPERATOR, '$' * S('({')) * func
-local variable = token(l.VARIABLE,
-                       expanded_var + auto_var + special_var + implicit_var) +
-                 computed_var
-
--- Targets.
-local special_target = token(l.CONSTANT, l.word_match({
-  '.PHONY', '.SUFFIXES', '.DEFAULT', '.PRECIOUS', '.INTERMEDIATE', '.SECONDARY',
-  '.SECONDEXPANSION', '.DELETE_ON_ERROR', '.IGNORE', '.LOW_RESOLUTION_TIME',
-  '.SILENT', '.EXPORT_ALL_VARIABLES', '.NOTPARALLEL', '.ONESHELL', '.POSIX'
-}, '.'))
-local normal_target = token('target', (l.any - l.space - S(':#='))^1)
-local target_list = normal_target * (ws * normal_target)^0
-local target = l.starts_line((special_target + target_list) * ws^0 *
-                             #(':' * -P('=')))
-
--- Identifiers.
-local identifier = token(l.IDENTIFIER, word_char^1)
+local variable = token(lexer.VARIABLE, expanded_var + auto_var + special_var + implicit_var)
+local computed_var = token(lexer.OPERATOR, '$' * S('({')) * token(lexer.FUNCTION, word_match{
+  -- Functions for String Substitution and Analysis.
+  'subst', 'patsubst', 'strip', 'findstring', 'filter', 'filter-out', 'sort', 'word', 'wordlist',
+  'words', 'firstword', 'lastword',
+  -- Functions for File Names.
+  'dir', 'notdir', 'suffix', 'basename', 'addsuffix', 'addprefix', 'join', 'wildcard', 'realpath',
+  'abspath',
+  -- Functions for Conditionals.
+  'if', 'or', 'and',
+  -- Miscellaneous Functions.
+  'foreach', 'call', 'value', 'eval', 'origin', 'flavor', 'shell',
+  -- Functions That Control Make.
+  'error', 'warning', 'info'
+})
+lex:add_rule('variable', variable + computed_var)
 
 -- Operators.
-local operator = token(l.OPERATOR, assign + S(':$(){}'))
+lex:add_rule('operator', token(lexer.OPERATOR, assign + S(':$(){}')))
 
-M._rules = {
-  {'whitespace', ws},
-  {'keyword', keyword},
-  {'target', target},
-  {'variable', variable},
-  {'operator', operator},
-  {'identifier', identifier},
-  {'comment', comment},
-}
-
-M._tokenstyles = {
-  target = l.STYLE_LABEL
-}
+-- Identifiers.
+lex:add_rule('identifier', token(lexer.IDENTIFIER, word_char^1))
 
-M._LEXBYLINE = true
+-- Comments.
+lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
 
 -- Embedded Bash.
-local bash = l.load('bash')
-bash._RULES['variable'] = token(l.VARIABLE, '$$' * word_char^1) +
-                          bash._RULES['variable'] + variable
-local bash_start_rule = token(l.WHITESPACE, P('\t')) + token(l.OPERATOR, P(';'))
-local bash_end_rule = token(l.WHITESPACE, P('\n'))
-l.embed_lexer(M, bash, bash_start_rule, bash_end_rule)
+local bash = lexer.load('bash')
+bash:modify_rule('variable',
+  token(lexer.VARIABLE, '$$' * word_char^1) + bash:get_rule('variable') + variable)
+local bash_start_rule = token(lexer.WHITESPACE, '\t') + token(lexer.OPERATOR, ';')
+local bash_end_rule = token(lexer.WHITESPACE, '\n')
+lex:embed(bash, bash_start_rule, bash_end_rule)
 
-return M
+return lex
-- 
cgit v1.2.3