Merge pull request #4057 from masatake/kconfig--fill-choices-with-their-prompts

masatake · web-flow · commit 268a0b573b04 · 2024-08-24T17:46:08.000+09:00
Kconfig: fill names of anonymous choices with the values of their prompts
diff --git a/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/args.ctags b/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/args.ctags
@@ -0,0 +1,5 @@
+--sort=no
+--map-Kconfig=.kconfig
+--extras-Kconfig=-{configPrefixed}
+--fields=+e
+--extras=+r
diff --git a/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/expected.tags b/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/expected.tags
@@ -0,0 +1,6 @@
+A	input.kconfig	/^config A # ...$/;"	c	typeref:typename:bool
+B	input.kconfig	/^	prompt "B"$/;"	C	end:10
+C	input.kconfig	/^config C # ...$/;"	c	choice:B	typeref:typename:bool
+D	input.kconfig	/^menu "D" # ...$/;"	m	end:17
+E	input.kconfig	/^config E # ...$/;"	c	menu:D	typeref:typename:bool
+F	input.kconfig	/^menuconfig F # ...$/;"	c
diff --git a/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/input.kconfig b/Units/parser-kconfig.r/comment-starting-from-middle-of-lines.d/input.kconfig
@@ -0,0 +1,19 @@
+config A # ...
+        bool
+
+choice # ...
+	prompt "B"
+
+config C # ...
+       bool
+
+endchoice # ...
+
+menu "D" # ...
+
+config E # ...
+       bool
+
+endmenu # ...
+
+menuconfig F # ...
diff --git a/Units/parser-kconfig.r/simple-kconfig.d/expected.tags b/Units/parser-kconfig.r/simple-kconfig.d/expected.tags
@@ -51,19 +51,19 @@ CONFIG_JFFS2_RTIME_MODULE	input-1.kconfig	/^config JFFS2_RTIME$/;"	c	roles:def
 JFFS2_RUBIN	input-1.kconfig	/^config JFFS2_RUBIN$/;"	c	typeref:typename:bool	roles:def
 CONFIG_JFFS2_RUBIN	input-1.kconfig	/^config JFFS2_RUBIN$/;"	c	roles:def
 CONFIG_JFFS2_RUBIN_MODULE	input-1.kconfig	/^config JFFS2_RUBIN$/;"	c	roles:def
-choicebf6231840104	input-1.kconfig	/^choice$/;"	C	roles:def
-JFFS2_CMODE_NONE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:choicebf6231840104	typeref:typename:bool	roles:def
-CONFIG_JFFS2_CMODE_NONE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:choicebf6231840104	roles:def
-CONFIG_JFFS2_CMODE_NONE_MODULE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:choicebf6231840104	roles:def
-JFFS2_CMODE_PRIORITY	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:choicebf6231840104	typeref:typename:bool	roles:def
-CONFIG_JFFS2_CMODE_PRIORITY	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:choicebf6231840104	roles:def
-CONFIG_JFFS2_CMODE_PRIORITY_MODULE	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:choicebf6231840104	roles:def
-JFFS2_CMODE_SIZE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:choicebf6231840104	typeref:typename:bool	roles:def
-CONFIG_JFFS2_CMODE_SIZE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:choicebf6231840104	roles:def
-CONFIG_JFFS2_CMODE_SIZE_MODULE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:choicebf6231840104	roles:def
-JFFS2_CMODE_FAVOURLZO	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:choicebf6231840104	typeref:typename:bool	roles:def
-CONFIG_JFFS2_CMODE_FAVOURLZO	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:choicebf6231840104	roles:def
-CONFIG_JFFS2_CMODE_FAVOURLZO_MODULE	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:choicebf6231840104	roles:def
+JFFS2 default compression mode	input-1.kconfig	/^	prompt "JFFS2 default compression mode" if JFFS2_COMPRESSION_OPTIONS$/;"	C	roles:def
+JFFS2_CMODE_NONE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:JFFS2 default compression mode	typeref:typename:bool	roles:def
+CONFIG_JFFS2_CMODE_NONE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:JFFS2 default compression mode	roles:def
+CONFIG_JFFS2_CMODE_NONE_MODULE	input-1.kconfig	/^config JFFS2_CMODE_NONE$/;"	c	choice:JFFS2 default compression mode	roles:def
+JFFS2_CMODE_PRIORITY	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:JFFS2 default compression mode	typeref:typename:bool	roles:def
+CONFIG_JFFS2_CMODE_PRIORITY	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:JFFS2 default compression mode	roles:def
+CONFIG_JFFS2_CMODE_PRIORITY_MODULE	input-1.kconfig	/^config JFFS2_CMODE_PRIORITY$/;"	c	choice:JFFS2 default compression mode	roles:def
+JFFS2_CMODE_SIZE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:JFFS2 default compression mode	typeref:typename:bool	roles:def
+CONFIG_JFFS2_CMODE_SIZE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:JFFS2 default compression mode	roles:def
+CONFIG_JFFS2_CMODE_SIZE_MODULE	input-1.kconfig	/^config JFFS2_CMODE_SIZE$/;"	c	choice:JFFS2 default compression mode	roles:def
+JFFS2_CMODE_FAVOURLZO	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:JFFS2 default compression mode	typeref:typename:bool	roles:def
+CONFIG_JFFS2_CMODE_FAVOURLZO	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:JFFS2 default compression mode	roles:def
+CONFIG_JFFS2_CMODE_FAVOURLZO_MODULE	input-1.kconfig	/^config JFFS2_CMODE_FAVOURLZO$/;"	c	choice:JFFS2 default compression mode	roles:def
 HAVE_ARCH_KGDB	input-2.kconfig	/^config HAVE_ARCH_KGDB$/;"	c	typeref:typename:bool	roles:def
 CONFIG_HAVE_ARCH_KGDB	input-2.kconfig	/^config HAVE_ARCH_KGDB$/;"	c	roles:def
 CONFIG_HAVE_ARCH_KGDB_MODULE	input-2.kconfig	/^config HAVE_ARCH_KGDB$/;"	c	roles:def
