You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
This commit is contained in:
Rémi Verschelde
@@ -42,12 +42,10 @@
|
||||
///////////////////////////
|
||||
|
||||
GDScriptNativeClass::GDScriptNativeClass(const StringName &p_name) {
|
||||
|
||||
name = p_name;
|
||||
}
|
||||
|
||||
bool GDScriptNativeClass::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
|
||||
bool ok;
|
||||
int v = ClassDB::get_integer_constant(name, p_name, &ok);
|
||||
|
||||
@@ -60,12 +58,10 @@ bool GDScriptNativeClass::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
}
|
||||
|
||||
void GDScriptNativeClass::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("new"), &GDScriptNativeClass::_new);
|
||||
}
|
||||
|
||||
Variant GDScriptNativeClass::_new() {
|
||||
|
||||
Object *o = instance();
|
||||
ERR_FAIL_COND_V_MSG(!o, Variant(), "Class type: '" + String(name) + "' is not instantiable.");
|
||||
|
||||
@@ -78,12 +74,10 @@ Variant GDScriptNativeClass::_new() {
|
||||
}
|
||||
|
||||
Object *GDScriptNativeClass::instance() {
|
||||
|
||||
return ClassDB::instance(name);
|
||||
}
|
||||
|
||||
GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error) {
|
||||
|
||||
/* STEP 1, CREATE */
|
||||
|
||||
GDScriptInstance *instance = memnew(GDScriptInstance);
|
||||
@@ -126,7 +120,6 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco
|
||||
}
|
||||
|
||||
Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
|
||||
|
||||
/* STEP 1, CREATE */
|
||||
|
||||
if (!valid) {
|
||||
@@ -172,7 +165,6 @@ Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallErro
|
||||
}
|
||||
|
||||
bool GDScript::can_instance() const {
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
return valid && (tool || ScriptServer::is_scripting_enabled());
|
||||
#else
|
||||
@@ -181,7 +173,6 @@ bool GDScript::can_instance() const {
|
||||
}
|
||||
|
||||
Ref<Script> GDScript::get_base_script() const {
|
||||
|
||||
if (_base) {
|
||||
return Ref<GDScript>(_base);
|
||||
} else {
|
||||
@@ -190,7 +181,6 @@ Ref<Script> GDScript::get_base_script() const {
|
||||
}
|
||||
|
||||
StringName GDScript::get_instance_base_type() const {
|
||||
|
||||
if (native.is_valid())
|
||||
return native->get_name();
|
||||
if (base.is_valid() && base->is_valid())
|
||||
@@ -199,7 +189,6 @@ StringName GDScript::get_instance_base_type() const {
|
||||
}
|
||||
|
||||
struct _GDScriptMemberSort {
|
||||
|
||||
int index;
|
||||
StringName name;
|
||||
_FORCE_INLINE_ bool operator<(const _GDScriptMemberSort &p_member) const { return index < p_member.index; }
|
||||
@@ -208,13 +197,11 @@ struct _GDScriptMemberSort {
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
void GDScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
|
||||
|
||||
placeholders.erase(p_placeholder);
|
||||
}
|
||||
#endif
|
||||
|
||||
void GDScript::get_script_method_list(List<MethodInfo> *p_list) const {
|
||||
|
||||
const GDScript *current = this;
|
||||
while (current) {
|
||||
for (const Map<StringName, GDScriptFunction *>::Element *E = current->member_functions.front(); E; E = E->next()) {
|
||||
@@ -234,15 +221,12 @@ void GDScript::get_script_method_list(List<MethodInfo> *p_list) const {
|
||||
}
|
||||
|
||||
void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
|
||||
|
||||
const GDScript *sptr = this;
|
||||
List<PropertyInfo> props;
|
||||
|
||||
while (sptr) {
|
||||
|
||||
Vector<_GDScriptMemberSort> msort;
|
||||
for (Map<StringName, PropertyInfo>::Element *E = sptr->member_info.front(); E; E = E->next()) {
|
||||
|
||||
_GDScriptMemberSort ms;
|
||||
ERR_CONTINUE(!sptr->member_indices.has(E->key()));
|
||||
ms.index = sptr->member_indices[E->key()].index;
|
||||
@@ -253,7 +237,6 @@ void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
|
||||
msort.sort();
|
||||
msort.invert();
|
||||
for (int i = 0; i < msort.size(); i++) {
|
||||
|
||||
props.push_front(sptr->member_info[msort[i].name]);
|
||||
}
|
||||
|
||||
@@ -266,12 +249,10 @@ void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
|
||||
}
|
||||
|
||||
bool GDScript::has_method(const StringName &p_method) const {
|
||||
|
||||
return member_functions.has(p_method);
|
||||
}
|
||||
|
||||
MethodInfo GDScript::get_method_info(const StringName &p_method) const {
|
||||
|
||||
const Map<StringName, GDScriptFunction *>::Element *E = member_functions.find(p_method);
|
||||
if (!E)
|
||||
return MethodInfo();
|
||||
@@ -288,7 +269,6 @@ MethodInfo GDScript::get_method_info(const StringName &p_method) const {
|
||||
}
|
||||
|
||||
bool GDScript::get_property_default_value(const StringName &p_property, Variant &r_value) const {
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
const Map<StringName, Variant>::Element *E = member_default_values_cache.find(p_property);
|
||||
@@ -305,14 +285,12 @@ bool GDScript::get_property_default_value(const StringName &p_property, Variant
|
||||
}
|
||||
|
||||
ScriptInstance *GDScript::instance_create(Object *p_this) {
|
||||
|
||||
GDScript *top = this;
|
||||
while (top->_base)
|
||||
top = top->_base;
|
||||
|
||||
if (top->native.is_valid()) {
|
||||
if (!ClassDB::is_parent_class(p_this->get_class_name(), top->native->get_name())) {
|
||||
|
||||
if (ScriptDebugger::get_singleton()) {
|
||||
GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), 1, "Script inherits from native type '" + String(top->native->get_name()) + "', so it can't be instanced in object of type: '" + p_this->get_class() + "'");
|
||||
}
|
||||
@@ -336,7 +314,6 @@ PlaceHolderScriptInstance *GDScript::placeholder_instance_create(Object *p_this)
|
||||
}
|
||||
|
||||
bool GDScript::instance_has(const Object *p_this) const {
|
||||
|
||||
GDScriptLanguage::singleton->lock.lock();
|
||||
bool hasit = instances.has((Object *)p_this);
|
||||
GDScriptLanguage::singleton->lock.unlock();
|
||||
@@ -345,15 +322,12 @@ bool GDScript::instance_has(const Object *p_this) const {
|
||||
}
|
||||
|
||||
bool GDScript::has_source_code() const {
|
||||
|
||||
return source != "";
|
||||
}
|
||||
String GDScript::get_source_code() const {
|
||||
|
||||
return source;
|
||||
}
|
||||
void GDScript::set_source_code(const String &p_code) {
|
||||
|
||||
if (source == p_code)
|
||||
return;
|
||||
source = p_code;
|
||||
@@ -364,7 +338,6 @@ void GDScript::set_source_code(const String &p_code) {
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
void GDScript::_update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames) {
|
||||
|
||||
if (base_cache.is_valid()) {
|
||||
base_cache->_update_exports_values(values, propnames);
|
||||
}
|
||||
@@ -380,7 +353,6 @@ void GDScript::_update_exports_values(Map<StringName, Variant> &values, List<Pro
|
||||
#endif
|
||||
|
||||
bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
static Vector<GDScript *> base_caches;
|
||||
@@ -406,7 +378,6 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
|
||||
Error err = parser.parse(source, basedir, true, path);
|
||||
|
||||
if (err == OK) {
|
||||
|
||||
const GDScriptParser::Node *root = parser.get_parse_tree();
|
||||
ERR_FAIL_COND_V(root->type != GDScriptParser::Node::TYPE_CLASS, false);
|
||||
|
||||
@@ -422,10 +393,8 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
|
||||
if (String(c->extends_file) != "" && String(c->extends_file) != get_path()) {
|
||||
path = c->extends_file;
|
||||
if (path.is_rel_path()) {
|
||||
|
||||
String base = get_path();
|
||||
if (base == "" || base.is_rel_path()) {
|
||||
|
||||
ERR_PRINT(("Could not resolve relative path for parent class: " + path).utf8().get_data());
|
||||
} else {
|
||||
path = base.get_base_dir().plus_file(path);
|
||||
@@ -440,11 +409,9 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
|
||||
|
||||
if (path != "") {
|
||||
if (path != get_path()) {
|
||||
|
||||
Ref<GDScript> bf = ResourceLoader::load(path);
|
||||
|
||||
if (bf.is_valid()) {
|
||||
|
||||
base_cache = bf;
|
||||
bf->inheriters_cache.insert(get_instance_id());
|
||||
}
|
||||
@@ -521,7 +488,6 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
|
||||
}
|
||||
|
||||
void GDScript::update_exports() {
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
bool cyclic_error = false;
|
||||
@@ -543,16 +509,13 @@ void GDScript::update_exports() {
|
||||
}
|
||||
|
||||
void GDScript::_set_subclass_path(Ref<GDScript> &p_sc, const String &p_path) {
|
||||
|
||||
p_sc->path = p_path;
|
||||
for (Map<StringName, Ref<GDScript>>::Element *E = p_sc->subclasses.front(); E; E = E->next()) {
|
||||
|
||||
_set_subclass_path(E->get(), p_path);
|
||||
}
|
||||
}
|
||||
|
||||
Error GDScript::reload(bool p_keep_state) {
|
||||
|
||||
GDScriptLanguage::singleton->lock.lock();
|
||||
bool has_instances = instances.size();
|
||||
GDScriptLanguage::singleton->lock.unlock();
|
||||
@@ -589,7 +552,6 @@ Error GDScript::reload(bool p_keep_state) {
|
||||
err = compiler.compile(&parser, this, p_keep_state);
|
||||
|
||||
if (err) {
|
||||
|
||||
if (can_run) {
|
||||
if (ScriptDebugger::get_singleton()) {
|
||||
GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), compiler.get_error_line(), "Parser Error: " + compiler.get_error());
|
||||
@@ -613,7 +575,6 @@ Error GDScript::reload(bool p_keep_state) {
|
||||
valid = true;
|
||||
|
||||
for (Map<StringName, Ref<GDScript>>::Element *E = subclasses.front(); E; E = E->next()) {
|
||||
|
||||
_set_subclass_path(E->get(), path);
|
||||
}
|
||||
|
||||
@@ -621,12 +582,10 @@ Error GDScript::reload(bool p_keep_state) {
|
||||
}
|
||||
|
||||
ScriptLanguage *GDScript::get_language() const {
|
||||
|
||||
return GDScriptLanguage::get_singleton();
|
||||
}
|
||||
|
||||
void GDScript::get_constants(Map<StringName, Variant> *p_constants) {
|
||||
|
||||
if (p_constants) {
|
||||
for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) {
|
||||
(*p_constants)[E->key()] = E->value();
|
||||
@@ -643,13 +602,10 @@ void GDScript::get_members(Set<StringName> *p_members) {
|
||||
}
|
||||
|
||||
Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
|
||||
|
||||
GDScript *top = this;
|
||||
while (top) {
|
||||
|
||||
Map<StringName, GDScriptFunction *>::Element *E = top->member_functions.find(p_method);
|
||||
if (E) {
|
||||
|
||||
ERR_FAIL_COND_V_MSG(!E->get()->is_static(), Variant(), "Can't call non-static function '" + String(p_method) + "' in script.");
|
||||
|
||||
return E->get()->call(NULL, p_args, p_argcount, r_error);
|
||||
@@ -663,16 +619,12 @@ Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p
|
||||
}
|
||||
|
||||
bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
|
||||
{
|
||||
|
||||
const GDScript *top = this;
|
||||
while (top) {
|
||||
|
||||
{
|
||||
const Map<StringName, Variant>::Element *E = top->constants.find(p_name);
|
||||
if (E) {
|
||||
|
||||
r_ret = E->get();
|
||||
return true;
|
||||
}
|
||||
@@ -681,7 +633,6 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
{
|
||||
const Map<StringName, Ref<GDScript>>::Element *E = subclasses.find(p_name);
|
||||
if (E) {
|
||||
|
||||
r_ret = E->get();
|
||||
return true;
|
||||
}
|
||||
@@ -690,7 +641,6 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
}
|
||||
|
||||
if (p_name == GDScriptLanguage::get_singleton()->strings._script_source) {
|
||||
|
||||
r_ret = get_source_code();
|
||||
return true;
|
||||
}
|
||||
@@ -699,9 +649,7 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
return false;
|
||||
}
|
||||
bool GDScript::_set(const StringName &p_name, const Variant &p_value) {
|
||||
|
||||
if (p_name == GDScriptLanguage::get_singleton()->strings._script_source) {
|
||||
|
||||
set_source_code(p_value);
|
||||
reload();
|
||||
} else
|
||||
@@ -711,29 +659,24 @@ bool GDScript::_set(const StringName &p_name, const Variant &p_value) {
|
||||
}
|
||||
|
||||
void GDScript::_get_property_list(List<PropertyInfo> *p_properties) const {
|
||||
|
||||
p_properties->push_back(PropertyInfo(Variant::STRING, "script/source", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
|
||||
}
|
||||
|
||||
void GDScript::_bind_methods() {
|
||||
|
||||
ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &GDScript::_new, MethodInfo("new"));
|
||||
|
||||
ClassDB::bind_method(D_METHOD("get_as_byte_code"), &GDScript::get_as_byte_code);
|
||||
}
|
||||
|
||||
Vector<uint8_t> GDScript::get_as_byte_code() const {
|
||||
|
||||
GDScriptTokenizerBuffer tokenizer;
|
||||
return tokenizer.parse_code_string(source);
|
||||
};
|
||||
|
||||
Error GDScript::load_byte_code(const String &p_path) {
|
||||
|
||||
Vector<uint8_t> bytecode;
|
||||
|
||||
if (p_path.ends_with("gde")) {
|
||||
|
||||
FileAccess *fa = FileAccess::open(p_path, FileAccess::READ);
|
||||
ERR_FAIL_COND_V(!fa, ERR_CANT_OPEN);
|
||||
|
||||
@@ -762,7 +705,6 @@ Error GDScript::load_byte_code(const String &p_path) {
|
||||
memdelete(fae);
|
||||
|
||||
} else {
|
||||
|
||||
bytecode = FileAccess::get_file_as_array(p_path);
|
||||
}
|
||||
|
||||
@@ -796,7 +738,6 @@ Error GDScript::load_byte_code(const String &p_path) {
|
||||
valid = true;
|
||||
|
||||
for (Map<StringName, Ref<GDScript>>::Element *E = subclasses.front(); E; E = E->next()) {
|
||||
|
||||
_set_subclass_path(E->get(), path);
|
||||
}
|
||||
|
||||
@@ -804,12 +745,10 @@ Error GDScript::load_byte_code(const String &p_path) {
|
||||
}
|
||||
|
||||
Error GDScript::load_source_code(const String &p_path) {
|
||||
|
||||
PoolVector<uint8_t> sourcef;
|
||||
Error err;
|
||||
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
|
||||
if (err) {
|
||||
|
||||
ERR_FAIL_COND_V(err, err);
|
||||
}
|
||||
|
||||
@@ -824,7 +763,6 @@ Error GDScript::load_source_code(const String &p_path) {
|
||||
|
||||
String s;
|
||||
if (s.parse_utf8((const char *)w.ptr())) {
|
||||
|
||||
ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
|
||||
}
|
||||
|
||||
@@ -837,14 +775,11 @@ Error GDScript::load_source_code(const String &p_path) {
|
||||
}
|
||||
|
||||
const Map<StringName, GDScriptFunction *> &GDScript::debug_get_member_functions() const {
|
||||
|
||||
return member_functions;
|
||||
}
|
||||
|
||||
StringName GDScript::debug_get_member_by_index(int p_idx) const {
|
||||
|
||||
for (const Map<StringName, MemberInfo>::Element *E = member_indices.front(); E; E = E->next()) {
|
||||
|
||||
if (E->get().index == p_idx)
|
||||
return E->key();
|
||||
}
|
||||
@@ -853,7 +788,6 @@ StringName GDScript::debug_get_member_by_index(int p_idx) const {
|
||||
}
|
||||
|
||||
Ref<GDScript> GDScript::get_base() const {
|
||||
|
||||
return base;
|
||||
}
|
||||
|
||||
@@ -871,9 +805,7 @@ bool GDScript::has_script_signal(const StringName &p_signal) const {
|
||||
return false;
|
||||
}
|
||||
void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
|
||||
|
||||
for (const Map<StringName, Vector<StringName>>::Element *E = _signals.front(); E; E = E->next()) {
|
||||
|
||||
MethodInfo mi;
|
||||
mi.name = E->key();
|
||||
for (int i = 0; i < E->get().size(); i++) {
|
||||
@@ -897,7 +829,6 @@ void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
|
||||
|
||||
GDScript::GDScript() :
|
||||
script_list(this) {
|
||||
|
||||
valid = false;
|
||||
subclass_count = 0;
|
||||
initializer = NULL;
|
||||
@@ -948,7 +879,6 @@ void GDScript::_save_orphaned_subclasses() {
|
||||
}
|
||||
|
||||
GDScript::~GDScript() {
|
||||
|
||||
GDScriptLanguage::get_singleton()->lock.lock();
|
||||
while (SelfList<GDScriptFunctionState> *E = pending_func_states.first()) {
|
||||
// Order matters since clearing the stack may already cause
|
||||
@@ -976,7 +906,6 @@ GDScript::~GDScript() {
|
||||
//////////////////////////////
|
||||
|
||||
bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
|
||||
|
||||
//member
|
||||
{
|
||||
const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name);
|
||||
@@ -1011,10 +940,8 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
|
||||
|
||||
GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
|
||||
Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._set);
|
||||
if (E) {
|
||||
|
||||
Variant name = p_name;
|
||||
const Variant *args[2] = { &name, &p_value };
|
||||
|
||||
@@ -1030,10 +957,8 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
|
||||
}
|
||||
|
||||
bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
|
||||
|
||||
const GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
|
||||
{
|
||||
const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name);
|
||||
if (E) {
|
||||
@@ -1050,7 +975,6 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
const GDScript *sl = sptr;
|
||||
while (sl) {
|
||||
const Map<StringName, Variant>::Element *E = sl->constants.find(p_name);
|
||||
@@ -1065,7 +989,6 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
|
||||
{
|
||||
const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._get);
|
||||
if (E) {
|
||||
|
||||
Variant name = p_name;
|
||||
const Variant *args[1] = { &name };
|
||||
|
||||
@@ -1084,10 +1007,8 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
|
||||
}
|
||||
|
||||
Variant::Type GDScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
|
||||
|
||||
const GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
|
||||
if (sptr->member_info.has(p_name)) {
|
||||
if (r_is_valid)
|
||||
*r_is_valid = true;
|
||||
@@ -1108,19 +1029,15 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
|
||||
List<PropertyInfo> props;
|
||||
|
||||
while (sptr) {
|
||||
|
||||
const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._get_property_list);
|
||||
if (E) {
|
||||
|
||||
Variant::CallError err;
|
||||
Variant ret = const_cast<GDScriptFunction *>(E->get())->call(const_cast<GDScriptInstance *>(this), NULL, 0, err);
|
||||
if (err.error == Variant::CallError::CALL_OK) {
|
||||
|
||||
ERR_FAIL_COND_MSG(ret.get_type() != Variant::ARRAY, "Wrong type for _get_property_list, must be an array of dictionaries.");
|
||||
|
||||
Array arr = ret;
|
||||
for (int i = 0; i < arr.size(); i++) {
|
||||
|
||||
Dictionary d = arr[i];
|
||||
ERR_CONTINUE(!d.has("name"));
|
||||
ERR_CONTINUE(!d.has("type"));
|
||||
@@ -1145,7 +1062,6 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
|
||||
|
||||
Vector<_GDScriptMemberSort> msort;
|
||||
for (Map<StringName, PropertyInfo>::Element *F = sptr->member_info.front(); F; F = F->next()) {
|
||||
|
||||
_GDScriptMemberSort ms;
|
||||
ERR_CONTINUE(!sptr->member_indices.has(F->key()));
|
||||
ms.index = sptr->member_indices[F->key()].index;
|
||||
@@ -1156,7 +1072,6 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
|
||||
msort.sort();
|
||||
msort.invert();
|
||||
for (int i = 0; i < msort.size(); i++) {
|
||||
|
||||
props.push_front(sptr->member_info[msort[i].name]);
|
||||
}
|
||||
|
||||
@@ -1164,18 +1079,14 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
|
||||
}
|
||||
|
||||
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
|
||||
|
||||
p_properties->push_back(E->get());
|
||||
}
|
||||
}
|
||||
|
||||
void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
|
||||
|
||||
const GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
|
||||
for (Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.front(); E; E = E->next()) {
|
||||
|
||||
MethodInfo mi;
|
||||
mi.name = E->key();
|
||||
mi.flags |= METHOD_FLAG_FROM_SCRIPT;
|
||||
@@ -1188,7 +1099,6 @@ void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
|
||||
}
|
||||
|
||||
bool GDScriptInstance::has_method(const StringName &p_method) const {
|
||||
|
||||
const GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
|
||||
@@ -1200,7 +1110,6 @@ bool GDScriptInstance::has_method(const StringName &p_method) const {
|
||||
return false;
|
||||
}
|
||||
Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
|
||||
|
||||
GDScript *sptr = script.ptr();
|
||||
while (sptr) {
|
||||
Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
|
||||
@@ -1214,7 +1123,6 @@ Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_arg
|
||||
}
|
||||
|
||||
void GDScriptInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) {
|
||||
|
||||
GDScript *sptr = script.ptr();
|
||||
Variant::CallError ce;
|
||||
|
||||
@@ -1228,7 +1136,6 @@ void GDScriptInstance::call_multilevel(const StringName &p_method, const Variant
|
||||
}
|
||||
|
||||
void GDScriptInstance::_ml_call_reversed(GDScript *sptr, const StringName &p_method, const Variant **p_args, int p_argcount) {
|
||||
|
||||
if (sptr->_base)
|
||||
_ml_call_reversed(sptr->_base, p_method, p_args, p_argcount);
|
||||
|
||||
@@ -1241,14 +1148,12 @@ void GDScriptInstance::_ml_call_reversed(GDScript *sptr, const StringName &p_met
|
||||
}
|
||||
|
||||
void GDScriptInstance::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) {
|
||||
|
||||
if (script.ptr()) {
|
||||
_ml_call_reversed(script.ptr(), p_method, p_args, p_argcount);
|
||||
}
|
||||
}
|
||||
|
||||
void GDScriptInstance::notification(int p_notification) {
|
||||
|
||||
//notification is not virtual, it gets called at ALL levels just like in C.
|
||||
Variant value = p_notification;
|
||||
const Variant *args[1] = { &value };
|
||||
@@ -1288,23 +1193,19 @@ String GDScriptInstance::to_string(bool *r_valid) {
|
||||
}
|
||||
|
||||
Ref<Script> GDScriptInstance::get_script() const {
|
||||
|
||||
return script;
|
||||
}
|
||||
|
||||
ScriptLanguage *GDScriptInstance::get_language() {
|
||||
|
||||
return GDScriptLanguage::get_singleton();
|
||||
}
|
||||
|
||||
MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode(const StringName &p_method) const {
|
||||
|
||||
const GDScript *cscript = script.ptr();
|
||||
|
||||
while (cscript) {
|
||||
const Map<StringName, GDScriptFunction *>::Element *E = cscript->member_functions.find(p_method);
|
||||
if (E) {
|
||||
|
||||
if (E->get()->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
|
||||
return E->get()->get_rpc_mode();
|
||||
}
|
||||
@@ -1316,13 +1217,11 @@ MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode(const StringName &p_metho
|
||||
}
|
||||
|
||||
MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode(const StringName &p_variable) const {
|
||||
|
||||
const GDScript *cscript = script.ptr();
|
||||
|
||||
while (cscript) {
|
||||
const Map<StringName, GDScript::MemberInfo>::Element *E = cscript->member_indices.find(p_variable);
|
||||
if (E) {
|
||||
|
||||
if (E->get().rpc_mode) {
|
||||
return E->get().rpc_mode;
|
||||
}
|
||||
@@ -1334,7 +1233,6 @@ MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode(const StringName &p_vari
|
||||
}
|
||||
|
||||
void GDScriptInstance::reload_members() {
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
|
||||
members.resize(script->member_indices.size()); //resize
|
||||
@@ -1344,7 +1242,6 @@ void GDScriptInstance::reload_members() {
|
||||
|
||||
//pass the values to the new indices
|
||||
for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
|
||||
|
||||
if (member_indices_cache.has(E->key())) {
|
||||
Variant value = members[member_indices_cache[E->key()]];
|
||||
new_members.write[E->get().index] = value;
|
||||
@@ -1357,7 +1254,6 @@ void GDScriptInstance::reload_members() {
|
||||
//pass the values to the new indices
|
||||
member_indices_cache.clear();
|
||||
for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
|
||||
|
||||
member_indices_cache[E->key()] = E->get().index;
|
||||
}
|
||||
|
||||
@@ -1391,14 +1287,12 @@ GDScriptInstance::~GDScriptInstance() {
|
||||
GDScriptLanguage *GDScriptLanguage::singleton = NULL;
|
||||
|
||||
String GDScriptLanguage::get_name() const {
|
||||
|
||||
return "GDScript";
|
||||
}
|
||||
|
||||
/* LANGUAGE FUNCTIONS */
|
||||
|
||||
void GDScriptLanguage::_add_global(const StringName &p_name, const Variant &p_value) {
|
||||
|
||||
if (globals.has(p_name)) {
|
||||
//overwrite existing
|
||||
global_array.write[globals[p_name]] = p_value;
|
||||
@@ -1410,7 +1304,6 @@ void GDScriptLanguage::_add_global(const StringName &p_name, const Variant &p_va
|
||||
}
|
||||
|
||||
void GDScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) {
|
||||
|
||||
_add_global(p_variable, p_value);
|
||||
}
|
||||
|
||||
@@ -1424,11 +1317,9 @@ void GDScriptLanguage::remove_named_global_constant(const StringName &p_name) {
|
||||
}
|
||||
|
||||
void GDScriptLanguage::init() {
|
||||
|
||||
//populate global constants
|
||||
int gcc = GlobalConstants::get_global_constant_count();
|
||||
for (int i = 0; i < gcc; i++) {
|
||||
|
||||
_add_global(StaticCString::create(GlobalConstants::get_global_constant_name(i)), GlobalConstants::get_global_constant_value(i));
|
||||
}
|
||||
|
||||
@@ -1442,7 +1333,6 @@ void GDScriptLanguage::init() {
|
||||
List<StringName> class_list;
|
||||
ClassDB::get_class_list(&class_list);
|
||||
for (List<StringName>::Element *E = class_list.front(); E; E = E->next()) {
|
||||
|
||||
StringName n = E->get();
|
||||
String s = String(n);
|
||||
if (s.begins_with("_"))
|
||||
@@ -1459,21 +1349,17 @@ void GDScriptLanguage::init() {
|
||||
List<Engine::Singleton> singletons;
|
||||
Engine::get_singleton()->get_singletons(&singletons);
|
||||
for (List<Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
|
||||
|
||||
_add_global(E->get().name, E->get().ptr);
|
||||
}
|
||||
}
|
||||
|
||||
String GDScriptLanguage::get_type() const {
|
||||
|
||||
return "GDScript";
|
||||
}
|
||||
String GDScriptLanguage::get_extension() const {
|
||||
|
||||
return "gd";
|
||||
}
|
||||
Error GDScriptLanguage::execute_file(const String &p_path) {
|
||||
|
||||
// ??
|
||||
return OK;
|
||||
}
|
||||
@@ -1481,7 +1367,6 @@ void GDScriptLanguage::finish() {
|
||||
}
|
||||
|
||||
void GDScriptLanguage::profiling_start() {
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
lock.lock();
|
||||
|
||||
@@ -1505,7 +1390,6 @@ void GDScriptLanguage::profiling_start() {
|
||||
}
|
||||
|
||||
void GDScriptLanguage::profiling_stop() {
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
lock.lock();
|
||||
profiling = false;
|
||||
@@ -1514,7 +1398,6 @@ void GDScriptLanguage::profiling_stop() {
|
||||
}
|
||||
|
||||
int GDScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) {
|
||||
|
||||
int current = 0;
|
||||
#ifdef DEBUG_ENABLED
|
||||
lock.lock();
|
||||
@@ -1538,7 +1421,6 @@ int GDScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr,
|
||||
}
|
||||
|
||||
int GDScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) {
|
||||
|
||||
int current = 0;
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
@@ -1565,10 +1447,8 @@ int GDScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_
|
||||
}
|
||||
|
||||
struct GDScriptDepSort {
|
||||
|
||||
//must support sorting so inheritance works properly (parent must be reloaded first)
|
||||
bool operator()(const Ref<GDScript> &A, const Ref<GDScript> &B) const {
|
||||
|
||||
if (A == B)
|
||||
return false; //shouldn't happen but..
|
||||
const GDScript *I = B->get_base().ptr();
|
||||
@@ -1586,7 +1466,6 @@ struct GDScriptDepSort {
|
||||
};
|
||||
|
||||
void GDScriptLanguage::reload_all_scripts() {
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
print_verbose("GDScript: Reloading all scripts");
|
||||
lock.lock();
|
||||
@@ -1609,7 +1488,6 @@ void GDScriptLanguage::reload_all_scripts() {
|
||||
scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
|
||||
|
||||
for (List<Ref<GDScript>>::Element *E = scripts.front(); E; E = E->next()) {
|
||||
|
||||
print_verbose("GDScript: Reloading: " + E->get()->get_path());
|
||||
E->get()->load_source_code(E->get()->get_path());
|
||||
E->get()->reload(true);
|
||||
@@ -1618,7 +1496,6 @@ void GDScriptLanguage::reload_all_scripts() {
|
||||
}
|
||||
|
||||
void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
|
||||
lock.lock();
|
||||
@@ -1628,7 +1505,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
SelfList<GDScript> *elem = script_list.first();
|
||||
while (elem) {
|
||||
if (elem->self()->get_path().is_resource_file()) {
|
||||
|
||||
scripts.push_back(Ref<GDScript>(elem->self())); //cast to gdscript to avoid being erased by accident
|
||||
}
|
||||
elem = elem->next();
|
||||
@@ -1645,7 +1521,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
|
||||
|
||||
for (List<Ref<GDScript>>::Element *E = scripts.front(); E; E = E->next()) {
|
||||
|
||||
bool reload = E->get() == p_script || to_reload.has(E->get()->get_base());
|
||||
|
||||
if (!reload)
|
||||
@@ -1654,7 +1529,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
to_reload.insert(E->get(), Map<ObjectID, List<Pair<StringName, Variant>>>());
|
||||
|
||||
if (!p_soft_reload) {
|
||||
|
||||
//save state and remove script from instances
|
||||
Map<ObjectID, List<Pair<StringName, Variant>>> &map = to_reload[E->get()];
|
||||
|
||||
@@ -1663,7 +1537,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
//save instance info
|
||||
List<Pair<StringName, Variant>> state;
|
||||
if (obj->get_script_instance()) {
|
||||
|
||||
obj->get_script_instance()->get_property_state(state);
|
||||
map[obj->get_instance_id()] = state;
|
||||
obj->set_script(RefPtr());
|
||||
@@ -1678,7 +1551,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
|
||||
//save instance info
|
||||
if (obj->get_script_instance()) {
|
||||
|
||||
map.insert(obj->get_instance_id(), List<Pair<StringName, Variant>>());
|
||||
List<Pair<StringName, Variant>> &state = map[obj->get_instance_id()];
|
||||
obj->get_script_instance()->get_property_state(state);
|
||||
@@ -1698,13 +1570,11 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
}
|
||||
|
||||
for (Map<Ref<GDScript>, Map<ObjectID, List<Pair<StringName, Variant>>>>::Element *E = to_reload.front(); E; E = E->next()) {
|
||||
|
||||
Ref<GDScript> scr = E->key();
|
||||
scr->reload(p_soft_reload);
|
||||
|
||||
//restore state if saved
|
||||
for (Map<ObjectID, List<Pair<StringName, Variant>>>::Element *F = E->get().front(); F; F = F->next()) {
|
||||
|
||||
List<Pair<StringName, Variant>> &saved_state = F->get();
|
||||
|
||||
Object *obj = ObjectDB::get_instance(F->key());
|
||||
@@ -1748,7 +1618,6 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
|
||||
}
|
||||
|
||||
void GDScriptLanguage::frame() {
|
||||
|
||||
calls = 0;
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
@@ -1774,7 +1643,6 @@ void GDScriptLanguage::frame() {
|
||||
|
||||
/* EDITOR FUNCTIONS */
|
||||
void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
|
||||
|
||||
static const char *_reserved_words[] = {
|
||||
// operators
|
||||
"and",
|
||||
@@ -1840,7 +1708,6 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
|
||||
const char **w = _reserved_words;
|
||||
|
||||
while (*w) {
|
||||
|
||||
p_words->push_back(*w);
|
||||
w++;
|
||||
}
|
||||
@@ -1851,12 +1718,10 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
|
||||
}
|
||||
|
||||
bool GDScriptLanguage::handles_global_class_type(const String &p_type) const {
|
||||
|
||||
return p_type == "GDScript";
|
||||
}
|
||||
|
||||
String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_base_type, String *r_icon_path) const {
|
||||
|
||||
PoolVector<uint8_t> sourcef;
|
||||
Error err;
|
||||
FileAccessRef f = FileAccess::open(p_path, FileAccess::READ, &err);
|
||||
@@ -1870,7 +1735,6 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
|
||||
parser.parse(source, p_path.get_base_dir(), true, p_path, false, NULL, true);
|
||||
|
||||
if (parser.get_parse_tree() && parser.get_parse_tree()->type == GDScriptParser::Node::TYPE_CLASS) {
|
||||
|
||||
const GDScriptParser::ClassNode *c = static_cast<const GDScriptParser::ClassNode *>(parser.get_parse_tree());
|
||||
if (r_icon_path) {
|
||||
if (c->icon_path.empty() || c->icon_path.is_abs_path())
|
||||
@@ -1879,7 +1743,6 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
|
||||
*r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path();
|
||||
}
|
||||
if (r_base_type) {
|
||||
|
||||
const GDScriptParser::ClassNode *subclass = c;
|
||||
String path = p_path;
|
||||
GDScriptParser subparser;
|
||||
@@ -1953,7 +1816,6 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
String GDScriptWarning::get_message() const {
|
||||
|
||||
#define CHECK_SYMBOLS(m_amount) ERR_FAIL_COND_V(symbols.size() < m_amount, String());
|
||||
|
||||
switch (code) {
|
||||
@@ -2122,7 +1984,6 @@ GDScriptWarning::Code GDScriptWarning::get_code_from_name(const String &p_name)
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
GDScriptLanguage::GDScriptLanguage() {
|
||||
|
||||
calls = 0;
|
||||
ERR_FAIL_COND(singleton);
|
||||
singleton = this;
|
||||
@@ -2167,7 +2028,6 @@ GDScriptLanguage::GDScriptLanguage() {
|
||||
}
|
||||
|
||||
GDScriptLanguage::~GDScriptLanguage() {
|
||||
|
||||
if (_call_stack) {
|
||||
memdelete_arr(_call_stack);
|
||||
}
|
||||
@@ -2219,7 +2079,6 @@ Ref<GDScript> GDScriptLanguage::get_orphan_subclass(const String &p_qualified_na
|
||||
/*************** RESOURCE ***************/
|
||||
|
||||
RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error) {
|
||||
|
||||
if (r_error)
|
||||
*r_error = ERR_FILE_CANT_OPEN;
|
||||
|
||||
@@ -2228,7 +2087,6 @@ RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_ori
|
||||
Ref<GDScript> scriptres(script);
|
||||
|
||||
if (p_path.ends_with(".gde") || p_path.ends_with(".gdc")) {
|
||||
|
||||
script->set_script_path(p_original_path); // script needs this.
|
||||
script->set_path(p_original_path);
|
||||
Error err = script->load_byte_code(p_path);
|
||||
@@ -2250,19 +2108,16 @@ RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_ori
|
||||
}
|
||||
|
||||
void ResourceFormatLoaderGDScript::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
|
||||
p_extensions->push_back("gd");
|
||||
p_extensions->push_back("gdc");
|
||||
p_extensions->push_back("gde");
|
||||
}
|
||||
|
||||
bool ResourceFormatLoaderGDScript::handles_type(const String &p_type) const {
|
||||
|
||||
return (p_type == "Script" || p_type == "GDScript");
|
||||
}
|
||||
|
||||
String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) const {
|
||||
|
||||
String el = p_path.get_extension().to_lower();
|
||||
if (el == "gd" || el == "gdc" || el == "gde")
|
||||
return "GDScript";
|
||||
@@ -2270,7 +2125,6 @@ String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) con
|
||||
}
|
||||
|
||||
void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
|
||||
|
||||
FileAccessRef file = FileAccess::open(p_path, FileAccess::READ);
|
||||
ERR_FAIL_COND_MSG(!file, "Cannot open file '" + p_path + "'.");
|
||||
|
||||
@@ -2290,7 +2144,6 @@ void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<S
|
||||
}
|
||||
|
||||
Error ResourceFormatSaverGDScript::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
|
||||
|
||||
Ref<GDScript> sqscr = p_resource;
|
||||
ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
|
||||
|
||||
@@ -2317,12 +2170,10 @@ Error ResourceFormatSaverGDScript::save(const String &p_path, const RES &p_resou
|
||||
}
|
||||
|
||||
void ResourceFormatSaverGDScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
|
||||
|
||||
if (Object::cast_to<GDScript>(*p_resource)) {
|
||||
p_extensions->push_back("gd");
|
||||
}
|
||||
}
|
||||
bool ResourceFormatSaverGDScript::recognize(const RES &p_resource) const {
|
||||
|
||||
return Object::cast_to<GDScript>(*p_resource) != NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user