optscript: make _foreingtag pass arguments to _foreignreftag in correct order

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

Author: masatake

Units/optscript.r/with-foreignLanguage-flag.d/args.ctags

@@ -4,6 +4,8 @@
 
 --langdef=XXX{_foreignLanguage=C}
 --map-XXX=.xxx
+--fields=+n
+
 --kinddef-XXX=a,abc,abcx
 --_roledef-XXX.a=assigned,assigned
 
@@ -27,6 +29,11 @@
 --regex-XXX=/\/\*(D)\(\)\*\//\1/f/{_role=arolefortesting}{_language=C}
 --regex-XXX=/\/\*(E)\(\)\*\///{{
     \1 /C /function /arolefortesting _foreignreftag _commit pop
+    1 _matchloc
+}}
+
+--regex-XXX=/\/\*(F)\(\)\*\///{{
+    \1 /C /function 4 -1 roll _foreigntag _commit pop
 }}
 
 --regex-C=/FUNC\(([a-z]*)\);/\1/f/

Units/optscript.r/with-foreignLanguage-flag.d/expected.tags

@@ -1,10 +1,11 @@
-a	input.xxx	/^a$/;"	a	language:XXX	roles:def
-b	input.xxx	/^b$/;"	a	language:XXX	roles:def
-c	input.xxx	/^c$/;"	a	language:XXX	roles:assigned
-d	input.xxx	/^d$/;"	a	language:XXX	roles:assigned
-A	input.xxx	/^\/*A()*\/$/;"	f	language:C	roles:def
-B	input.xxx	/^\/*B()*\/$/;"	f	language:C	roles:def
-C	input.xxx	/^\/*C()*\/$/;"	f	language:C	roles:arolefortesting
-D	input.xxx	/^\/*D()*\/$/;"	f	language:C	roles:arolefortesting
-E	input.xxx	/^\/*E()*\/$/;"	f	language:C	roles:arolefortesting
-myfunc	input-0.c	/^FUNC(myfunc);$/;"	f	language:C	roles:def
+a	input.xxx	/^a$/;"	a	line:1	language:XXX	roles:def
+b	input.xxx	/^b$/;"	a	line:2	language:XXX	roles:def
+c	input.xxx	/^c$/;"	a	line:3	language:XXX	roles:assigned
+d	input.xxx	/^d$/;"	a	line:4	language:XXX	roles:assigned
+A	input.xxx	/^\/*A()*\/$/;"	f	line:5	language:C	roles:def
+B	input.xxx	/^\/*B()*\/$/;"	f	line:6	language:C	roles:def
+C	input.xxx	/^\/*C()*\/$/;"	f	line:7	language:C	roles:arolefortesting
+D	input.xxx	/^\/*D()*\/$/;"	f	line:8	language:C	roles:arolefortesting
+E	input.xxx	/^\/*E()*\/$/;"	f	line:9	language:C	roles:arolefortesting
+F	input.xxx	/^\/*E()*\/$/;"	f	line:9	language:C	roles:def
+myfunc	input-0.c	/^FUNC(myfunc);$/;"	f	line:1	language:C	roles:def

Units/optscript.r/with-foreignLanguage-flag.d/input.xxx

@@ -7,3 +7,4 @@ d
 /*C()*/
 /*D()*/
 /*E()*/
+/*F()*/

main/CommonPrelude.c

@@ -253,6 +253,16 @@ const char ctagsCommonPrelude []=
 "(name:str lang:name kind:name matchloc _FOREIGNTAG tag\n"
 " name:str lang:name kind:name _FOREIGNTAG tag)\n"
 "/_foreigntag {\n"
-"    null _foreignreftag\n"
+"    dup type /nametype eq {\n"
+"        % name:str lang:name kind:name\n"
+"        null\n"
+"        % name:str lang:name kind:name null\n"
+"        _foreignreftag\n"
+"    } {\n"
+"        % name:str language:name kind:name matchloc\n"
+"        null exch\n"
+"        % name:str language:name kind:name null matchloc\n"
+"        _foreignreftag\n"
+"    } ifelse\n"
 "} __bddef\n"
 ;