From f2918c73cf25b5185ff66f5ebd70a0ca0a3c302a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 25 Jul 2024 09:20:23 +0200 Subject: Revert "GDScript: Fix common mismatched external parser errors" This reverts commit c75225ffb26eb69d0caca930732dce63af6c6707. This caused a crashing regression for multiple users: https://github.com/godotengine/godot/pull/94617#issuecomment-2247868580 --- modules/gdscript/gdscript_analyzer.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'modules/gdscript/gdscript_analyzer.h') diff --git a/modules/gdscript/gdscript_analyzer.h b/modules/gdscript/gdscript_analyzer.h index 35e20f40d4..922000df52 100644 --- a/modules/gdscript/gdscript_analyzer.h +++ b/modules/gdscript/gdscript_analyzer.h @@ -41,22 +41,9 @@ class GDScriptAnalyzer { GDScriptParser *parser = nullptr; - template - class Finally { - Fn fn; - - public: - Finally(Fn p_fn) : - fn(p_fn) {} - ~Finally() { - fn(); - } - }; - const GDScriptParser::EnumNode *current_enum = nullptr; GDScriptParser::LambdaNode *current_lambda = nullptr; List pending_body_resolution_lambdas; - HashMap> external_class_parser_cache; bool static_context = false; // Tests for detecting invalid overloading of script members @@ -145,8 +132,6 @@ class GDScriptAnalyzer { void resolve_pending_lambda_bodies(); bool class_exists(const StringName &p_class) const; void reduce_identifier_from_base_set_class(GDScriptParser::IdentifierNode *p_identifier, GDScriptParser::DataType p_identifier_datatype); - Ref ensure_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const GDScriptParser::ClassNode *p_from_class, const String &p_context, const GDScriptParser::Node *p_source); - Ref get_depended_shallow_script(const String &p_path, Error &r_error); #ifdef DEBUG_ENABLED void is_shadowing(GDScriptParser::IdentifierNode *p_identifier, const String &p_context, const bool p_in_local_scope); #endif -- cgit v1.2.3