godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63887 from qarmin/more_renames 

Various converter enhancements and bugfixes
This commit is contained in:
Rémi Verschelde 2022-08-06 00:21:24 +02:00 committed by GitHub
parent 99aa97949f 3d3fce0d3c
commit 10f9f20849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 716 additions and 1133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/io/dir_access.h
View File

@ -108,6 +108,8 @@ public:
if (da->remove(p_path) != OK) { if (da->remove(p_path) != OK) {
ERR_FAIL_MSG("Cannot remove file or directory: " + p_path); ERR_FAIL_MSG("Cannot remove file or directory: " + p_path);
} }
} else {
ERR_FAIL_MSG("Cannot remove non-existent file or directory: " + p_path);
} }
} }

1834
editor/project_converter_3_to_4.cpp
View File

File diff suppressed because it is too large Load Diff

13
editor/project_converter_3_to_4.h
View File

@ -37,17 +37,23 @@
#include "core/string/ustring.h" #include "core/string/ustring.h"
class ProjectConverter3To4 { class ProjectConverter3To4 {
public:
class RegExContainer;
private:
void rename_enums(String &file_content); void rename_enums(String &file_content);
Vector<String> check_for_rename_enums(Vector<String> &file_content); Vector<String> check_for_rename_enums(Vector<String> &file_content);
void rename_classes(String &file_content); void rename_classes(String &file_content);
Vector<String> check_for_rename_classes(Vector<String> &file_content); Vector<String> check_for_rename_classes(Vector<String> &file_content);
void rename_gdscript_functions(String &file_content); void rename_gdscript_functions(String &file_content, const RegExContainer &reg_container, bool builtin);
Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content); Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer &reg_container, bool builtin);
void process_gdscript_line(String &line, const RegExContainer &reg_container, bool builtin);
void rename_csharp_functions(String &file_content); void rename_csharp_functions(String &file_content);
Vector<String> check_for_rename_csharp_functions(Vector<String> &file_content); Vector<String> check_for_rename_csharp_functions(Vector<String> &file_content);
void process_csharp_line(String &line);
void rename_gdscript_keywords(String &file_content); void rename_gdscript_keywords(String &file_content);
Vector<String> check_for_rename_gdscript_keywords(Vector<String> &file_content); Vector<String> check_for_rename_gdscript_keywords(Vector<String> &file_content);
@ -71,9 +77,10 @@ class ProjectConverter3To4 {
bool test_single_array(const char *array[][2], bool ignore_second_check = false); bool test_single_array(const char *array[][2], bool ignore_second_check = false);
bool test_conversion_single_additional(String name, String expected, void (ProjectConverter3To4::*func)(String &), String what); bool test_conversion_single_additional(String name, String expected, void (ProjectConverter3To4::*func)(String &), String what);
bool test_conversion_single_additional_builtin(String name, String expected, void (ProjectConverter3To4::*func)(String &, const RegExContainer &, bool), String what, const RegExContainer &reg_container, bool builtin);
bool test_conversion_single_normal(String name, String expected, const char *array[][2], String what); bool test_conversion_single_normal(String name, String expected, const char *array[][2], String what);
bool test_array_names(); bool test_array_names();
bool test_conversion(); bool test_conversion(const RegExContainer &reg_container);
public: public:
int validate_conversion(); int validate_conversion();