Merge pull request #3292 from masatake/choose-guest-with-aliases

lregex: consider aliases of parsers when finding a guest parser

Author: masatake

Units/guest-in-optlib-single-line.d/args.ctags

@@ -9,20 +9,19 @@
 
 --regex-single=/^DEF:([a-zA-Z0-9]+)/\1/d
 
---regex-single=/^BEGIN:([a-zA-Z0-9]+)$//{guest=\1,0end,}
---regex-single=/^BEGIN$//{guest=,0end,}
---regex-single=/^END:([a-zA-Z0-9]+)$//{guest=\1,,0start}
---regex-single=/^END$//{guest=,,0start}
-
---regex-single=/^BEGIN_FILE:([a-zA-Z0-9.]+)$//{guest=*1,0end,}
---regex-single=/^BEGIN_FILE$//{guest=,0end,}
---regex-single=/^END_FILE:([a-zA-Z0-9.]+)$//{guest=*1,,0start}
---regex-single=/^END_FILE$//{guest=,,0start}
-
---regex-single=/^BEGIN_C$//{guest=C,0end,}
---regex-single=/^END_C$//{guest=C,,0start}
-
---regex-single=/^(BEGIN:([a-zA-Z0-9]+)<).*(>END)$//{guest=\2,1end,3start}
---regex-single=/^BEGIN_FILE:([a-zA-Z0-9.]+)<(.*)>END_FILE$//{guest=*1,2start,2end}
---regex-single=/^(BEGIN_C<).*(>END_C)$//{guest=C,1end,2start}
-
+--regex-single=/^BEGIN:([a-zA-Z0-9]+)$//{_guest=\1,0end,}
+--regex-single=/^BEGIN$//{_guest=,0end,}
+--regex-single=/^END:([a-zA-Z0-9]+)$//{_guest=\1,,0start}
+--regex-single=/^END$//{_guest=,,0start}
+
+--regex-single=/^BEGIN_FILE:([a-zA-Z0-9.]+)$//{_guest=*1,0end,}
+--regex-single=/^BEGIN_FILE$//{_guest=,0end,}
+--regex-single=/^END_FILE:([a-zA-Z0-9.]+)$//{_guest=*1,,0start}
+--regex-single=/^END_FILE$//{_guest=,,0start}
+
+--regex-single=/^BEGIN_C$//{_guest=C,0end,}
+--regex-single=/^END_C$//{_guest=C,,0start}
+
+--regex-single=/^(BEGIN:([a-zA-Z0-9]+)<).*(>END)$//{_guest=\2,1end,3start}
+--regex-single=/^BEGIN_FILE:([a-zA-Z0-9.]+)<(.*)>END_FILE$//{_guest=*1,2start,2end}
+--regex-single=/^(BEGIN_C<).*(>END_C)$//{_guest=C,1end,2start}

Units/guest-in-optlib-single-line.d/expected.tags

@@ -22,9 +22,10 @@ f4	input.single	/^int f4 (void)$/;"	f	line:37	language:C	typeref:typename:int
 f5	input.single	/(defun f5 () (list))/;"	f	line:46	language:Lisp
 f6	input.single	/(defun f6 () (list))/;"	f	line:50	language:Lisp
 f7	input.single	/int f7 (void) { return 0; }/;"	f	line:54	language:C	typeref:typename:int
