You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-17 14:11:06 +00:00
-properly handle newline in \ (line continuation) in gdscript, fixes #2112
-also fix a small crash in export detection with scripts that include themselves
This commit is contained in:
@@ -33,17 +33,6 @@
|
|||||||
#include "os/file_access.h"
|
#include "os/file_access.h"
|
||||||
#include "io/file_access_encrypted.h"
|
#include "io/file_access_encrypted.h"
|
||||||
|
|
||||||
/* TODO:
|
|
||||||
|
|
||||||
*populate globals
|
|
||||||
*do checks as close to debugger as possible (but don't do debugger)
|
|
||||||
*const check plz
|
|
||||||
*check arguments and default arguments in GDFunction
|
|
||||||
-get property list in instance?
|
|
||||||
*missing opcodes
|
|
||||||
-const checks
|
|
||||||
-make thread safe
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1740,6 +1729,8 @@ bool GDScript::_update_exports() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (path!=get_path()) {
|
||||||
|
|
||||||
Ref<GDScript> bf = ResourceLoader::load(path);
|
Ref<GDScript> bf = ResourceLoader::load(path);
|
||||||
|
|
||||||
if (bf.is_valid()) {
|
if (bf.is_valid()) {
|
||||||
@@ -1751,6 +1742,9 @@ bool GDScript::_update_exports() {
|
|||||||
//bf->_update_exports(p_instances,true,false);
|
//bf->_update_exports(p_instances,true,false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
ERR_PRINT(("Path extending itself in "+path).utf8().get_data());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
members_cache.clear();;
|
members_cache.clear();;
|
||||||
|
|||||||
@@ -260,6 +260,7 @@ void GDTokenizerText::_advance() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
INCPOS(1);
|
INCPOS(1);
|
||||||
|
line++;
|
||||||
|
|
||||||
while(GETCHAR(0)==' ' || GETCHAR(0)=='\t') {
|
while(GETCHAR(0)==' ' || GETCHAR(0)=='\t') {
|
||||||
INCPOS(1);
|
INCPOS(1);
|
||||||
|
|||||||
Reference in New Issue
Block a user