Merge pull request #41 from usethesource/fix/warnings

Fix some type warnings

Also fixes usethesource/rascal#2442

Author: PaulKlint

src/analysis/typepal/Collector.rsc

@@ -956,11 +956,11 @@ Collector newCollector(str modelName, map[str,Tree] namedTrees, TypePalConfig co
         if(logicalLoc != def.defined){
             if(logicalLoc in logical2physical){
                 if(logical2physical[logicalLoc] != def.defined){
-                    causes = [ info("Clone of `<def.id>`", logical2physical[logicalLoc]),
-                                info("Clone of `<def.id>`", def.defined) 
+                    causes = [ info("First declaration of <prettyRole(def.idRole)> `<def.id>`", logical2physical[logicalLoc]),
+                               info("Second declaration of <prettyRole(def.idRole)> `<def.id>`", def.defined) 
                             ];
                     // restrict clone location to first line for readability
-                    messages += error("Remove code clone for <prettyRole(def.idRole)> `<def.id>`", limitLocToFirstLine(def.defined), causes=causes);
+                    messages += error("Duplicate declaration of <prettyRole(def.idRole)> `<def.id>`", limitLocToFirstLine(def.defined), causes=causes);
                 }
             }
             logical2physical[logicalLoc] = def.defined;  

src/analysis/typepal/Exception.rsc

@@ -20,12 +20,12 @@ module analysis::typepal::Exception
 extend analysis::typepal::FailMessage;
 
 data RuntimeException
-    = TypePalUsage(str reason)                      // TypePal used incorrectly
-    | TypePalUsage(str reason, list[loc] details)   // TypePal used incorrectly, with additional details
-    | TypePalInternalError(str reason)              // TypePal internal error
-    | TypeUnavailable()                             // Type is not available: used in control flow of solver
-    | checkFailed(list[FailMessage] msgs)           // Type check failed: used in control flow of solver
-    | wrongTplVersion(str reason)                   // Outdated TPL version is used
+    = TypePalUsage(str msg)                      // TypePal used incorrectly
+    | TypePalUsage(str msg, list[loc] details)   // TypePal used incorrectly, with additional details
+    | TypePalInternalError(str msg)              // TypePal internal error
+    | TypeUnavailable()                          // Type is not available: used in control flow of solver
+    | checkFailed(list[FailMessage] msgs)        // Type check failed: used in control flow of solver
+    | wrongTplVersion(str msg)                   // Outdated TPL version is used
     ;
 
 data Exception