Merge pull request #4051 from masatake/kconfig--typeref-dont-pop

Kconfig: avoid stack underflow when filling typeref filed
universal-ctags · Aug 15, 2024 · 36fce6a · 36fce6a
2 parents 6f434c5 + 3babfdb
commit 36fce6a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Units/parser-kconfig.r/macros.d/expected.tags b/Units/parser-kconfig.r/macros.d/expected.tags
@@ -1,5 +1,5 @@
 CC	input.kconfig	/^CC := gcc$/;"	v
-CC_HAS_FOO	input.kconfig	/^config CC_HAS_FOO$/;"	c
+CC_HAS_FOO	input.kconfig	/^config CC_HAS_FOO$/;"	c	typeref:typename:bool
 CONFIG_CC_HAS_FOO	input.kconfig	/^config CC_HAS_FOO$/;"	c
 CONFIG_CC_HAS_FOO_MODULE	input.kconfig	/^config CC_HAS_FOO$/;"	c
 stringify	input.kconfig	/^stringify = $(squote)$(quote)$1$(quote)$(squote)$/;"	v
diff --git a/Units/parser-kconfig.r/simple-kconfig.d/expected.tags b/Units/parser-kconfig.r/simple-kconfig.d/expected.tags
@@ -115,7 +115,7 @@ net/mptcp/Kconfig	input-3.kconfig	/^source "net\/mptcp\/Kconfig"$/;"	k	menu:Netw
 NETWORK_SECMARK	input-3.kconfig	/^config NETWORK_SECMARK$/;"	c	menu:Networking options	typeref:typename:bool	roles:def
 CONFIG_NETWORK_SECMARK	input-3.kconfig	/^config NETWORK_SECMARK$/;"	c	menu:Networking options	roles:def
 CONFIG_NETWORK_SECMARK_MODULE	input-3.kconfig	/^config NETWORK_SECMARK$/;"	c	menu:Networking options	roles:def
-NET_PTP_CLASSIFY	input-3.kconfig	/^config NET_PTP_CLASSIFY$/;"	c	menu:Networking options	roles:def
+NET_PTP_CLASSIFY	input-3.kconfig	/^config NET_PTP_CLASSIFY$/;"	c	menu:Networking options	typeref:typename:bool	roles:def
 CONFIG_NET_PTP_CLASSIFY	input-3.kconfig	/^config NET_PTP_CLASSIFY$/;"	c	menu:Networking options	roles:def
 CONFIG_NET_PTP_CLASSIFY_MODULE	input-3.kconfig	/^config NET_PTP_CLASSIFY$/;"	c	menu:Networking options	roles:def
 NETWORK_PHY_TIMESTAMPING	input-3.kconfig	/^config NETWORK_PHY_TIMESTAMPING$/;"	c	menu:Networking options	typeref:typename:bool	roles:def

diff --git a/optlib/kconfig.c b/optlib/kconfig.c
@@ -76,12 +76,12 @@ extern parserDefinition* KconfigParser (void)
 		"{{\n"
 		"   .\n"
 		"}}", NULL, false},
-		{"^[ \t]*(bool|boolean|hex|int|string|tristate)\\>", "",
+		{"^[ \t]*(def_)?(bool|boolean|hex|int|string|tristate)\\>", "",
 		"", "{exclusive}"
 		"{{\n"
 		"   count 0 gt {\n"
-		"         \\1 typeref:\n"
-		"         pop\n"
+		"         \\2 typeref:\n"
+		"         clear\n"
 		"   } if\n"
 		"}}", NULL, false},
 		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$", "CONFIG_\\2",

diff --git a/optlib/kconfig.ctags b/optlib/kconfig.ctags
@@ -56,10 +56,10 @@
 --regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$/\2/c/{scope=ref}{{
    .
 }}
---regex-Kconfig=/^[ \t]*(bool|boolean|hex|int|string|tristate)\>///{exclusive}{{
+--regex-Kconfig=/^[ \t]*(def_)?(bool|boolean|hex|int|string|tristate)\>///{exclusive}{{
    count 0 gt {
-         \1 typeref:
-         pop
+         \2 typeref:
+         clear
    } if
 }}
 --regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$/CONFIG_\2/c/{scope=ref}{_extra=configPrefixed}