rpmMacros: parse macros.d/macros.*

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Tmain/map-rexpr.d/macros.d/macros.vim

@@ -0,0 +1 @@
+%vimfiles_root %{_datadir}/vim/vimfiles

Tmain/map-rexpr.d/run.sh

@@ -0,0 +1,17 @@
+# Copyright: 2025 Masatake YAMATO
+# License: GPL-2
+
+CTAGS=$1
+
+. ../utils.sh
+
+echo "# < macros.d/macros.vm"
+${CTAGS} --quiet --options=NONE --print-language macros.d/macros.vim
+${CTAGS} --quiet --options=NONE -o - macros.d/macros.vim
+
+echo "# cd macros.d; < macros.vim"
+(
+	cd macros.d;
+	${CTAGS} --quiet --options=NONE --print-language macros.vim;
+	${CTAGS} --quiet --options=NONE -o - macros.vim
+)

Tmain/map-rexpr.d/stderr-expected.txt

@@ -0,0 +1,5 @@
+# < macros.d/macros.vm
+macros.d/macros.vim: RpmMacros
+vimfiles_root	macros.d/macros.vim	/^%vimfiles_root %{_datadir}\/vim\/vimfiles$/;"	m
+# cd macros.d; < macros.vim
+macros.vim: Vim

Tmain/map-rexpr.d/stdout-expected.txt

@@ -113,6 +113,14 @@ extern parserDefinition* RpmMacrosParser (void)
 		NULL
 	};
 
+	static const struct rExprSrc rexprs [] = {
+		{
+		  .expr = "(.*/)?macros\\.d/macros\\.([^/]+)$",
+		  .iCase = false,
+		},
+		REXPR_LAST_ENTRY
+	};
+
 	static kindDefinition RpmMacrosKindTable [] = {
 		{
 		  true, 'm', "macro", "macros",
@@ -126,6 +134,7 @@ extern parserDefinition* RpmMacrosParser (void)
 	def->enabled       = true;
 	def->extensions    = extensions;
 	def->patterns      = patterns;
+	def->rexprs        = rexprs;
 	def->aliases       = aliases;
 	def->method        = METHOD_NOT_CRAFTED|METHOD_REGEX;
 	def->useCork       = CORK_QUEUE;

optlib/rpmMacros.c

@@ -17,12 +17,7 @@
 #
 --langdef=RpmMacros
 
-# This map is too generic.
-# e.g. "macros.h" of C language input matches this pattern.
-# --map-RpmMacros=+(macros.*)
-
-# This one is too general.
-# --map-RpmMacros=+(macros)
+--map-RpmMacros=+%(.*/)?macros\.d/macros\.([^/]+)$%
 
 --kinddef-RpmMacros=m,macro,macros