Merge pull request #3028 from masatake/makeTagEntryReflection-prepara…

…tion

optscript: bug fix, new operators, refactoring

Tmain/common-prelude.d/amember.expected

@@ -0,0 +1,12 @@
+[/a /b /c]
+true
+true
+true
+false
+[1 true (abc)]
+true
+false
+true
+false
+true
+false

Tmain/common-prelude.d/stdout-expected.txt

@@ -1,3 +1,4 @@
+amember.ps...0
 buildstring.ps...0
 dedup.ps...0
 dedup_spaces.ps...0

Tmain/fixed-field-handling.d/stdout-expected.txt

@@ -1,49 +1,49 @@
 # writer=default
 N	name	yes	NONE	s--	yes	rw	tag name
-F	input	yes	NONE	s--	yes	--	input file
+F	input	yes	NONE	s--	yes	r-	input file
 P	pattern	yes	NONE	s-b	yes	--	pattern
 # writer=u-ctags 
 N	name	yes	NONE	s--	yes	rw	tag name
-F	input	yes	NONE	s--	yes	--	input file
+F	input	yes	NONE	s--	yes	r-	input file
 P	pattern	yes	NONE	s-b	yes	--	pattern
 # writer=e-ctags 
 N	name	yes	NONE	s--	yes	rw	tag name
-F	input	yes	NONE	s--	yes	--	input file
+F	input	yes	NONE	s--	yes	r-	input file
 P	pattern	yes	NONE	s-b	yes	--	pattern
 # writer=etags 
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=xref 
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=json 
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=xref N
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	no	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=xref F
-F	input	no	NONE	s--	no	--	input file
+F	input	no	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=xref P
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	no	NONE	s-b	no	--	pattern
 # writer=json N
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	no	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=json F
-F	input	no	NONE	s--	no	--	input file
+F	input	no	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	yes	NONE	s-b	no	--	pattern
 # writer=json P
-F	input	yes	NONE	s--	no	--	input file
+F	input	yes	NONE	s--	no	r-	input file
 N	name	yes	NONE	s--	no	rw	tag name
 P	pattern	no	NONE	s-b	no	--	pattern
 # writer=json --fields=-N

Tmain/getter-extras-field.d/stderr-expected.txt

@@ -2,6 +2,7 @@ true
 [/reference]
 true
 [/qualified /reference]
-false
+true
+[/X.foo]
 true
 [/reference /X.foo]

Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt

@@ -1,7 +1,7 @@
 # --output-format=u-ctags --fields=n --list-fields
 #LETTER NAME           ENABLED LANGUAGE         JSTYPE FIXED OP DESCRIPTION
 N       name           yes     NONE             s--    yes   rw tag name
-F       input          yes     NONE             s--    yes   -- input file
+F       input          yes     NONE             s--    yes   r- input file
 P       pattern        yes     NONE             s-b    yes   -- pattern
 C       compact        no      NONE             s--    no    -- compact input line (used only in xref output)
 E       extras         no      NONE             s--    no    r- Extra tag type information
@@ -27,7 +27,7 @@ z       kind           no      NONE             s--    no    r- [tags output] pr
 # --fields=n --output-format=u-ctags --list-fields
 #LETTER NAME           ENABLED LANGUAGE         JSTYPE FIXED OP DESCRIPTION
 N       name           yes     NONE             s--    yes   rw tag name
-F       input          yes     NONE             s--    yes   -- input file
+F       input          yes     NONE             s--    yes   r- input file
 P       pattern        yes     NONE             s-b    yes   -- pattern
 C       compact        no      NONE             s--    no    -- compact input line (used only in xref output)
 E       extras         no      NONE             s--    no    r- Extra tag type information
@@ -54,7 +54,7 @@ z       kind           no      NONE             s--    no    r- [tags output] pr
 #LETTER NAME           ENABLED LANGUAGE         JSTYPE FIXED OP DESCRIPTION
 C       compact        no      NONE             s--    no    -- compact input line (used only in xref output)
 E       extras         no      NONE             s--    no    r- Extra tag type information
-F       input          no      NONE             s--    no    -- input file
+F       input          no      NONE             s--    no    r- input file
 K       NONE           no      NONE             s--    no    -- Kind of tag in long-name form
 N       name           no      NONE             s--    no    rw tag name
 P       pattern        no      NONE             s-b    no    -- pattern
@@ -80,7 +80,7 @@ z       kind           no      NONE             s--    no    r- [tags output] pr
 #LETTER NAME           ENABLED LANGUAGE         JSTYPE FIXED OP DESCRIPTION
 C       compact        no      NONE             s--    no    -- compact input line (used only in xref output)
 E       extras         no      NONE             s--    no    r- Extra tag type information
-F       input          no      NONE             s--    no    -- input file
+F       input          no      NONE             s--    no    r- input file
 K       NONE           no      NONE             s--    no    -- Kind of tag in long-name form
 N       name           no      NONE             s--    no    rw tag name
 P       pattern        no      NONE             s-b    no    -- pattern

Tmain/list-fields.d/stdout-expected.txt

