[CHORE] Merge the PolymodParserEx into Parser.

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

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;
   }
 

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);
   }