From 13d5a58b3d1cf3911c7dfe67427df4f2d241d550 Mon Sep 17 00:00:00 2001
From: ImVeryBad <nightbear843@yahoo.com>
Date: Sun, 22 Mar 2026 17:57:36 +0100
Subject: [PATCH] Merge the `PolymodParserEx` into `Parser`.

---
 polymod/hscript/HScriptable.hx               |  6 ++---
 polymod/hscript/_internal/Parser.hx          | 13 ++++++++++
 polymod/hscript/_internal/PolymodInterpEx.hx |  2 +-
 polymod/hscript/_internal/PolymodParserEx.hx | 26 --------------------
 4 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 polymod/hscript/_internal/PolymodParserEx.hx

diff --git a/polymod/hscript/HScriptable.hx b/polymod/hscript/HScriptable.hx
index 02f34c68..907b4596 100644
--- a/polymod/hscript/HScriptable.hx
+++ b/polymod/hscript/HScriptable.hx
@@ -260,14 +260,14 @@ class ScriptRunner
 
 class Script
 {
-  private static var parser:polymod.hscript._internal.PolymodParserEx;
+  private static var parser:polymod.hscript._internal.Parser;
 
   public var program:Expr;
   public var interp:polymod.hscript._internal.PolymodInterpEx;
 
-  public static function buildParser():polymod.hscript._internal.PolymodParserEx
+  public static function buildParser():polymod.hscript._internal.Parser
   {
-    return new polymod.hscript._internal.PolymodParserEx();
+    return new polymod.hscript._internal.Parser();
   }
 
   public static function buildInterp():polymod.hscript._internal.PolymodInterpEx
diff --git a/polymod/hscript/_internal/Parser.hx b/polymod/hscript/_internal/Parser.hx
index 744a1db7..cd9d35ef 100644
--- a/polymod/hscript/_internal/Parser.hx
+++ b/polymod/hscript/_internal/Parser.hx
@@ -56,6 +56,9 @@ private enum InterpState
   Expr(depth:Int, ?quoteChar:Int);
 }
 
+#if hscript_typer
+@:access(polymod.hscript._internal.PolymodTyperEx)
+#end
 class Parser
 {
   // config / variables
@@ -1397,6 +1400,16 @@ class Parser
       push(tk);
       decls.push(parseModuleDecl());
     }
+
+    #if hscript_typer
+    PolymodTyperEx.allModules.push(
+      {
+        decls: decls,
+        code: content,
+        origin: origin,
+      });
+    #end
+
     return decls;
   }
 
diff --git a/polymod/hscript/_internal/PolymodInterpEx.hx b/polymod/hscript/_internal/PolymodInterpEx.hx
index 64a3d9c9..18835195 100644
--- a/polymod/hscript/_internal/PolymodInterpEx.hx
+++ b/polymod/hscript/_internal/PolymodInterpEx.hx
@@ -1747,7 +1747,7 @@ class PolymodInterpEx extends Interp
 
   public function addModule(moduleContents:String, ?origin:String = "hscript")
   {
-    var parser = new PolymodParserEx();
+    var parser = new Parser();
     var decls = parser.parseModule(moduleContents, origin);
     registerModules(decls, origin);
   }
diff --git a/polymod/hscript/_internal/PolymodParserEx.hx b/polymod/hscript/_internal/PolymodParserEx.hx
deleted file mode 100644
index cdda10c9..00000000
--- a/polymod/hscript/_internal/PolymodParserEx.hx
+++ /dev/null
@@ -1,26 +0,0 @@
-package polymod.hscript._internal;
-
-import polymod.hscript._internal.Parser;
-import polymod.hscript._internal.Expr;
-
-#if hscript_typer
-@:access(polymod.hscript._internal.PolymodTyperEx)
-#end
-class PolymodParserEx extends Parser
-{
-  public override function parseModule(content:String, ?origin:String = "hscript", ?position = 0)
-  {
-    var decls:Array<ModuleDecl> = super.parseModule(content, origin, position);
-
-    #if hscript_typer
-    PolymodTyperEx.allModules.push(
-      {
-        decls: decls,
-        code: content,
-        origin: origin,
-      });
-    #end
-
-    return decls;
-  }
-}