diff options
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 64 |
1 files changed, 36 insertions, 28 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 62c5eb735a..1b2ed670ad 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -2456,6 +2456,7 @@ void GDInstance::get_method_list(List<MethodInfo> *p_list) const { MethodInfo mi; mi.name=E->key(); + mi.flags|=METHOD_FLAG_FROM_SCRIPT; for(int i=0;i<E->get().get_argument_count();i++) mi.arguments.push_back(PropertyInfo(Variant::NIL,"arg"+itos(i))); p_list->push_back(mi); @@ -2677,40 +2678,47 @@ void GDScriptLanguage::frame() { void GDScriptLanguage::get_reserved_words(List<String> *p_words) const { static const char *_reserved_words[]={ - "break", - "class", - "continue", - "const", - "else", - "elif", - "enum", - "extends" , - "onready", - "for" , - "func" , - "if" , - "in" , - "null" , - "not" , - "return" , - "self" , - "while" , - "true" , - "false" , - "tool", - "var", - "setget", - "pass", + // operators "and", + "in", + "not", "or", - "export", + // types and values + "false", + "float", + "int", + "null", + "PI", + "self", + "true", + // functions "assert", "breakpoint", + "class", + "extends", + "func", + "preload", + "setget", + "signal", + "tool", "yield", + // var + "const", + "enum", + "export", + "onready", "static", - "float", - "int", - "signal", + "var", + // control flow + "break", + "continue", + "if", + "elif", + "else", + "for", + "pass", + "return", + "while", 0}; |