Skip to content

Fix/duplicate-use-defs #36

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 4 commits into from
Feb 6, 2026
+15 −11
Merged

Fix/duplicate-use-defs #36

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
8ab3507
Convert locations in a closure to logical locations
PaulKlint Feb 5, 2026
cdf6880
Filter usedef additions
PaulKlint Feb 5, 2026
b572a6a
Some polishing
PaulKlint Feb 6, 2026
887bc10
Removed commented line
PaulKlint Feb 6, 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
9 changes: 5 additions & 4 deletions src/analysis/typepal/Collector.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,17 +376,18 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co
}
}

AType(Solver) makeGetTypeInType(Tree container, Tree selector, set[IdRole] idRolesSel, loc scope){
AType(Solver) makeGetTypeInType(loc containerLoc, Tree selector, set[IdRole] idRolesSel, loc scope){
return AType(Solver s) {
return s.getTypeInType(s.getType(container), selector, idRolesSel, scope);
return s.getTypeInType(s.getType(containerLoc), selector, idRolesSel, scope);
};
}

void collector_useViaType(Tree container, Tree selector, set[IdRole] idRolesSel){
if(building){
name = normalizeName("<selector>");
sloc = getLoc(selector);
calculators += calc("useViaType `<name>` in <getLoc(container)>", sloc, [getLoc(container)], makeGetTypeInType(container, selector, idRolesSel, currentScope));
selectorLoc = getLogicalLoc(selector);
containerLoc = getLogicalLoc(container);
calculators += calc("useViaType `<name>` in <containerLoc>", selectorLoc, [containerLoc], makeGetTypeInType(containerLoc, selector, idRolesSel, toLogicalLocs(currentScope)));
} else {
throw TypePalUsage("Cannot call `useViaType` on Collector after `run`");
}
Expand Down
17 changes: 10 additions & 7 deletions src/analysis/typepal/Solver.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,6 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){

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

Expand All @@ -684,13 +683,15 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
}
if(isEmpty(valid_overloads)){
solver_report(error(selector, "Cannot access field on overloaded type %t", containerType));
} else if({<loc key, IdRole _, AType tp>} := valid_overloads){
addUse({key}, selectorUse);
} else if({<loc key, IdRole idr, AType tp>} := valid_overloads){
if(idr in idRolesSel) addUse({key}, selectorUse);
addFact(selectorLoc, tp);
return tp;
} else {
for(<loc key, IdRole idr, AType _> <- valid_overloads){
if(idr in idRolesSel) addUse({key}, selectorUse);
}
tp2 = overloadedAType(valid_overloads);
addUse(valid_overloads<0>, selectorUse);
addFact(selectorLoc, tp2);

return tp2;
Expand Down Expand Up @@ -731,13 +732,15 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
else
solver_report(error(selector, "No definition for type %t is available here", containerType));
}
} else if({<loc key, IdRole _, AType tp>} := valid_overloads){
addUse({key}, selectorUse);
} else if({<loc key, IdRole idr, AType tp>} := valid_overloads){
if(idr in idRolesSel) addUse({key}, selectorUse);
addFact(selectorLoc, tp);
return tp;
} else {
for(<loc key, IdRole idr, AType tp> <- valid_overloads){
if(idr in idRolesSel) addUse({key}, selectorUse);
}
tp2 = overloadedAType(valid_overloads);
addUse(valid_overloads<0>, selectorUse);
addFact(selectorLoc, tp2);
return tp2;
}
Expand Down