Merge pull request #3678 from masatake/lregex--intervaltab

main: use the interval tree for filling scope field

Author: masatake

Tmain/kind-abnormal-spec.d/stdout-expected.txt

@@ -5,6 +5,7 @@ L  kind with no long name
 N  emit a normal tag
 B  beginning of an area for a guest
 E  end of an area for a guest
+Q  stop the parsing
 d  a kind disabled by default [off]
 e  a kind enabled by default
 r  emit a tag with multi roles
@@ -19,6 +20,7 @@ B       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE
 E       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE   end of an area for a guest
 L       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE   kind with no long name
 N       nothingSpecial                            yes     no      0      NONE   emit a normal tag
+Q       quit                                      yes     no      0      NONE   stop the parsing
 R       rolesDisabled                             no      yes     2      NONE   emit a tag with multi roles(disabled by default)
 b       broken tag                                yes     no      1      NONE   name with unwanted characters
 d       disabled                                  no      no      2      NONE   a kind disabled by default

Tmain/list-mline-regex-flags.d/stdout-expected.txt

@@ -5,6 +5,7 @@ i       icase                                         applied in a case-insensit
 p       pcre2                                         use pcre2 regex engine
 -       fatal="MESSAGE"                               print the given MESSAGE and exit
 -       mgroup=N                                      a group in pattern determining the line number of tag
+-       scope=intervaltab                             set scope for the tag with the interval table
 -       warning="MESSAGE"                             print the given MESSAGE at WARNING level
 -       _advanceTo=N[start|end]                       a group in pattern from where the next scan starts [0end]
 -       _anonymous=PREFIX                             make an anonymous tag with PREFIX

Tmain/list-mtable-regex-flags.d/stdout-expected.txt

@@ -6,7 +6,7 @@ p       pcre2                                         use pcre2 regex engine
 -       fatal="MESSAGE"                               print the given MESSAGE and exit
 -       mgroup=N                                      a group in pattern determining the line number of tag
 -       placeholder                                   don't put this tag to tags file.
--       scope=ACTION                                  use scope stack: ACTION = ref|push|pop|clear|set|replace
+-       scope=ACTION                                  use scope stack: ACTION = ref|push|pop|clear|set|replace|intervaltab
 -       tenter=TABLE[,CONT]                           enter to given regext table (with specifying continuation)
 -       tjump=TABLE                                   jump to another regext table(don't push the current table to state stack)
 -       tleave                                        leave from the current regext table

Tmain/list-regex-flags.d/stdout-expected.txt

@@ -6,7 +6,8 @@ p       pcre2                                         use pcre2 regex engine
 x       exclusive                                     skip testing the other patterns if a line is matched to this pattern
 -       fatal="MESSAGE"                               print the given MESSAGE and exit
 -       placeholder                                   don't put this tag to tags file.
--       scope=ACTION                                  use scope stack: ACTION = ref|push|pop|clear|set|replace
+-       postrun                                       run after parsing with built-in code, multline regex patterns, and multitable regex patterns
+-       scope=ACTION                                  use scope stack: ACTION = ref|push|pop|clear|set|replace|intervaltab
 -       warning="MESSAGE"                             print the given MESSAGE at WARNING level
 -       _anonymous=PREFIX                             make an anonymous tag with PREFIX
 -       _extra=EXTRA                                  record the tag only when the extra is enabled

Tmain/lregex-scan-the-rest-of-input.d/exit-expected.txt

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

Tmain/lregex-scan-the-rest-of-input.d/input.cst

@@ -0,0 +1,13 @@
+Q
+a
+b
+c
+d
+e
+f
+g
+restdef:x
+restdef:y
+restdef:z
+
+

Tmain/lregex-scan-the-rest-of-input.d/run.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Copyright: 2023 Masatake YAMATO
+# License: GPL-2
+
+CTAGS=$1
+
+${CTAGS} --quiet --options=NONE -o - \
+		 --kinddef-CTagsSelfTest=a,name,names \
+		 --regex-CTagsSelfTest='/restdef:([a-z])/\1/a/' \
+		 --language-force=CTagsSelfTest input.cst
+
+exit $?

Tmain/lregex-scan-the-rest-of-input.d/stderr-expected.txt

@@ -0,0 +1,3 @@
+x	input.cst	/^restdef:x$/;"	a
+y	input.cst	/^restdef:y$/;"	a
+z	input.cst	/^restdef:z$/;"	a

Tmain/lregex-scan-the-rest-of-input.d/stdout-expected.txt

@@ -0,0 +1,72 @@
+--sort=no
+
+--langdef=Foo{base=C}{shared}
+--fields=+lr
+--extras=+r
+
+--kinddef-Foo=r,readhandler,read handlers
+--kinddef-Foo=m,method,methods
+--_roledef-Foo.m=set,set a handler
+--kinddef-Foo=w,writehandler,write handlers
+--kinddef-Foo=s,seekhandler,seek handlers
+--kinddef-Foo=o,openhandler,open handlers
+--kinddef-Foo=R,releasehandler,release handlers
+
+# tag:int
+--regex-Foo=/= ([a-z_]*_read),//{postrun}{{
+   \1 /readhandler _tag _commit dup
+   _intervaltab {
+      scope:
+   } {
+      pop
+   } ifelse
+}}
+
+# tag:tag
+--regex-Foo=/\.([a-z_]+)[ \t]*=//{postrun}{{
+   \1 /method /set _reftag dup
+   _intervaltab {
+      exch _commit exch scope:
+   } {
+      _commit
+   } ifelse
+}}
+
+# matchloc
+--regex-Foo=/= ([a-z_]*_write),//{postrun}{{
+   \1 /writehandler _tag _commit
+   @1 _intervaltab {
+      scope:
+   } {
+      pop
+   } ifelse
+}}
+
+--regex-Foo=/= ([a-z_]*_l?lseek),//{postrun}{{
+   \1 /seekhandler _tag _commit
+   1@ _intervaltab {
+      scope:
+   } {
+      pop
+   } ifelse
+}}
+
+# [line:int]
+--regex-Foo=/= ([a-z_]*_release),//{postrun}{{
+   \1 /releasehandler _tag _commit
+   [ 1@ _matchloc2line  ] _intervaltab {
+      scope:
+   } {
+      pop
+   } ifelse
+}}
+
+# [startline:int endline:int]
+--regex-Foo=/= ([a-z_]*_open)(,)//{postrun}{{
+   \1 /openhandler _tag _commit
+   [ 1@ _matchloc2line @2 _matchloc2line ] _intervaltab {
+      scope:
+   } {
+      pop
+   } ifelse
+}}