From a4b1c496bb4cae8d36c3ef4108ea4c578aea8170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Thu, 14 Jul 2022 19:04:17 +0200
Subject: [PATCH] update rpmspec lexer, to follow modern standard

References: https://github.com/orbitalquark/scintillua/issues/76
Replaces: https://github.com/orbitalquark/scintillua/pull/70
---
 lexers/rpmspec.lua | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/lexers/rpmspec.lua b/lexers/rpmspec.lua
index 4eec9c86..2e678e5c 100644
--- a/lexers/rpmspec.lua
+++ b/lexers/rpmspec.lua
@@ -2,7 +2,7 @@
 
 local lexer = require('lexer')
 local token, word_match = lexer.token, lexer.word_match
-local P, S = lpeg.P, lpeg.S
+local P, R, S = lpeg.P, lpeg.R, lpeg.S
 
 local lex = lexer.new('rpmspec')
 
@@ -10,23 +10,43 @@ local lex = lexer.new('rpmspec')
 lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1))
 
 -- Comments.
-lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol('#')))
+lex:add_rule('comment', lex:tag(lexer.COMMENT, lexer.to_eol('#')))
+
+-- Numbers (including versions)
+lex:add_rule('number', lex:tag(lexer.NUMBER, lpeg.B(lexer.space) *
+	(lexer.number * (lexer.number +S('.+~'))^0)))
+
+-- Operators
+lex:add_rule('operator', lex:tag(lexer.OPERATOR, S('&<>=|')))
 
 -- Strings.
-lex:add_rule('string', token(lexer.STRING, lexer.range('"')))
+lex:add_rule('string', lex:tag(lexer.STRING, lexer.range('"')))
 
 -- Keywords.
-lex:add_rule('keyword', token(lexer.KEYWORD, word_match{
+lex:add_rule('keyword', lex:tag(lexer.KEYWORD, (lex:word_match(lexer.KEYWORD) +
+	(P('Patch') + P('Source')) * R('09')^0) * ':'))
+
+-- Macros
+lex:add_rule('command', lex:tag(lexer.FUNCTION,
+	lexer.range(S('%$')^1 * S('{')^0 * ((lexer.alnum + S('_?'))^0), S('}')^0)))
+
+-- Constants
+lex:add_rule('constant', lex:tag(lexer.CONSTANT, lex:word_match(lexer.CONSTANT)))
+
+-- Word lists
+lex:set_word_list(lexer.CONSTANT, {
+	'rhel', 'fedora', 'suse_version', 'sle_version', 'x86_64',
+	'aarch64', 'ppc64le', 'riscv64', 's390x'
+})
+
+lex:set_word_list(lexer.KEYWORD, {
 	'Prereq', 'Summary', 'Name', 'Version', 'Packager', 'Requires', 'Recommends', 'Suggests',
 	'Supplements', 'Enhances', 'Icon', 'URL', 'Source', 'Patch', 'Prefix', 'Packager', 'Group',
 	'License', 'Release', 'BuildRoot', 'Distribution', 'Vendor', 'Provides', 'ExclusiveArch',
 	'ExcludeArch', 'ExclusiveOS', 'Obsoletes', 'BuildArch', 'BuildArchitectures', 'BuildRequires',
 	'BuildConflicts', 'BuildPreReq', 'Conflicts', 'AutoRequires', 'AutoReq', 'AutoReqProv',
 	'AutoProv', 'Epoch'
-}))
-
--- Macros
-lex:add_rule('command', token(lexer.FUNCTION, '%' * lexer.word))
+})
 
 lexer.property['scintillua.comment'] = '#'