Skip to content

Less physical to logical conversions #37

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
PaulKlint merged 5 commits into from
Feb 11, 2026
Merged

Less physical to logical conversions #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83f4ce2
Less physical to logical conversions
PaulKlint Feb 8, 2026
a82624d
Further tweaking
PaulKlint Feb 8, 2026
471be38
Bumped to rascal 0.41.3-RC8
PaulKlint Feb 9, 2026
6b6bd4d
Defend against uninstantiated types
PaulKlint Feb 9, 2026
c4c5c9a
Dependency back to rascal 0.41.2
PaulKlint Feb 10, 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 src/analysis/typepal/Collector.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co
void collector_useViaType(Tree container, Tree selector, set[IdRole] idRolesSel){
if(building){
name = normalizeName("<selector>");
selectorLoc = getLogicalLoc(selector);
containerLoc = getLogicalLoc(container);
calculators += calc("useViaType `<name>` in <containerLoc>", selectorLoc, [containerLoc], makeGetTypeInType(containerLoc, selector, idRolesSel, toLogicalLocs(currentScope)));
selectorLoc = getLoc(selector);
containerLoc = getLoc(container);
calculators += calc("useViaType `<name>` in <containerLoc>", selectorLoc, [containerLoc], makeGetTypeInType(containerLoc, selector, idRolesSel, currentScope));
} else {
throw TypePalUsage("Cannot call `useViaType` on Collector after `run`");
}
Expand Down
6 changes: 5 additions & 1 deletion src/analysis/typepal/Solver.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,9 +667,13 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
}

AType solver_getTypeInType(AType containerType, Tree selector, set[IdRole] idRolesSel, loc scope){
selectorLoc = getLogicalLoc(getLoc(selector));
if(!solver_isFullyInstantiated(containerType)){
throw TypeUnavailable();
}
selectorLoc = getLogicalLoc(selector);
selectorOrgName = "<selector>";
selectorName = normalizeName(selectorOrgName);
scope = getLogicalLoc(scope);

selectorUse = use(selectorName, selectorOrgName, selectorLoc, scope, idRolesSel);
if(overloadedAType(rel[loc, IdRole, AType] overloads) := containerType){
Expand Down