Skip to content

Fix parsing of quoted keys #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skalahonza merged 1 commit into from
Jul 7, 2025
Merged

Fix parsing of quoted keys #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion InfHelper/src/Parsers/ContentParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,20 @@ private void ValidTokenFoundDuringPureValueParsing(object sender, TokenBase toke
keyTmpValue += tokenBase.Symbol;
break;
case TokenType.ValueMarker:
if (!string.IsNullOrEmpty(currentKey.Id))
{
ValueParsingComplete(true);
InitKeyValueParsing();
}
else
{
InitKeyIdParsing();
}
break;
case TokenType.NewLine:
ValueParsingComplete(true);
InitKeyValueParsing();
KeyParsingComplete();
InitKeyIdParsing();
break;
default:
throw new InvalidTokenException("Invalid tokenBase found during comment parsing: " + tokenBase.Symbol);
Expand Down
10 changes: 10 additions & 0 deletions InfHelperTests/src/InfHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@ public void PureValueParsingTest()
Assert.AreEqual("16428, \"Razer\\RzWizardPkg ; [Brackets=X]\"", data["DestinationDirs"]["Razer_Installer_CopyFilesWithBrackets"].PrimitiveValue);
}

[TestMethod()]
public void QuotedKeyParsingTest()
{
string formula =
"[AzaliaManufacturerID.NTamd64.10.0...15063]\r\n\"Realtek High Definition Audio\" = IntcAzAudModel, HDAUDIO\\FUNC_01&VEN_10EC&DEV_0257&SUBSYS_17AA39F5 ; ThinkBook 16p NX ARH\r\n";
var helper = new InfUtil();
var data = helper.Parse(formula);
Assert.AreEqual("IntcAzAudModel, HDAUDIO\\FUNC_01&VEN_10EC&DEV_0257&SUBSYS_17AA39F5", data["AzaliaManufacturerID.NTamd64.10.0...15063"]["Realtek High Definition Audio"].PrimitiveValue);
}

[TestMethod()]
public void SearchMethdTest()
{
Expand Down