Merge pull request #2796 from bernardjosef/extra-mtable-regex

Extra mtable regex

Tmain/option-extradef-in-mtable.d/input.mtextra

@@ -0,0 +1,3 @@
+(def a)
+{def b}
+[def c]

Tmain/option-extradef-in-mtable.d/mtextra.ctags

@@ -0,0 +1,23 @@
+--langdef=MTExtra
+--map-MTExtra=+.mtextra
+
+--kinddef-MTExtra=d,def,definitions
+
+# []
+--_extradef-MTExtra=acceptSquareBracket,accept square bracket
+# {}
+--_extradef-MTExtra=acceptCurlyBracket,accept curly bracket
+
+
+--_tabledef-MTExtra=main
+--_tabledef-MTExtra=body
+
+--_mtable-regex-MTExtra=main/\(def +//{tenter=body}
+--_mtable-regex-MTExtra=main/\[def +//{tenter=body}{_extra=acceptSquareBracket}
+--_mtable-regex-MTExtra=main/\{def +//{tenter=body}{_extra=acceptCurlyBracket}
+--_mtable-regex-MTExtra=main/.//
+
+--_mtable-regex-MTExtra=body/([_a-z]+)\)/\1/d/{tleave}
+--_mtable-regex-MTExtra=body/([_a-z]+)\]/\1/d/{tleave}{_extra=acceptSquareBracket}
+--_mtable-regex-MTExtra=body/([_a-z]+)\}/\1/d/{tleave}{_extra=acceptCurlyBracket}
+--_mtable-regex-MTExtra=body/.//

Tmain/option-extradef-in-mtable.d/run.sh

@@ -0,0 +1,29 @@
+# Copyright: 2020 Masatake YAMATO
+# License: GPL-2
+
+CTAGS="$1"
+
+msgstr ()
+{
+	if [ $1 = '+' ]; then
+		echo "enabled"
+	else
+		echo "disabled"
+	fi
+}
+
+run_ctags ()
+{
+	printf '# []: %s, {}: %s\n' $(msgstr $1) $(msgstr $2)
+	${CTAGS} --quiet --options=NONE --options=mtextra.ctags \
+			 --fields=+'{extras}' \
+			 --extras-MTExtra=${1}'{acceptSquareBracket}' \
+			 --extras-MTExtra=${2}'{acceptCurlyBracket}' \
+			 -o - \
+			 input.mtextra
+}
+
+run_ctags + +
+run_ctags - -
+run_ctags + -
+run_ctags - +

Tmain/option-extradef-in-mtable.d/stdout-expected.txt

@@ -0,0 +1,12 @@
+# []: enabled, {}: enabled
+a	input.mtextra	/^(def a)$/;"	d
+b	input.mtextra	/^{def b}$/;"	d	extras:acceptCurlyBracket
+c	input.mtextra	/^[def c]$/;"	d	extras:acceptSquareBracket
+# []: disabled, {}: disabled
+a	input.mtextra	/^(def a)$/;"	d
+# []: enabled, {}: disabled
+a	input.mtextra	/^(def a)$/;"	d
+c	input.mtextra	/^[def c]$/;"	d	extras:acceptSquareBracket
+# []: disabled, {}: enabled
+a	input.mtextra	/^(def a)$/;"	d
+b	input.mtextra	/^{def b}$/;"	d	extras:acceptCurlyBracket

main/lregex.c

@@ -2406,6 +2406,10 @@ static struct regexTable * matchMultitableRegexTable (struct lregexControlBlock
 	for (unsigned int i = 0; i < ptrArrayCount(table->entries); i++)
 	{
 		regexTableEntry *entry = ptrArrayItem(table->entries, i);
+		if ((entry->pattern->xtagType != XTAG_UNKNOWN)
+			&& (!isXtagEnabled (entry->pattern->xtagType)))
+			continue;
+
 		regexPattern *ptrn = entry->pattern;
 		struct guestSpec  *guest = &ptrn->guest;