YACC: fix a typo in the pattern for skipping C strings

masatake · masatake · commit 80709d1f45b0 · 2023-12-11T04:49:03.000+09:00
Signed-off-by: Masatake YAMATO &lt;yamato@redhat.com&gt;
diff --git a/Units/parser-yacc.r/token-and-cstr.d/args.ctags b/Units/parser-yacc.r/token-and-cstr.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-yacc.r/token-and-cstr.d/expected.tags b/Units/parser-yacc.r/token-and-cstr.d/expected.tags
@@ -0,0 +1,2 @@
+IDENTIFIER	input.y	/^%token <str> IDENTIFIER "identifier"$/;"	t	typeref:typename:str
+TYPEDEF_NAME	input.y	/^%token <str> TYPEDEF_NAME "typedef-name"$/;"	t	typeref:typename:str
diff --git a/Units/parser-yacc.r/token-and-cstr.d/input.y b/Units/parser-yacc.r/token-and-cstr.d/input.y
@@ -0,0 +1,6 @@
+%{
+%}
+%token <str> IDENTIFIER "identifier"
+%token <str> TYPEDEF_NAME "typedef-name"
+%%
+%%
diff --git a/optlib/yacc.c b/optlib/yacc.c
@@ -146,7 +146,7 @@ static void initializeYACCParser (const langType language)
 	                               "^\\}",
 	                               "", "", "{tleave}{_guest=,,0end}{tleave}", NULL);
 	addLanguageTagMultiTableRegex (language, "cString",
-	                               "^[\\\\\"]+",
+	                               "^[^\\\\\"]+",
 	                               "", "", "", NULL);
 	addLanguageTagMultiTableRegex (language, "cString",
 	                               "^\\\\.",
diff --git a/optlib/yacc.ctags b/optlib/yacc.ctags
@@ -101,7 +101,7 @@
 
 --_mtable-regex-YACC=cEpilogue/.+//{_guest=,,0end}
 
---_mtable-regex-YACC=cString/[\\"]+//
+--_mtable-regex-YACC=cString/[^\\"]+//
 --_mtable-regex-YACC=cString/\\.//
 --_mtable-regex-YACC=cString/"//{tleave}
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+IDENTIFIER input.y /^%token <str> IDENTIFIER "identifier"$/;" t typeref:typename:str`
	`2`	`+TYPEDEF_NAME input.y /^%token <str> TYPEDEF_NAME "typedef-name"$/;" t typeref:typename:str`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +%{
 +%}
 +%token <str> IDENTIFIER "identifier"
 +%token <str> TYPEDEF_NAME "typedef-name"
 +%%
 +%%