godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Speedup conversion and add option to set maximum line length to prevent freezes

Browse Source
This commit is contained in:
Rafał Mikrut
2022-08-13 22:17:35 +02:00
parent 19e2f30a55
commit 3b1259a98a
3 changed files with 1114 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1810
editor/project_converter_3_to_4.cpp
View File

File diff suppressed because it is too large Load Diff

50
editor/project_converter_3_to_4.h
View File

@@ -35,37 +35,43 @@
#include "core/io/file_access.h" #include "core/io/file_access.h"
#include "core/object/ref_counted.h" #include "core/object/ref_counted.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/templates/local_vector.h"
class RegEx;
class ProjectConverter3To4 { class ProjectConverter3To4 {
public: public:
class RegExContainer; class RegExContainer;
private: private:
void rename_enums(String &file_content); uint64_t maximum_file_size;
Vector<String> check_for_rename_enums(Vector<String> &file_content); uint64_t maximum_line_length;
void rename_classes(String &file_content); void rename_colors(Vector<String> &lines, const RegExContainer &reg_container);
Vector<String> check_for_rename_classes(Vector<String> &file_content); Vector<String> check_for_rename_colors(Vector<String> &lines, const RegExContainer &reg_container);
void rename_gdscript_functions(String &file_content, const RegExContainer &reg_container, bool builtin); void rename_classes(Vector<String> &lines, const RegExContainer &reg_container);
Vector<String> check_for_rename_gdscript_functions(Vector<String> &file_content, const RegExContainer &reg_container, bool builtin); Vector<String> check_for_rename_classes(Vector<String> &lines, const RegExContainer &reg_container);
void rename_gdscript_functions(Vector<String> &lines, const RegExContainer &reg_container, bool builtin);
Vector<String> check_for_rename_gdscript_functions(Vector<String> &lines, const RegExContainer &reg_container, bool builtin);
void process_gdscript_line(String &line, 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(Vector<String> &lines, const RegExContainer &reg_container);
Vector<String> check_for_rename_csharp_functions(Vector<String> &file_content); Vector<String> check_for_rename_csharp_functions(Vector<String> &lines, const RegExContainer &reg_container);
void process_csharp_line(String &line); void process_csharp_line(String &line, const RegExContainer &reg_container);
void rename_csharp_attributes(String &file_content); void rename_csharp_attributes(Vector<String> &lines, const RegExContainer &reg_container);
Vector<String> check_for_rename_csharp_attributes(Vector<String> &file_content); Vector<String> check_for_rename_csharp_attributes(Vector<String> &lines, const RegExContainer &reg_container);
void rename_gdscript_keywords(String &file_content); void rename_gdscript_keywords(Vector<String> &lines, const RegExContainer &reg_container);
Vector<String> check_for_rename_gdscript_keywords(Vector<String> &file_content); Vector<String> check_for_rename_gdscript_keywords(Vector<String> &lines, const RegExContainer &reg_container);
void custom_rename(String &file_content, String from, String to); void custom_rename(Vector<String> &lines, String from, String to);
Vector<String> check_for_custom_rename(Vector<String> &file_content, String from, String to); Vector<String> check_for_custom_rename(Vector<String> &lines, String from, String to);
void rename_common(const char *array[][2], String &file_content); void rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines);
Vector<String> check_for_rename_common(const char *array[][2], Vector<String> &file_content); Vector<String> check_for_rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines);
Vector<String> check_for_files(); Vector<String> check_for_files();
@@ -77,15 +83,17 @@ private:
String line_formatter(int current_line, String from, String to, String line); String line_formatter(int current_line, String from, String to, String line);
String simple_line_formatter(int current_line, String old_line, String line); String simple_line_formatter(int current_line, String old_line, String line);
String collect_string_from_vector(Vector<String> &vector);
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_gdscript_builtin(String name, String expected, void (ProjectConverter3To4::*func)(Vector<String> &, const RegExContainer &, bool), String what, const RegExContainer &reg_container, bool builtin);
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_with_regex(String name, String expected, void (ProjectConverter3To4::*func)(Vector<String> &, const RegExContainer &), String what, const RegExContainer &reg_container);
bool test_conversion_single_normal(String name, String expected, const char *array[][2], String what); bool test_conversion_basic(String name, String expected, const char *array[][2], LocalVector<RegEx *> &regex_cache, String what);
bool test_array_names(); bool test_array_names();
bool test_conversion(const RegExContainer &reg_container); bool test_conversion(RegExContainer &reg_container);
public: public:
ProjectConverter3To4(int, int);
int validate_conversion(); int validate_conversion();
int convert(); int convert();
}; };

32
main/main.cpp
View File

