Skip to content
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

Jump to bottom

Revert "Allow ValueTableLineParser to handle the case of (number " ") without…" #59

Closed
wants to merge 1 commit into from
Closed

Revert "Allow ValueTableLineParser to handle the case of (number " ") without…" #59

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
4 changes: 1 addition & 3 deletions DbcParserLib/Parsers/ValueTableLineParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
private const string ValueTableLineStarter = "VAL_ ";
private const string ValueTableLinkParsingRegex = @"VAL_\s+(\d+)\s+([a-zA-Z_][\w]*)\s+([a-zA-Z_][\w]*)\s*;";
private const string ValueTableParsingRegex = @"VAL_\s+(?:(?:(\d+)\s+([a-zA-Z_][\w]*))|([a-zA-Z_][\w]*))\s+((?:(?:-?\d+)\s+(?:""[^""]*"")\s+)*)\s*;";
private const string ValueTableNewLineRegex = @"(""[^""]*""\s+)";
private const string ValueTableNewLineRegexReplace = "$1\n";

private readonly IParseFailureObserver m_observer;

Expand All @@ -35,7 +33,7 @@
match = Regex.Match(cleanLine, ValueTableParsingRegex);
if (match.Success)
{
var valueTable = Regex.Replace(match.Groups[4].Value.TrimStart(), ValueTableNewLineRegex, ValueTableNewLineRegexReplace);
var valueTable = match.Groups[4].Value.TrimStart().Replace("\" ", "\"" + Environment.NewLine);

Check failure on line 36 in DbcParserLib/Parsers/ValueTableLineParser.cs

View workflow job for this annotation

GitHub Actions / test 

The name 'Environment' does not exist in the current context

Check failure on line 36 in DbcParserLib/Parsers/ValueTableLineParser.cs

View workflow job for this annotation

GitHub Actions / test 

The name 'Environment' does not exist in the current context

Check failure on line 36 in DbcParserLib/Parsers/ValueTableLineParser.cs

View workflow job for this annotation

GitHub Actions / test 

The name 'Environment' does not exist in the current context

Check failure on line 36 in DbcParserLib/Parsers/ValueTableLineParser.cs

View workflow job for this annotation

GitHub Actions / test 

The name 'Environment' does not exist in the current context
var valueTableDictionary = valueTable.ToDictionary();
if (match.Groups[3].Value != "")
builder.LinkTableValuesToEnvironmentVariable(match.Groups[3].Value, valueTableDictionary);
Expand Down
Loading