Adapted to new configuration settings

usethesource · Nov 13, 2024 · d6c21a2 · d6c21a2
1 parent fa9a53b
commit d6c21a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/analysis/typepal/Collector.rsc b/src/analysis/typepal/Collector.rsc
@@ -1016,7 +1016,7 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co
                 throw TypePalUsage("Missing `leaveScope`(s): unclosed scopes <unclosed>");
            }
 
-           tm = tmodel();
+           tm = tmodel()[usesPhysicalLocs=true];
            tm.modelName = modelName;
 
            tm.moduleLocs = (nm : getLoc(namedTrees[nm]) | nm <- namedTrees);

diff --git a/src/analysis/typepal/Solver.rsc b/src/analysis/typepal/Solver.rsc
@@ -1519,7 +1519,7 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
              } catch NoBinding(): {
                 roles = size(u.idRoles) > 5 ? "" : intercalateOr([prettyRole(idRole) | idRole <- u.idRoles]);
                 msg =  error("Undefined <roles> `<getOrgId(u)>`", u.occ);
-                if(config.enableErrorFixes){
+                if(tm.config.enableErrorFixes){
                     msg.fixes = undefinedNameProposals(u, tm);
                 }
                 messages += msg;
@@ -1529,7 +1529,7 @@ Solver newSolver(map[str,Tree] namedTrees, TModel tm){
         for(u <- notYetDefinedUses){
             roles = size(u.idRoles) > 5 ? "" : intercalateOr([prettyRole(idRole) | idRole <- u.idRoles]);
             msg = error("Undefined <roles> `<getOrgId(u)>`", u.occ);
-            if(config.enableErrorFixes){
+            if(tm.config.enableErrorFixes){
                 msg.fixes = undefinedNameProposals(u, tm);
             }
             messages += msg;

diff --git a/src/analysis/typepal/StringSimilarity.rsc b/src/analysis/typepal/StringSimilarity.rsc
@@ -1,8 +1,10 @@
 module analysis::typepal::StringSimilarity
 
 import List;
+import Set;
 import String;
 import analysis::typepal::TModel;
+import  analysis::typepal::ConfigurableScopeGraph;
 
 @synopsis{Tryadic minimum function on integers}
 int min(int a, int b, int c)
@@ -50,10 +52,10 @@ alias WordSim = tuple[str word, int sim];
 
 @synopsis{Compute list of words from vocabulary, that are similar to give word w with at most maxDistance edits}
 list[str] similarWords(str w, list[str] vocabulary, int maxDistance)
-= sort([ <v, d> | str v <- vocabulary, d := lev(w, v), d <= maxDistance ], bool (WordSim x, WordSim y){ return x.sim < y.sim;}).word;
+= sort({ <v, d> | str v <- vocabulary, d := lev(w, v), d <= maxDistance }, bool (WordSim x, WordSim y){ return x.sim < y.sim;}).word;
 
 @synopsis{Find in TModel tm, names similar to w, in gives roles. Max edit distance comes from TypePal Configuration.}
 list[str] similarNames(str w, set[IdRole] idRoles, TModel tm){
     vocabulary = [ d.orgId | d <- tm.defines, d.idRole in idRoles ];
-    return similarWords(w, vocabulary, maxDistance,tm.config.cutoffForNameSimilarity);
+    return similarWords(w, vocabulary, tm.config.cutoffForNameSimilarity);
 }