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

Fix source info handling in Mastery parser #2482

Merged
merged 3 commits into from
Dec 1, 2023
Merged

Fix source info handling in Mastery parser #2482

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86597bb
Update MasteryParseTreeWalker.java
Nov 29, 2023
07a213d
Merge branch 'finos:master' into pamnar-mastery-2
Nov 30, 2023
aaad2e5
Merge branch 'finos:master' into pamnar-mastery-2
Dec 1, 2023
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 ...rg/finos/legend/engine/language/pure/dsl/mastery/grammar/from/MasteryParseTreeWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,13 +378,13 @@ private Lambda visitLambdaWithFilter(String propertyName, MasteryParserGrammar.C
String inputFilter = ctx.getText().replaceAll(DOLLAR_SIGN, INPUT);
return domainParser.parseLambda(
format(PRECEDENCE_LAMBDA_WITH_FILTER, propertyName, inputFilter),
"", 0, 0, true);
"", 0, 0, walkerSourceInformation.getReturnSourceInfo());
}

private Lambda visitLambdaWithoutFilter(String propertyName)
{
return domainParser.parseLambda(format(SIMPLE_PRECEDENCE_LAMBDA, propertyName),
"", 0, 0, true);
"", 0, 0, walkerSourceInformation.getReturnSourceInfo());
}

private RuleScope visitRuleScopeWithoutPrecedence(MasteryParserGrammar.ScopeContext ctx, Set<String> uniqueScopes,PrecedenceRule precedenceRule)
Expand Down Expand Up @@ -748,7 +748,7 @@ private List<Lambda> visitQueryExpressions(MasteryParserGrammar.QueryExpressions

private Lambda visitLambda(MasteryParserGrammar.LambdaFunctionContext ctx)
{
return domainParser.parseLambda(ctx.getText(), "", 0, 0, true);
return domainParser.parseLambda(ctx.getText(), "", 0, 0, walkerSourceInformation.getReturnSourceInfo());
}

private ResolutionKeyType visitResolutionKeyType(MasteryParserGrammar.ResolutionQueryKeyTypeContext ctx)
Expand Down
Loading