diff --git a/Units/parser-kconfig.r/unbalance.d/args.ctags b/Units/parser-kconfig.r/unbalance.d/args.ctags
@@ -0,0 +1,5 @@
+--sort=no
+--map-Kconfig=.kconfig
+--extras-Kconfig=-{configPrefixed}
+--fields=+e
+--extras=+r
diff --git a/Units/parser-kconfig.r/unbalance.d/expected.tags b/Units/parser-kconfig.r/unbalance.d/expected.tags
@@ -0,0 +1,10 @@
+A	input.kconfig	/^config A$/;"	c	typeref:typename:bool
+B	input.kconfig	/^config B$/;"	c	typeref:typename:bool
+Y	input-0.kconfig	/^menu "Y"$/;"	m	end:11
+C	input-0.kconfig	/^config C$/;"	c	menu:Y	typeref:typename:bool
+D	input-0.kconfig	/^config D$/;"	c	menu:Y	typeref:typename:bool
+E	input-1.kconfig	/^config E$/;"	c	typeref:typename:bool
+F	input-1.kconfig	/^config F$/;"	c	typeref:typename:bool
+W	input-2.kconfig	/^choice W$/;"	C	end:8
+G	input-2.kconfig	/^	config G$/;"	c	choice:W	typeref:typename:bool
+H	input-3.kconfig	/^config H$/;"	c	typeref:typename:bool
diff --git a/Units/parser-kconfig.r/unbalance.d/input-0.kconfig b/Units/parser-kconfig.r/unbalance.d/input-0.kconfig
@@ -0,0 +1,11 @@
+menu "Y"
+
+config C
+       bool
+       help
+         endmenu - a dummy
+
+config D
+       bool
+
+endmenu
diff --git a/Units/parser-kconfig.r/unbalance.d/input-1.kconfig b/Units/parser-kconfig.r/unbalance.d/input-1.kconfig
@@ -0,0 +1,8 @@
+config E
+       bool
+       help
+	 choice Z0 or Z1
+
+config F
+       bool
+
diff --git a/Units/parser-kconfig.r/unbalance.d/input-2.kconfig b/Units/parser-kconfig.r/unbalance.d/input-2.kconfig
@@ -0,0 +1,8 @@
+choice W
+	help
+	  endchoice but this is a part of help message
+
+	config G
+	       bool
+
+endchoice
diff --git a/Units/parser-kconfig.r/unbalance.d/input-3.kconfig b/Units/parser-kconfig.r/unbalance.d/input-3.kconfig
@@ -0,0 +1,4 @@
+config H
+       bool
+       help
+         source "V" is a part of a help message.
diff --git a/Units/parser-kconfig.r/unbalance.d/input.kconfig b/Units/parser-kconfig.r/unbalance.d/input.kconfig
@@ -0,0 +1,7 @@
+config A
+	bool
+	help
+	  menu "X" rest
+
+config B
+       bool
diff --git a/optlib/kconfig.c b/optlib/kconfig.c
@@ -71,7 +71,7 @@ extern parserDefinition* KconfigParser (void)
 	static tagRegexTable KconfigTagRegexTable [] = {
 		{"^[ \t]*#.*$", "",
 		"", "{placeholder}", NULL, false},
-		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$", "\\2",
+		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$", "\\2",
 		"c", "{scope=ref}"
 		"{{\n"
 		"   .\n"
@@ -84,23 +84,50 @@ extern parserDefinition* KconfigParser (void)
 		"         clear\n"
 		"   } if\n"
 		"}}", NULL, false},
