From 8039269b6d218971316173604ff7f3bfff861283 Mon Sep 17 00:00:00 2001 From: Toine Hartman Date: Thu, 29 Jan 2026 11:25:55 +0100 Subject: [PATCH 1/2] Remove functions that moved to typepal. --- .../check/tests/StaticTestingUtils.rsc | 2 + src/org/rascalmpl/library/Location.rsc | 37 ------------------- .../library/lang/box/util/Tree2Box.rsc | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc index 3281a35486f..9557c6bee96 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc @@ -46,6 +46,8 @@ import lang::rascalcore::check::RascalConfig; import lang::rascalcore::check::Checker; import lang::rascal::\syntax::Rascal; +extend analysis::typepal::Collector; + bool verbose = false; PathConfig pathConfigForTesting() { diff --git a/src/org/rascalmpl/library/Location.rsc b/src/org/rascalmpl/library/Location.rsc index fe165676dd3..c812df006e3 100644 --- a/src/org/rascalmpl/library/Location.rsc +++ b/src/org/rascalmpl/library/Location.rsc @@ -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]); - diff --git a/src/org/rascalmpl/library/lang/box/util/Tree2Box.rsc b/src/org/rascalmpl/library/lang/box/util/Tree2Box.rsc index 6aff94d64e0..b270ab7fb90 100644 --- a/src/org/rascalmpl/library/lang/box/util/Tree2Box.rsc +++ b/src/org/rascalmpl/library/lang/box/util/Tree2Box.rsc @@ -241,7 +241,7 @@ default Box toBox(t:appl(Production p, list[Tree] args), FO opts = fo()) { // if the sort name is statement-like and the structure block-like, we go for // vertical with indentation // program: "begin" Declarations decls {Statement ";"}* body "end" ; - case : + case : return V([ H([*[toBox(p, opts=opts) | Tree p <- elements[0..size(pre)]], toBox(elements[size(pre)], opts=opts)]), I([V([toBox(e, opts=opts) | Tree e <- elements[size(pre)+1..-1]])]), From 5452e808d5359a79ae4b4e0a90184ee0784d1f93 Mon Sep 17 00:00:00 2001 From: Toine Hartman Date: Fri, 30 Jan 2026 14:21:02 +0100 Subject: [PATCH 2/2] Explain why extend instead of import. --- .../compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc index 9557c6bee96..351218416d0 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc @@ -46,7 +46,7 @@ import lang::rascalcore::check::RascalConfig; import lang::rascalcore::check::Checker; import lang::rascal::\syntax::Rascal; -extend analysis::typepal::Collector; +extend analysis::typepal::Collector; // for private isContainedIn bool verbose = false;