diff options
Diffstat (limited to 'editor/project_converter_3_to_4.h')
| -rw-r--r-- | editor/project_converter_3_to_4.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/editor/project_converter_3_to_4.h b/editor/project_converter_3_to_4.h index 90c05c22d2..b2adfac395 100644 --- a/editor/project_converter_3_to_4.h +++ b/editor/project_converter_3_to_4.h @@ -58,6 +58,11 @@ public: #include "core/templates/local_vector.h" #include "core/templates/vector.h" +struct SourceLine { + String line; + bool is_comment; +}; + class RegEx; class ProjectConverter3To4 { @@ -66,33 +71,33 @@ class ProjectConverter3To4 { uint64_t maximum_file_size; uint64_t maximum_line_length; - void rename_colors(Vector<String> &lines, const RegExContainer ®_container); + void rename_colors(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_colors(Vector<String> &lines, const RegExContainer ®_container); - void rename_classes(Vector<String> &lines, const RegExContainer ®_container); + void rename_classes(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_classes(Vector<String> &lines, const RegExContainer ®_container); - void rename_gdscript_functions(Vector<String> &lines, const RegExContainer ®_container, bool builtin); + void rename_gdscript_functions(Vector<SourceLine> &source_lines, const RegExContainer ®_container, bool builtin); Vector<String> check_for_rename_gdscript_functions(Vector<String> &lines, const RegExContainer ®_container, bool builtin); void process_gdscript_line(String &line, const RegExContainer ®_container, bool builtin); - void rename_csharp_functions(Vector<String> &lines, const RegExContainer ®_container); + void rename_csharp_functions(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_csharp_functions(Vector<String> &lines, const RegExContainer ®_container); void process_csharp_line(String &line, const RegExContainer ®_container); - void rename_csharp_attributes(Vector<String> &lines, const RegExContainer ®_container); + void rename_csharp_attributes(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_csharp_attributes(Vector<String> &lines, const RegExContainer ®_container); - void rename_gdscript_keywords(Vector<String> &lines, const RegExContainer ®_container); + void rename_gdscript_keywords(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_gdscript_keywords(Vector<String> &lines, const RegExContainer ®_container); - void rename_input_map_scancode(Vector<String> &lines, const RegExContainer ®_container); + void rename_input_map_scancode(Vector<SourceLine> &source_lines, const RegExContainer ®_container); Vector<String> check_for_rename_input_map_scancode(Vector<String> &lines, const RegExContainer ®_container); - void custom_rename(Vector<String> &lines, String from, String to); + void custom_rename(Vector<SourceLine> &source_lines, String from, String to); Vector<String> check_for_custom_rename(Vector<String> &lines, String from, String to); - void rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines); + void rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<SourceLine> &source_lines); Vector<String> check_for_rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines); Vector<String> check_for_files(); @@ -105,11 +110,12 @@ class ProjectConverter3To4 { 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 collect_string_from_vector(Vector<String> &vector); + String collect_string_from_vector(Vector<SourceLine> &vector); + Vector<SourceLine> split_lines(const String &text); bool test_single_array(const char *array[][2], bool ignore_second_check = false); - bool test_conversion_gdscript_builtin(String name, String expected, void (ProjectConverter3To4::*func)(Vector<String> &, const RegExContainer &, bool), String what, const RegExContainer ®_container, bool builtin); - bool test_conversion_with_regex(String name, String expected, void (ProjectConverter3To4::*func)(Vector<String> &, const RegExContainer &), String what, const RegExContainer ®_container); + bool test_conversion_gdscript_builtin(String name, String expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &, bool), String what, const RegExContainer ®_container, bool builtin); + bool test_conversion_with_regex(String name, String expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &), String what, const RegExContainer ®_container); bool test_conversion_basic(String name, String expected, const char *array[][2], LocalVector<RegEx *> ®ex_cache, String what); bool test_array_names(); bool test_conversion(RegExContainer ®_container); |