Kconfig: ignore comments that start in the middle of a line

Signed-off-by: Masatake YAMATO <[email protected]>
masatake · Aug 23, 2024 · fa0b133 · fa0b133
1 parent 0d56602
commit fa0b133
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 20 deletions.
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
+choice987df5010104	input.kconfig	/^choice # ...$/;"	C	end:10
+C	input.kconfig	/^config C # ...$/;"	c	choice:choice987df5010104	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/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,23 @@ 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]*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,19 @@
          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]*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}