-		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$", "CONFIG_\\2",
+		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$", "CONFIG_\\2",
 		"c", "{scope=ref}{_extra=configPrefixed}", NULL, false},
-		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$", "CONFIG_\\2_MODULE",
+		{"^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$", "CONFIG_\\2_MODULE",
 		"c", "{scope=ref}{_extra=configPrefixed}{exclusive}", NULL, false},
-		{"^[ \t]*menu[ \t]+\"([^\"]+)\"[ \t]*", "\\1",
+		{"^[ \t]*menu[ \t]+\"([^\"]+)\"[ \t]*(#.*)?$", "\\1",
 		"m", "{scope=push}{exclusive}", NULL, false},
-		{"^[ \t]*endmenu[ \t]*", "",
+		{"^[ \t]*endmenu[ \t]*(#.*)?$", "",
 		"", "{scope=pop}{placeholder}{exclusive}", NULL, false},
-		{"^[ \t]*source[ \t]+\"?([^\"]+)\"?[ \t]*", "\\1",
+		{"^[ \t]*source[ \t]+\"?([^\"]+)\"?[ \t]*(#.*)?$", "\\1",
 		"k", "{_role=source}{exclusive}{scope=ref}", NULL, false},
-		{"^[ \t]*choice[ \t]+([A-Za-z0-9_]+)[ \t]*", "\\1",
+		{"^[ \t]*choice[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$", "\\1",
 		"C", "{scope=push}{exclusive}", NULL, false},
-		{"^[ \t]*choice[ \t]*$", "",
+		{"^[ \t]*choice[ \t]*(#.*)?$", "",
 		"C", "{_anonymous=choice}{scope=push}{exclusive}", NULL, false},
-		{"^[ \t]*endchoice[ \t]*", "",
+		{"^[ \t]*prompt[ \t]+\"([^\"]+)\"[ \t]*(#.*|if)?", "",
+		"", "{exclusive}"
+		"{{\n"
+		"   _scopetop {\n"
+		"      dup :kind /choice eq {\n"
+		"         dup :extras {\n"
+		"            /anonymous _amember {\n"
+		"               % This is an anonymous tag that kind is choice.\n"
+		"               % Throw it away.\n"
+		"               _markplaceholder\n"
+		"               _scopepop\n"
+		"               % Make a new one with the prompt.\n"
+		"               \\1 /choice @1 _tag _commit _scopepush\n"
+		"            } {\n"
+		"               % This is not an anonymous tag.\n"
+		"               pop\n"
+		"            } ifelse\n"
+		"         } {\n"
+		"            % This is not an extra tag.\n"
+		"            pop\n"
+		"         } ifelse\n"
+		"       } {\n"
+		"          % This is not a choice.\n"
+		"          pop\n"
+		"       } ifelse\n"
+		"   } if\n"
+		"}}", NULL, false},
+		{"^[ \t]*endchoice[ \t]*(#.*)?$", "",
 		"", "{scope=pop}{placeholder}{exclusive}", NULL, false},
-		{"^[ \t]*mainmenu[ \t]+\"([^\"]+)\"[ \t]*", "\\1",
+		{"^[ \t]*mainmenu[ \t]+\"([^\"]+)\"[ \t]*(#.*)?$", "\\1",
 		"M", "{exclusive}", NULL, false},
 		{"^([-a-zA-Z0-9_$]+)[ \t]*:?=", "\\1",
 		"v", "{exclusive}", NULL, false},
diff --git a/optlib/kconfig.ctags b/optlib/kconfig.ctags
@@ -53,7 +53,7 @@
 # skip the comment lines.
 --regex-Kconfig=/^[ \t]*#.*$//{placeholder}
 
---regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$/\2/c/{scope=ref}{{
+--regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$/\2/c/{scope=ref}{{
    .
 }}
 --regex-Kconfig=/^[ \t]*(def_)?(bool|boolean|hex|int|string|tristate)\>///{exclusive}{{
@@ -62,19 +62,44 @@
          clear
    } if
 }}
---regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$/CONFIG_\2/c/{scope=ref}{_extra=configPrefixed}
---regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*$/CONFIG_\2_MODULE/c/{scope=ref}{_extra=configPrefixed}{exclusive}
+--regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$/CONFIG_\2/c/{scope=ref}{_extra=configPrefixed}
+--regex-Kconfig=/^[ \t]*(menu)?config[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$/CONFIG_\2_MODULE/c/{scope=ref}{_extra=configPrefixed}{exclusive}
 
---regex-Kconfig=/^[ \t]*menu[ \t]+"([^"]+)"[ \t]*/\1/m/{scope=push}{exclusive}
---regex-Kconfig=/^[ \t]*endmenu[ \t]*//{scope=pop}{placeholder}{exclusive}
+--regex-Kconfig=/^[ \t]*menu[ \t]+"([^"]+)"[ \t]*(#.*)?$/\1/m/{scope=push}{exclusive}
+--regex-Kconfig=/^[ \t]*endmenu[ \t]*(#.*)?$//{scope=pop}{placeholder}{exclusive}
 
 # Qemu's Kconfig does't use double quotes
---regex-Kconfig=/^[ \t]*source[ \t]+"?([^"]+)"?[ \t]*/\1/k/{_role=source}{exclusive}{scope=ref}
+--regex-Kconfig=/^[ \t]*source[ \t]+"?([^"]+)"?[ \t]*(#.*)?$/\1/k/{_role=source}{exclusive}{scope=ref}
 
