Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions polymod/hscript/_internal/PolymodInterpEx.hx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ class PolymodInterpEx extends Interp
var clsRef = PolymodStaticClassReference.tryBuild(cl);
if (clsRef != null) return clsRef.instantiate(args);

@:privateAccess
if (getClassDecl().imports != null && getClassDecl().imports.exists(cl))
{
var clsRef = PolymodStaticClassReference.tryBuild(getClassDecl().imports.get(cl).fullPath);
if (clsRef != null) return clsRef.instantiate(args);
}

@:privateAccess
if (getClassDecl()?.pkg != null)
{
Expand Down Expand Up @@ -232,6 +239,12 @@ class PolymodInterpEx extends Interp

for (key => imp in cls.importsToValidate)
{
if (_scriptClassDescriptors.exists(imp.fullPath))
{
cls.imports.set(key, imp);
continue;
}

if (_scriptEnumDescriptors.exists(imp.fullPath))
{
cls.imports.set(key, imp);
Expand Down