@@ -1,6 +1,6 @@
 #LETTER	NAME	ENABLED	LANGUAGE	JSTYPE	FIXED	OP	DESCRIPTION
 N	name	yes	NONE	s--	yes	rw	tag name
-F	input	yes	NONE	s--	yes	--	input file
+F	input	yes	NONE	s--	yes	r-	input file
 P	pattern	yes	NONE	s-b	yes	--	pattern
 C	compact	no	NONE	s--	no	--	compact input line (used only in xref output)
 E	extras	no	NONE	s--	no	r-	Extra tag type information

Tmain/optscript-preludes-stack.d/args-c.ctags

@@ -0,0 +1,33 @@
+--langdef=C10{base=C}
+--_prelude-C10={{
+    (prelude C10) ==
+}}
+--_sequel-C10={{
+    (sequel C10) ==
+}}
+
+
+--langdef=C11{base=C}
+--_prelude-C11={{
+    (prelude C11) ==
+}}
+--_sequel-C11={{
+    (sequel C11) ==
+}}
+
+--langdef=C20{base=C10}
+--_prelude-C20={{
+    (prelude C20) ==
+}}
+--_sequel-C20={{
+    (sequel C20) ==
+}}
+
+
+--langdef=C30{base=C20}
+--_prelude-C30={{
+    (prelude C30) ==
+}}
+--_sequel-C30={{
+    (sequel C30) ==
+}}

Tmain/optscript-preludes-stack.d/args-cpreprocessor.ctags

@@ -0,0 +1,33 @@
+--langdef=CPreProcessor10{base=CPreProcessor}
+--_prelude-CPreProcessor10={{
+    (prelude CPreProcessor10) ==
+}}
+--_sequel-CPreProcessor10={{
+    (sequel CPreProcessor10) ==
+}}
+
+
+--langdef=CPreProcessor11{base=CPreProcessor}
+--_prelude-CPreProcessor11={{
+    (prelude CPreProcessor11) ==
+}}
+--_sequel-CPreProcessor11={{
+    (sequel CPreProcessor11) ==
+}}
+
+--langdef=CPreProcessor20{base=CPreProcessor10}
+--_prelude-CPreProcessor20={{
+    (prelude CPreProcessor20) ==
+}}
+--_sequel-CPreProcessor20={{
+    (sequel CPreProcessor20) ==
+}}
+
+
+--langdef=CPreProcessor30{base=CPreProcessor20}
+--_prelude-CPreProcessor30={{
+    (prelude CPreProcessor30) ==
+}}
+--_sequel-CPreProcessor30={{
+    (sequel CPreProcessor30) ==
+}}

Tmain/optscript-preludes-stack.d/args-dts.ctags

@@ -0,0 +1,33 @@
+--langdef=DTS10{base=DTS}
+--_prelude-DTS10={{
+    (prelude DTS10) ==
+}}
+--_sequel-DTS10={{
+    (sequel DTS10) ==
+}}
+
+
+--langdef=DTS11{base=DTS}
+--_prelude-DTS11={{
+    (prelude DTS11) ==
+}}
+--_sequel-DTS11={{
+    (sequel DTS11) ==
+}}
+
+--langdef=DTS20{base=DTS10}
+--_prelude-DTS20={{
+    (prelude DTS20) ==
+}}
+--_sequel-DTS20={{
+    (sequel DTS20) ==
+}}
+
+
+--langdef=DTS30{base=DTS20}
+--_prelude-DTS30={{
+    (prelude DTS30) ==
+}}
+--_sequel-DTS30={{
+    (sequel DTS30) ==
+}}

Tmain/optscript-preludes-stack.d/exit-expected.txt

@@ -0,0 +1 @@
+0

Tmain/optscript-preludes-stack.d/input.c

@@ -0,0 +1 @@
+/* EMPTY */

Tmain/optscript-preludes-stack.d/run.sh

@@ -0,0 +1,29 @@
+# Copyright: 2021 Masatake YAMATO
+# License: GPL-2
+
+CTAGS=$1
+
+. ../utils.sh
+: &&
+	${CTAGS} --quiet --options=NONE\
+			 --_prelude-C='{{ (enter C) == }}' \
+			 --_sequel-C='{{ (leave C) == }}' \
+			 --options=./args-c.ctags -o - input.c &&
+	${CTAGS} --quiet --options=NONE \
+			 --_prelude-DTS='{{ (enter DTS) == }}' \
+			 --_sequel-DTS='{{ (leave DTS) == }}' \
+			 --options=./args-dts.ctags -o - input.dts &&
+	${CTAGS} --quiet --options=NONE --map-CPreProcessor=+.i \
+			 --_prelude-CPreProcessor='{{ (enter CPreProcessor) == }}' \
+			 --_sequel-CPreProcessor='{{ (leave CPreProcessor) == }}' \
+			 --options=./args-cpreprocessor.ctags -o - input.i
+
+#
+# BUGS: The following two don't work because in-use marker is not set to
+# the subparsers of the CPreprocessor parser. The CPreprocessor parser must
+# mark in-use on its sub parsers to call the inputStart and inputEnd methods
+# in the foreachSubparser loop.
+#
+#	${CTAGS} --quiet --options=NONE --options=./args-cpreprocessor.ctags -o - input.c
+#	${CTAGS} --quiet --options=NONE --options=./args-cpreprocessor.ctags -o - input.dts
+#

