Skip to content

Fix collector_useViaType #45

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

Draft
sungshik wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix collector_useViaType #45

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
f9b2757
Add test that checks (the consistency of) `useDef`, `uses`, and `defi…
sungshik May 13, 2026
0c30800
Fix issue that `collector_useViaType` didn't collect the provided dat…
sungshik May 13, 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
1 change: 1 addition & 0 deletions src/analysis/typepal/Collector.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co

void collector_useViaType(Tree container, Tree selector, set[IdRole] idRolesSel){
if(building){
collector_use(selector, idRolesSel);
name = normalizeName("<selector>");
selectorLoc = getLoc(selector);
containerLoc = getLoc(container);
Expand Down
24 changes: 24 additions & 0 deletions src/examples/fwjava/Test.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,28 @@ test bool fwjTests() {
runName = "FwJava");
}

test bool fwjUseDefTests1() = checkUseDefsOf("cpt");
test bool fwjUseDefTests2() = checkUseDefsOf("pair");
test bool fwjUseDefTests3() = checkUseDefsOf("tmp");

private bool checkUseDefsOf(str name) {
tm = fwjTModelFromName(name, false);
assert size(tm.useDef) > 0 : "Expected: \>0 use-defs. Actual: <size(tm.useDef)>.";

for (<lUse, lDef> <- tm.useDef) {
uses = [u | u: use(_, _, lUse, _, _) <- tm.uses];
assert [] != uses : "Expected: Use at <lUse>. Actual: No use.";

defs = [d | d: <_, _, _, _, lDef, _> <- tm.defines];
assert [] != defs : "Expected: Def at <lDef>. Actual: No def.";

for (u <- uses, d <- defs) {
assert u.id == d.id : "Expected: Equal `id`. Actual: `<u.id>` (use) vs. `<d.id>` (def)";
assert u.orgId == d.orgId : "Expected: Equal `orgId`. Actual: `<u.id>` (use) vs. `<d.id>` (def)";
}
}

return true;
}

value main() = fwjTests();
Loading