From 8f4ac4fd61dd043f85c5120a94e038491a10c001 Mon Sep 17 00:00:00 2001
From: paulklint <Paul.Klint@cwi.nl>
Date: Sun, 8 Feb 2026 15:27:49 +0100
Subject: [PATCH 1/3] Added missing imports

---
 .../rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc  | 1 +
 .../lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc | 1 +
 .../lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc      | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc
index d985d5400d..6e1f3894d8 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/RascalConfig.rsc
@@ -45,6 +45,7 @@ import util::FileSystem;
 import util::Reflective;
 import lang::rascalcore::compile::util::Names;
 import analysis::typepal::StringSimilarity;
+import analysis::typepal::LocationChecks;
 
 import IO;
 import List;
diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc
index 3029d44c68..8604a2588f 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/ConcreteSyntax.rsc
@@ -38,6 +38,7 @@ import Message;
 import String;
 import IO;
 import Location;
+import analysis::typepal::LocationChecks;
 
 // WARNING: this module is sensitive to bootstrapping dependencies and implicit contracts:
 // 
diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc
index fd3936d6b3..186157ae81 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Rascal2muRascal/TypeUtils.rsc
@@ -44,6 +44,7 @@ import lang::rascalcore::check::NameUtils;
 import lang::rascalcore::compile::Rascal2muRascal::TmpAndLabel;
 
 import Location;
+import analysis::typepal::LocationChecks;
 
 import lang::rascalcore::check::BasicRascalConfig;
 import lang::rascalcore::check::BuiltinFields;
@@ -267,7 +268,7 @@ private loc findContainer(Define d){
     }
     return cscope;
 }
-
+  
 str findDefiningModule(loc l){
     for(ms <- module_scopes,isContainedIn(l, ms, current_tmodel.logical2physical)){
         return definitions[ms].id;

From 4723ac415a88a6ee5ba38f2640a33c0dee7e79d0 Mon Sep 17 00:00:00 2001
From: paulklint <Paul.Klint@cwi.nl>
Date: Mon, 9 Feb 2026 16:50:37 +0100
Subject: [PATCH 2/3] Possible fix for unresolved tvars

---
 .../compiler/lang/rascalcore/check/CollectStatement.rsc         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectStatement.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectStatement.rsc
index 8877c85fef..b6c77d3d95 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectStatement.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/CollectStatement.rsc
@@ -715,7 +715,7 @@ private void checkAssignment(Statement current, (Assignable) `<QualifiedName nam
             if(c.isAlreadyDefined("<name>", name)){
                 c.use(name, variableRoles);
             } else {
-                c.define(base, variableId(), name, defLub([statement],
+                c.define(base, variableId(), name, defType([statement],
                     AType(Solver s){
                         // TODO: this seemingly redundant call is needed; suspicion: the interpreter does not
                         // handle the combination of return and possible exception thrown by s.getType properly

From b5ddcb6224918a76642a9ea054b88275bfe9a4dc Mon Sep 17 00:00:00 2001
From: paulklint <Paul.Klint@cwi.nl>
Date: Tue, 10 Feb 2026 14:11:47 +0100
Subject: [PATCH 3/3] Added php in configs

---
 .../rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc
index a891361b69..d0d3ed92b7 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc
@@ -161,7 +161,8 @@ public PathConfig getAllSrcREPOPathConfig(bool keep = false) {
                             REPO + "typepal/src",
                             LSP_REPO + "src/main/rascal/library",
                             LSP_REPO + "src/main/rascal/lsp",
-                            LSP_REPO + "src/test/rascal"
+                            LSP_REPO + "src/test/rascal",
+                            REPO + "php-analysis/src/main/rascal"
                         ],
                         [ ], 
                         keep=keep);