Tmain/optscript-preludes-stack.d/stderr-expected.txt

@@ -0,0 +1,24 @@
+(enter C)
+(prelude C10)
+(prelude C20)
+(prelude C30)
+(prelude C11)
+(sequel C30)
+(sequel C20)
+(sequel C10)
+(sequel C11)
+(leave C)
+(enter DTS)
+(prelude DTS10)
+(prelude DTS20)
+(prelude DTS30)
+(prelude DTS11)
+(sequel DTS30)
+(sequel DTS20)
+(sequel DTS10)
+(sequel DTS11)
+(leave DTS)
+ctags: Warning: Because of an internal limitation, Making a sub parser based on the CPreProcessor parser is not allowed: CPreProcessor
+ctags: Warning: Because of an internal limitation, Making a sub parser based on the CPreProcessor parser is not allowed: CPreProcessor
+(enter CPreProcessor)
+(leave CPreProcessor)

Tmain/optscript.d/control.expected

@@ -26,6 +26,14 @@
 5
 7
 9
+exit in for:
+=> passed
+exit in forall string:
+=> passed
+exit in forall array:
+=> passed
+exit in forall dict:
+=> passed
 (---------------- countexecstack ----------------)
 3
 (---------------- execstack ----------------)

Tmain/optscript.d/read-and-print.expected

@@ -83,3 +83,6 @@ efg
     /B [0 1 2]
   >> ]
 >> ]
+char after metachar
+[97]
+[10]

Units/optscript.r/op-markplaceholder.d/args.ctags

@@ -0,0 +1,11 @@
+--sort=no
+--langdef=UnknownX
+--map-UnknownX=.unknown
+
+--kinddef-UnknownX=d,def,definitions
+
+--regex-UnknownX=/([ \t]*)def +([a-zA-Z]):/\2/d/{{
+    \1 length 5 gt {
+        . _markplaceholder
+    } if
+}}

Units/optscript.r/op-markplaceholder.d/expected.tags

@@ -0,0 +1,4 @@
+a	input.unknown	/^def a:$/;"	d
+b	input.unknown	/^    def b:$/;"	d
+A	input.unknown	/^def A:$/;"	d
+B	input.unknown	/^    def B:$/;"	d

Units/optscript.r/op-markplaceholder.d/input.unknown

@@ -0,0 +1,6 @@
+def a:
+    def b:
+        def c:
+def A:
+    def B:
+        def C:

Units/optscript.r/op-tagloc.d/args.ctags

@@ -0,0 +1,12 @@
+--langdef=FOO
+--map-FOO=.foo
+--kinddef-FOO=d,def,definitions
+--_extradef-FOO=withprefix,name with prefix
+--extras-FOO=+{withprefix}
+--fields=+{extras}
+--regex-FOO=/def +([a-zA-Z]+)/\1/d/{{
+    mark (<prefix>) . :name _buildstring
+    . :kind
+    . _tagloc _tag _commit
+    /FOO.withprefix _markextra
+}}

Units/optscript.r/op-tagloc.d/expected.tags

@@ -0,0 +1,4 @@
+<prefix>x	input.foo	/^def x$/;"	d	extras:withprefix
+<prefix>y	input.foo	/^def y$/;"	d	extras:withprefix
+x	input.foo	/^def x$/;"	d
+y	input.foo	/^def y$/;"	d

Units/optscript.r/op-tagloc.d/input.foo

@@ -0,0 +1,2 @@
+def x
+def y

Units/optscript.r/op-typeref.d/args.ctags

@@ -1,7 +1,35 @@
 --langdef=X
 --map-X=.unknown
 --kinddef-X=d,def,definitions
+--kinddef-X=t,type,type definitions
 
+--_prelude-X={{
+    /typedict 5 dict def
+}}
+
+--regex-X=/^type[ ]+([A-Z]+)$/\1/t/{{
+    typedict \1 cvn . put
+}}
+
+# [string string]
 --regex-X=/def[ ]+([a-z]+)[ ]*:[ ]*([a-z]+)/\1/d/{{
-	. [ (typename) \2 ] typeref:
+	. [ (postfix) \2 ] typeref:
+}}
+
+# string
+--regex-X=/def[ ]+<([a-z]+)>[ ]*([a-z]+)/\2/d/{{
+	.  \1 typeref:
+}}
+
+# index
+--regex-X=/def[ ]+([A-Z]+)\^([a-z]+)/\2/d/{{
+    typedict \1 cvn known {
+        . typedict \1 cvn get typeref:
+    } if
+}}
+
+# false
+--regex-X=/def[ ]+([a-z]+)\^!([a-z]+)/\2/d/{{
+	. \1 typeref:
+    . false typeref:
 }}