diff options
author | George Marques <george@gmarqu.es> | 2016-02-04 14:52:44 -0200 |
---|---|---|
committer | George Marques <george@gmarqu.es> | 2016-02-04 14:52:44 -0200 |
commit | 0f41a183447cc753d30b7229c763638d3c89b4e2 (patch) | |
tree | 83b18d4aaa93ed581763117ddd60fcb3d65a0b9b /modules | |
parent | cefca4429c165134e1acc00bbd58bdcbc3f4f955 (diff) | |
parent | 99d9188da8f022cf0baca709964df0513700296c (diff) |
Merge pull request #3582 from akien-mga/pr-reserved-keyords
Add preload and PI to GDScript reserved keywords
Diffstat (limited to 'modules')
-rw-r--r-- | modules/gdscript/gd_script.cpp | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 8f48a3d6a7..a4ff8de44e 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -2678,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}; |