Skip to content

Replace deprecated loc annos on concrete trees #2724

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
jurgenvinju merged 2 commits into from
Mar 20, 2026
+11 −3
Merged

Replace deprecated loc annos on concrete trees #2724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3c1083
Failing test for #2723.
toinehartman Mar 20, 2026
03d9db4
Replace deprecated `@loc` anno with `src` kw param
toinehartman Mar 20, 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
8 changes: 8 additions & 0 deletions src/org/rascalmpl/library/lang/rascal/syntax/tests/ConcreteSyntax.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module lang::rascal::\syntax::tests::ConcreteSyntax

import Node;

syntax A
= a:"a"
| b:"b"
Expand Down Expand Up @@ -78,3 +80,9 @@ public test bool matchstar4() = (S) `star <S* _>.` := star_two;
public test bool matchstar5() = (S) `star <S _> <S* _>.` := star_two;

public test bool splicestar1() = (S*) x := star_two.\list && (S) `star s s s s.` := (S) `star <S x> <S* x>.` ;

test bool noLocAnnos() {
a = (A) `a b`;
kwParams = {kw | /node t := a, kw <- getKeywordParameters(t)};
return "loc" notin kwParams;
}
6 changes: 3 additions & 3 deletions src/org/rascalmpl/semantics/dynamic/Tree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ public Result<IValue> interpret(IEvaluator<Result<IValue>> eval) {
ISourceLocation location = getLocation();

if (location != null) {
java.util.Map<String,IValue> annos = new HashMap<String,IValue>();
annos.put("loc", location);
return makeResult(type, VF.appl(annos, production, flatten(w.done())), eval);
java.util.Map<String, IValue> kwParams = new HashMap<>();
kwParams.put(RascalValueFactory.Location, location);
return makeResult(type, VF.appl(kwParams, production, flatten(w.done())), eval);
}
else {
return makeResult(type, VF.appl(production, flatten(w.done())), eval);
Expand Down
Loading