-v0	input-0.single	/(defvar v0 0/;"	f	line:1	language:Lisp
+v0	input-0.single	/(defvar v0 0/;"	v	line:1	language:Lisp
 g0	input-1.single	/^(defun g0 () (list))$/;"	f	line:2	language:Lisp
 g1	input-1.single	/^int g1 (void) { return 0; }$/;"	f	line:6	language:C	typeref:typename:int
 g2	input-1.single	/^function g2$/;"	f	line:10	language:Sh
 EOF	input-1.single	/^	cat > foo.rst <<EOF$/;"	h	line:12	language:Sh
-G2 on g2	input-1.single	/^G2 on g2$/;"	c	line:14	language:ReStructuredText
+G2 on g2	input-1.single	/^G2 on g2$/;"	H	line:14	language:ReStructuredText
+f	input-2.single	/^f()$/;"	f	line:4	language:Sh

Units/guest-in-optlib-single-line.d/input-2.single

@@ -0,0 +1,8 @@
+ksh is an alias for Sh parser.
+
+BEGIN:ksh
+f()
+{
+	echo x
+}
+END

Units/guest-in-optlib-single-line.d/input.single

@@ -0,0 +1,55 @@
+DEF:S0
+
+BEGIN:lisp
+(defun f0 () (list))
+END
+
+DEF:E0
+
+
+DEF:S1
+
+BEGIN
+(defun f1 () (list))
+END:lisp
+
+DEF:E1
+
+DEF:S2
+
+BEGIN_FILE:foo.cl
+(defun f2 () (list))
+END_FILE
+
+DEF:E2
+
+DEF:S3
+
+BEGIN_FILE
+(defun f3 () (list))
+END_FILE:foo.cl
+
+DEF:E3
+
+DEF:S4
+
+BEGIN_C
+int f4 (void)
+{
+	return 0;
+}
+END_C
+
+DEF:E4
+
+DEF:S5
+BEGIN:lisp<(defun f5 () (list))>END
+DEF:E5
+
+DEF:S6
+BEGIN_FILE:bar.cl<(defun f6 () (list))>END_FILE
+DEF:E6
+
+DEF:S7
+BEGIN_C<int f7 (void) { return 0; }>END_C
+DEF:E7

docs/optlib.rst

@@ -1537,7 +1537,8 @@ For *<PARSER>*, you can specify one of the following items:
 a name of a parser
 
 	If you know the guest parser you want to run before parsing
-	the input file, specify the name of the parser.
+	the input file, specify the name of the parser. Aliases of parsers
+	are also considered when finding a parser for the name.
 
 	An example of running C parser as a guest parser::
 
@@ -1548,7 +1549,8 @@ the group number of a regex pattern started from '``\``' (backslash)
 	If a parser name appears in an input file, write a regex pattern
 	to capture the name.  Specify the group number where the name is
 	stored to the parser.  In such case, use '``\``' as the prefix for
-	the number.
+	the number. Aliases of parsers are also considered when finding
+	a parser for the name.
 
 	Let's see an example. Git Flavor Markdown (GFM) is a language for
 	documentation. It provides a notation for quoting a snippet of

main/lregex.c

@@ -839,7 +839,7 @@ static void pre_ptrn_flag_guest_long (const char* const s, const char* const v,
 	}
 	else
 	{
-		guest->lang.spec.lang = getNamedLanguage (v, (tmp - v));
+		guest->lang.spec.lang = getNamedLanguageOrAlias (v, (tmp - v));
 		if (guest->lang.spec.lang == LANG_IGNORE)
 		{
 			error (WARNING, "no parser found for the guest spec: %s", v);
@@ -1810,7 +1810,7 @@ static bool fillGuestRequest (const char *start,
 			- pmatch [guest_spec->lang.spec.patternGroup].rm_so;
 		if (size > 0)
 		{
-			guest_req->lang = getNamedLanguage (name, size);
+			guest_req->lang = getNamedLanguageOrAlias (name, size);
 			guest_req->lang_set = true;
 		}
 	}

optlib/systemtap.c

@@ -395,7 +395,7 @@ extern parserDefinition* SystemTapParser (void)
 	};
 
 	static const char *const aliases [] = {
-		".stap",
+		"stap",
 		NULL
 	};
 

optlib/systemtap.ctags

@@ -29,7 +29,7 @@
 --langdef=SystemTap
 --map-SystemTap=+.stp
 --map-SystemTap=+.stpm
---alias-SystemTap=+.stap
+--alias-SystemTap=+stap
 
 --kinddef-SystemTap=p,probe,probe aliases
 --kinddef-SystemTap=f,function,functions