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

2to3 exporter: Fix recursion in Pool*Array conversions

Browse Source
This commit is contained in:
Rémi Verschelde 2018-03-19 11:30:25 +01:00
parent 87479177e7
commit 42ad56c95c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/editor_export_godot3.cpp
View File

@ -2135,7 +2135,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
count = 0;
// Convert RawArray() => PoolByteArray()
regexp.compile("(.*)RawArray\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])RawArray\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolByteArray()" + regexp.get_capture(2);
@ -2144,7 +2144,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert IntArray() => PoolIntArray()
regexp.compile("(.*)IntArray\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])IntArray\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolIntArray()" + regexp.get_capture(2);
@ -2153,7 +2153,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert RealArray() => PoolRealArray()
regexp.compile("(.*)RealArray\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])RealArray\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolRealArray()" + regexp.get_capture(2);
@ -2162,7 +2162,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert StringArray() => PoolStringArray()
regexp.compile("(.*)StringArray\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])StringArray\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolStringArray()" + regexp.get_capture(2);
@ -2171,7 +2171,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert Vector2Array() => PoolVector2Array()
regexp.compile("(.*)Vector2Array\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])Vector2Array\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolVector2Array()" + regexp.get_capture(2);
@ -2180,7 +2180,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert Vector3Array() => PoolVector3Array()
regexp.compile("(.*)Vector3Array\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])Vector3Array\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolVector3Array()" + regexp.get_capture(2);
@ -2189,7 +2189,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert ColorArray() => PoolColorArray()
regexp.compile("(.*)ColorArray\\(\\)(.*)");
regexp.compile("(.*[^a-zA-Z])ColorArray\\(\\)(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "PoolColorArray()" + regexp.get_capture(2);
@ -2198,7 +2198,7 @@ Error EditorExportGodot3::_convert_script(const String &p_path, const String &p_
regexp.clear();
// Convert ReferenceFrame => ReferenceRect
regexp.compile("(.*)ReferenceFrame(.*)");
regexp.compile("(.*[^a-zA-Z])ReferenceFrame(.*)");
res = regexp.find(line);
if (res >= 0 && regexp.get_capture_count() == 3) {
line = regexp.get_capture(1) + "ReferenceRect" + regexp.get_capture(2);