noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

GDScript: Don't register unexposed classes as constants

Browse Source
This commit is contained in:
HolonProduction
2026-06-01 12:04:07 +02:00
parent a4f5e8cddf
commit 11c832dced
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gdscript/gdscript.cpp
+4 -4
View File
@@ -2145,7 +2145,7 @@ void GDScriptLanguage::remove_named_global_constant(const StringName &p_name) {
}
void GDScriptLanguage::init() {
//populate global constants
// Populate core constants.
int gcc = CoreConstants::get_global_constant_count();
for (int i = 0; i < gcc; i++) {
_add_global(StringName(CoreConstants::get_global_constant_name(i)), CoreConstants::get_global_constant_value(i));
@@ -2156,19 +2156,19 @@ void GDScriptLanguage::init() {
_add_global(StringName("INF"), Math::INF);
_add_global(StringName("NAN"), Math::NaN);
//populate native classes
// Populate native classes.
LocalVector<StringName> class_list;
ClassDB::get_class_list(class_list);
for (const StringName &class_name : class_list) {
if (globals.has(class_name)) {
if (globals.has(class_name) || !GDScriptAnalyzer::class_exists(class_name)) {
continue;
}
Ref<GDScriptNativeClass> nc = memnew(GDScriptNativeClass(class_name));
_add_global(class_name, nc);
}
//populate singletons
// Populate singletons (overriding the native class registered under the same name).
List<Engine::Singleton> singletons;
Engine::get_singleton()->get_singletons(&singletons);
modules/gdscript/gdscript_analyzer.cpp
+5 -9
View File
@@ -4632,15 +4632,11 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
}
if (GDScriptLanguage::get_singleton()->has_any_global_constant(name)) {
// We checked for `ClassDB` classes above. Any `ClassDB` class that reaches this point is not exposed and should not be accessible.
// TODO: Remove this check once `globals` does only contain publicly available things.
if (!ClassDB::class_exists(name)) {
Variant constant = GDScriptLanguage::get_singleton()->get_any_global_constant(name);
p_identifier->set_datatype(type_from_variant(constant, p_identifier));
p_identifier->is_constant = true;
p_identifier->reduced_value = constant;
return;
}
Variant constant = GDScriptLanguage::get_singleton()->get_any_global_constant(name);
p_identifier->set_datatype(type_from_variant(constant, p_identifier));
p_identifier->is_constant = true;
p_identifier->reduced_value = constant;
return;
}
if (CoreConstants::is_global_enum(name)) {