Skip to content

Remove obsolete functions #2616

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
DavyLandman merged 4 commits into from
Feb 2, 2026
+3 −38
Merged

Remove obsolete functions #2616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8039269
Remove functions that moved to typepal.
toinehartman Jan 29, 2026
5187d39
Merge remote-tracking branch 'origin/main' into fix/remove-duplicate-…
toinehartman Jan 30, 2026
5452e80
Explain why extend instead of import.
toinehartman Jan 30, 2026
70eec9e
Depend on updated typepal with location utils.
toinehartman Feb 2, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>typepal</artifactId>
<version>0.16.1</version>
<version>0.16.2</version>
<!-- <scope>provided</scope> for shade plugin it can't be provided. At least the rascal dependency in typepal should be provided -->
<scope>compile</scope>
</dependency>
Expand Down
2 changes: 2 additions & 0 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import lang::rascalcore::check::RascalConfig;
import lang::rascalcore::check::Checker;
import lang::rascal::\syntax::Rascal;

import analysis::typepal::LocationChecks;

bool verbose = false;

PathConfig pathConfigForTesting() {
Expand Down
37 changes: 0 additions & 37 deletions src/org/rascalmpl/library/Location.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,40 +212,3 @@ loc cover(list[loc] locs){
}
}
}

// Note: this is a duplicate of LogicalLocation in typepal
// TODO: remove the one in TypePal

bool isLexicallyLess(loc l, loc r, map[loc,loc] m)
= isLexicallyLess(l in m ? m[l] : l, r in m ? m[r] : r);

bool isStrictlyContainedIn(loc inner, loc outer, map[loc,loc] m)
= isStrictlyContainedIn(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isContainedIn(loc inner, loc outer, map[loc,loc] m)
= isContainedIn(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

// bool beginsBefore(loc inner, loc outer, map[loc,loc] m)
// = beginsBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isBefore(loc inner, loc outer, map[loc,loc] m)
= isBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isImmediatelyBefore(loc inner, loc outer, map[loc,loc] m)
= isImmediatelyBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool beginsAfter(loc inner, loc outer, map[loc,loc] m)
= beginsAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isAfter(loc inner, loc outer, map[loc,loc] m)
= beginsAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isImmediatelyAfter(loc inner, loc outer, map[loc,loc] m)
= isImmediatelyAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

bool isOverlapping(loc inner, loc outer, map[loc,loc] m)
= isOverlapping(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);

loc cover(list[loc] locs, map[loc,loc] m)
= cover([l in m ? m[l] : l | l <- locs]);

Loading