Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/analysis/typepal/ConfigurableScopeGraph.rsc
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ bool defaultReportUnused (loc _, TModel _) {
return false;
}

list[loc] defaultFilterUnused(list[loc] defs, TModel tm) {
bool(loc, TModel) reportUnused = tm.config.reportUnused;
return [d | loc d <- defs, reportUnused(d, tm)];
}

// https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#:~:text=A%20URI%20is%20composed%20from,)%2C%20and%20the%20character%20%25%20.
// gen-delims: : / ? # [ ] @
// sub-delims: ! $ & ' ( ) * + , ;
Expand Down Expand Up @@ -157,6 +162,8 @@ data TypePalConfig(

bool(loc def, TModel tm) reportUnused = defaultReportUnused,

list[loc](list[loc] defs, TModel tm) filterUnused = defaultFilterUnused,

loc (Define def, str modelName, PathConfig pcfg) createLogicalLoc = defaultLogicalLoc,

list[str] (Use u, TModel tm) similarNames = defaultSimilarNames,
Expand Down
13 changes: 5 additions & 8 deletions src/analysis/typepal/Solver.rsc
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){

AType(AType containerType, Tree selector, loc scope, Solver s) getTypeInNamelessTypeFun = defaultGetTypeInNamelessType;

bool(loc def, TModel tm) reportUnused = defaultReportUnused;
list[loc](list[loc] defs, TModel tm) filterUnused = defaultFilterUnused;

map[loc,loc] logical2physical = tm.logical2physical;

Expand Down Expand Up @@ -177,7 +177,7 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
getTypeNamesAndRole = tc.getTypeNamesAndRole;
getTypeInTypeFromDefineFun = tc.getTypeInTypeFromDefine;
getTypeInNamelessTypeFun = tc.getTypeInNamelessType;
reportUnused = tc.reportUnused;
filterUnused = tc.filterUnused;
}

TypePalConfig solver_getConfig() = tm.config;
Expand Down Expand Up @@ -1823,12 +1823,9 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
};
tm.defines = toSet(ldefines);

for(Define def <- tm.defines){
defdefined = solver_toPhysicalLoc(def.defined);
if(defdefined notin def2uses && defdefined notin doubleDefs && reportUnused(defdefined, tm)){
messages += warning("Unused <prettyRole(def.idRole)> `<def.id>`", defdefined);
}
}
list[loc] unused = filterUnused([l | Define def <- tm.defines, loc l := solver_toPhysicalLoc(def.defined), l notin def2uses, l notin doubleDefs], tm);
messages += [warning("Unused <prettyRole(def.idRole)> `<def.id>`", l) | loc l <- unused, Define def := definitions[l]];

messages = visit(messages) { case loc l => solver_toPhysicalLoc(l) };
tm.messages = sortMostPrecise(toList(toSet(messages)));

Expand Down
Loading