---regex-Kconfig=/^[ \t]*choice[ \t]+([A-Za-z0-9_]+)[ \t]*/\1/C/{scope=push}{exclusive}
---regex-Kconfig=/^[ \t]*choice[ \t]*$//C/{_anonymous=choice}{scope=push}{exclusive}
---regex-Kconfig=/^[ \t]*endchoice[ \t]*//{scope=pop}{placeholder}{exclusive}
+--regex-Kconfig=/^[ \t]*choice[ \t]+([A-Za-z0-9_]+)[ \t]*(#.*)?$/\1/C/{scope=push}{exclusive}
+--regex-Kconfig=/^[ \t]*choice[ \t]*(#.*)?$//C/{_anonymous=choice}{scope=push}{exclusive}
+--regex-Kconfig=/^[ \t]*prompt[ \t]+"([^"]+)"[ \t]*(#.*|if)?//{exclusive}{{
+   _scopetop {
+      dup :kind /choice eq {
+         dup :extras {
+            /anonymous _amember {
+               % This is an anonymous tag that kind is choice.
+               % Throw it away.
+               _markplaceholder
+               _scopepop
+               % Make a new one with the prompt.
+               \1 /choice @1 _tag _commit _scopepush
+            } {
+               % This is not an anonymous tag.
+               pop
+            } ifelse
+         } {
+            % This is not an extra tag.
+            pop
+         } ifelse
+       } {
+          % This is not a choice.
+          pop
+       } ifelse
+   } if
+}}
+--regex-Kconfig=/^[ \t]*endchoice[ \t]*(#.*)?$//{scope=pop}{placeholder}{exclusive}
 
---regex-Kconfig=/^[ \t]*mainmenu[ \t]+"([^"]+)"[ \t]*/\1/M/{exclusive}
+--regex-Kconfig=/^[ \t]*mainmenu[ \t]+"([^"]+)"[ \t]*(#.*)?$/\1/M/{exclusive}
 
 --regex-Kconfig=/^([-a-zA-Z0-9_$]+)[ \t]*:?=/\1/v/{exclusive}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +config H
 +       bool
 +       help
 +         source "V" is a part of a help message.