Skip to content

Fix string expression parsing for non-English contract text #62

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

Open
tinygrox wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −6
Open

Fix string expression parsing for non-English contract text #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed4dce
fix(parser): avoid misparsing translated text in string expressions
tinygrox Mar 19, 2026
356b296
Update StringExpressionParser.cs
tinygrox Mar 19, 2026
3885eac
Update StringExpressionParser.cs
tinygrox Mar 19, 2026
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
6 changes: 3 additions & 3 deletions source/ContractConfigurator/ExpressionParser/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@ public virtual T ParseDataStoreIdentifier(Token token)

public Token ParseIdentifier()
{
Match m = Regex.Match(expression, @"([A-Za-z][\w\d]*).*");
Match m = Regex.Match(expression, @"([A-Za-z][A-Za-z0-9_]*).*");
string identifier = m.Groups[1].Value;
expression = (expression.Length > identifier.Length ? expression.Substring(identifier.Length) : "");

Expand All @@ -1365,7 +1365,7 @@ public Token ParseIdentifier()

public Token ParseSpecialIdentifier()
{
Match m = Regex.Match(expression, @"^@(/?(?>([A-Za-z][\w\d]*|\.\.)/)*[A-Za-z][\w\d:]*).*");
Match m = Regex.Match(expression, @"^@(/?(?>(?:[A-Za-z][A-Za-z0-9_]*|\.\.)/)*[A-Za-z][A-Za-z0-9_]*(?::[A-Za-z][A-Za-z0-9_]*)*).*");
string identifier = m.Groups[1].Value;
expression = (expression.Length > identifier.Length + 1 ? expression.Substring(identifier.Length + 1) : "");

Expand All @@ -1374,7 +1374,7 @@ public Token ParseSpecialIdentifier()

public Token ParseDataStoreIdentifier()
{
Match m = Regex.Match(expression, @"^\$(/?(?>([A-Za-z][\w\d]*|\.\.)/)*[A-Za-z][\w\d:]*).*");
Match m = Regex.Match(expression, @"^\$(/?(?>(?:[A-Za-z][A-Za-z0-9_]*|\.\.)/)*[A-Za-z][A-Za-z0-9_]*(?::[A-Za-z][A-Za-z0-9_]*)*).*");
string identifier = m.Groups[1].Value;
expression = (expression.Length > identifier.Length + 1 ? expression.Substring(identifier.Length + 1) : "");

Expand Down
2 changes: 1 addition & 1 deletion source/ContractConfigurator/ExpressionParser/Parsers/SimpleTypes/ListExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public TResult ParseWhereMethod<TResult>(List<T> obj)
ParseToken("(");

// Get the identifier for the object
Match m = Regex.Match(expression, @"([A-Za-z][\w\d]*)[\s]*=>[\s]*(.*)");
Match m = Regex.Match(expression, @"([A-Za-z][A-Za-z0-9_]*)[\s]*=>[\s]*(.*)");
string identifier = m.Groups[1].Value;
expression = (string.IsNullOrEmpty(identifier) ? expression : m.Groups[2].Value);

Expand Down
4 changes: 2 additions & 2 deletions source/ContractConfigurator/ExpressionParser/Parsers/SimpleTypes/StringExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public override TResult ParseStatement<TResult>()
else
{
// Check for an immediate function call
Match m = Regex.Match(expression, @"^\w[\w\d]*\(");
Match m = Regex.Match(expression, @"^[A-Za-z][A-Za-z0-9_]*\(");
if (m.Success)
{
return base.ParseStatement<TResult>();
Expand All @@ -110,7 +110,7 @@ public override TResult ParseStatement<TResult>()
int dataStoreIdentifierIndex = m.Success ? m.Index : -1;

// Look for function calls
m = Regex.Match(expression, @"(\A|\s)\w[\w\d]*\(");
m = Regex.Match(expression, @"(\A|\s)[A-Za-z][A-Za-z0-9_]*\(");
int functionIndex = m == Match.Empty ? -1 : m.Index;

// Look for an end quote
Expand Down
Loading