Skip to content

[FIX] Check for duplicate names across all script descriptors #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AbnormalPoof merged 1 commit into from
Oct 28, 2026
Merged

[FIX] Check for duplicate names across all script descriptors #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 42 additions & 40 deletions polymod/hscript/_internal/Interp.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,21 +856,11 @@ class Interp
{
var name = Util.getFullClassName(c);

if (_scriptClassDescriptors.exists(name))
{
Polymod.error(
SCRIPTED_CLASS_ALREADY_REGISTERED,
'Scripted class with fully qualified name "$name" has already been defined. Please change the class name or the package name to ensure uniqueness.',
SCRIPT_RUNTIME
);
return;
}
else
{
Polymod.debug('Registering scripted class $name');
_scriptClassDescriptors.set(name, c);
registryStamp++;
}
if (checkDuplicate(name)) return;

Polymod.debug('Registering scripted class $name');
_scriptClassDescriptors.set(name, c);
registryStamp++;
registerDeprecatedFields(name);
}

Expand All @@ -882,46 +872,58 @@ class Interp
name = i.pkg.join('.') + '.' + i.name;
}

if (_scriptInterfaceDescriptors.exists(name) || PolymodScriptClass.interfaceImpls.exists(name) || _scriptClassDescriptors.exists(name))
{
Polymod.error(SCRIPTED_CLASS_ALREADY_REGISTERED,
'Scripted interface with fully qualified name "$name" has already been defined. Please change the interface or the package name to ensure uniqueness.',
SCRIPT_RUNTIME);
return;
}
else
{
Polymod.debug('Registering scripted interface $name');
_scriptInterfaceDescriptors.set(name, i);
registryStamp++;
registerDeprecatedFields(name);
}
if (checkDuplicate(name)) return;

Polymod.debug('Registering scripted interface $name');
_scriptInterfaceDescriptors.set(name, i);
registryStamp++;
registerDeprecatedFields(name);
}

private static function registerScriptEnum(e:EnumDecl)
static function registerScriptEnum(e:EnumDecl)
{
var name = e.name;
if (e.pkg != null)
{
name = e.pkg.join(".") + "." + name;
}

if (_scriptEnumDescriptors.exists(name))
if (checkDuplicate(name)) return;

Polymod.debug('Registering scripted enum $name');
_scriptEnumDescriptors.set(name, e);
registryStamp++;
registerDeprecatedFields(name);
}

static function checkDuplicate(name:String):Bool
{
var foundType:String = null;

if (_scriptClassDescriptors.exists(name))
{
foundType = "scripted class";
}
else if (_scriptInterfaceDescriptors.exists(name) || PolymodScriptClass.interfaceImpls.exists(name))
{
foundType = "scripted interface";
}
else if (_scriptEnumDescriptors.exists(name))
{
foundType = "enum";
}

if (foundType != null)
{
Polymod.error(
SCRIPTED_CLASS_ALREADY_REGISTERED,
'An enum with the fully qualified name "$name" has already been defined. Please change the enum name to ensure a unique name.',
'A $foundType with the fully qualified name "$name" has already been defined. Please change the name or the package to ensure uniqueness.',
SCRIPT_RUNTIME
);
return;
}
else
{
Polymod.debug('Registering scripted enum $name');
_scriptEnumDescriptors.set(name, e);
registryStamp++;
registerDeprecatedFields(name);
return true;
}

return false;
}

private static function registerImportForPackage(pkg:Null<Array<String>>, imp:ClassImport, isUsing:Bool = false)
Expand Down
Loading