Skip to content

Commit aa3c457

Browse files
committed
Fix broken compilation after Godo's API changes
1 parent f141a68 commit aa3c457

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## 0.0.76 - 2022-05-20
11+
12+
### Fixed
13+
14+
* Fix broken compilation after Godo's API changes
15+
1016
## 0.0.75 - 2022-05-01
1117

1218
### Changed

lua_script.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ int LuaScript::get_member_line(const StringName &p_member) const {
240240
return -1;
241241
}
242242

243-
void LuaScript::get_constants(Map<StringName, Variant> *p_constants) {
243+
void LuaScript::get_constants(HashMap<StringName, Variant> *p_constants) {
244244
print_debug("LuaScript::get_constants");
245245

246246
} // TODO
247247

248-
void LuaScript::get_members(Set<StringName> *p_members) {
248+
void LuaScript::get_members(RBSet<StringName> *p_members) {
249249
print_debug("LuaScript::get_members");
250250
#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
251251

lua_script.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class LuaScript : public Script {
7474

7575
int get_member_line(const StringName &p_member) const override;
7676

77-
void get_constants(Map<StringName, Variant> *p_constants) override;
78-
void get_members(Set<StringName> *p_members) override;
77+
void get_constants(HashMap<StringName, Variant> *p_constants) override;
78+
void get_members(RBSet<StringName> *p_members) override;
7979

8080
#ifdef TOOLS_ENABLED
8181
bool is_placeholder_fallback_enabled() const override;
@@ -110,12 +110,12 @@ class LuaScript : public Script {
110110

111111
String source{};
112112

113-
Set<Object *> instances{};
113+
RBSet<Object *> instances{};
114114

115115
#ifdef TOOLS_ENABLED
116116
bool source_changed_cache{};
117117
bool placeholder_fallback_enabled{};
118-
Set<PlaceHolderScriptInstance *> placeholders{};
118+
RBSet<PlaceHolderScriptInstance *> placeholders{};
119119
Vector<DocData::ClassDoc> docs{};
120120
#endif
121121
};

lua_script_language.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ bool LuaScriptLanguage::validate(
208208
List<String> *r_functions,
209209
List<ScriptError> *r_errors,
210210
List<Warning> *r_warnings,
211-
Set<int> *r_safe_lines) const {
211+
RBSet<int> *r_safe_lines) const {
212212
print_debug("LuaScriptLanguage::validate( p_path = %s )", p_path.ascii().get_data());
213213

214214
parser::ast::AST ast = parser.parse(p_script.ascii().get_data());

lua_script_language.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class LuaScriptLanguage : public ScriptLanguage {
5555
Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
5656
Vector<ScriptTemplate> get_built_in_templates(StringName p_object) override;
5757
bool is_using_templates() override;
58-
bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const override;
58+
bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, RBSet<int> *r_safe_lines = nullptr) const override;
5959
String validate_path(const String &p_path) const override;
6060
Script *create_script() const override;
6161
bool has_named_classes() const override;

0 commit comments

Comments
 (0)