@@ -154,6 +154,8 @@ static OS::ProcessID editor_pid = 0;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
static bool auto_build_solutions = false; static bool auto_build_solutions = false;
static String debug_server_uri; static String debug_server_uri;
static int converter_max_kb_file = 4 * 1024; // 4MB
static int converter_max_line_length = 100000;
HashMap<Main::CLIScope, Vector<String>> forwardable_cli_arguments; HashMap<Main::CLIScope, Vector<String>> forwardable_cli_arguments;
#endif #endif
@@ -391,8 +393,8 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print(" <path> should be absolute or relative to the project directory, and include the filename for the binary (e.g. 'builds/game.exe'). The target directory should exist.\n"); OS::get_singleton()->print(" <path> should be absolute or relative to the project directory, and include the filename for the binary (e.g. 'builds/game.exe'). The target directory should exist.\n");
OS::get_singleton()->print(" --export-debug <preset> <path> Same as --export, but using the debug template.\n"); OS::get_singleton()->print(" --export-debug <preset> <path> Same as --export, but using the debug template.\n");
OS::get_singleton()->print(" --export-pack <preset> <path> Same as --export, but only export the game pack for the given preset. The <path> extension determines whether it will be in PCK or ZIP format.\n"); OS::get_singleton()->print(" --export-pack <preset> <path> Same as --export, but only export the game pack for the given preset. The <path> extension determines whether it will be in PCK or ZIP format.\n");
OS::get_singleton()->print(" --convert-3to4 Converts project from Godot 3.x to Godot 4.x.\n"); OS::get_singleton()->print(" --convert-3to4 [<max_file_kb>] [<max_line_size>] Converts project from Godot 3.x to Godot 4.x.\n");
OS::get_singleton()->print(" --validate-conversion-3to4 Shows what elements will be renamed when converting project from Godot 3.x to Godot 4.x.\n"); OS::get_singleton()->print(" --validate-conversion-3to4 [<max_file_kb>] [<max_line_size>] Shows what elements will be renamed when converting project from Godot 3.x to Godot 4.x.\n");
OS::get_singleton()->print(" --doctool [<path>] Dump the engine API reference to the given <path> (defaults to current dir) in XML format, merging if existing files are found.\n"); OS::get_singleton()->print(" --doctool [<path>] Dump the engine API reference to the given <path> (defaults to current dir) in XML format, merging if existing files are found.\n");
OS::get_singleton()->print(" --no-docbase Disallow dumping the base types (used with --doctool).\n"); OS::get_singleton()->print(" --no-docbase Disallow dumping the base types (used with --doctool).\n");
OS::get_singleton()->print(" --build-solutions Build the scripting solutions (e.g. for C# projects). Implies --editor and requires a valid project to edit.\n"); OS::get_singleton()->print(" --build-solutions Build the scripting solutions (e.g. for C# projects). Implies --editor and requires a valid project to edit.\n");
@@ -1071,10 +1073,32 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// Actually handling is done in start(). // Actually handling is done in start().
cmdline_tool = true; cmdline_tool = true;
main_args.push_back(I->get()); main_args.push_back(I->get());
if (I->next() && !I->next()->get().begins_with("-")) {
if (itos(I->next()->get().to_int()) == I->next()->get()) {
converter_max_kb_file = I->next()->get().to_int();
}
if (I->next()->next() && !I->next()->next()->get().begins_with("-")) {
if (itos(I->next()->next()->get().to_int()) == I->next()->next()->get()) {
converter_max_line_length = I->next()->next()->get().to_int();
}
}
}
} else if (I->get() == "--validate-conversion-3to4") { } else if (I->get() == "--validate-conversion-3to4") {
// Actually handling is done in start(). // Actually handling is done in start().
cmdline_tool = true; cmdline_tool = true;
main_args.push_back(I->get()); main_args.push_back(I->get());
if (I->next() && !I->next()->get().begins_with("-")) {
if (itos(I->next()->get().to_int()) == I->next()->get()) {
converter_max_kb_file = I->next()->get().to_int();
}
if (I->next()->next() && !I->next()->next()->get().begins_with("-")) {
if (itos(I->next()->next()->get().to_int()) == I->next()->next()->get()) {
converter_max_line_length = I->next()->next()->get().to_int();
}
}
}
} else if (I->get() == "--doctool") { } else if (I->get() == "--doctool") {
// Actually handling is done in start(). // Actually handling is done in start().
cmdline_tool = true; cmdline_tool = true;
@@ -2378,12 +2402,12 @@ bool Main::start() {
} }
if (converting_project) { if (converting_project) {
int exit_code = ProjectConverter3To4().convert(); int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert();
OS::get_singleton()->set_exit_code(exit_code); OS::get_singleton()->set_exit_code(exit_code);
return false; return false;
} }
if (validating_converting_project) { if (validating_converting_project) {
int exit_code = ProjectConverter3To4().validate_conversion(); int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).validate_conversion();
OS::get_singleton()->set_exit_code(exit_code); OS::get_singleton()->set_exit_code(exit_code);
return false; return false;
} }