diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-09-11 18:40:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-11 18:40:46 -0300 |
| commit | 78f92dbcb9b193fb7a100ca7096c15a6899199fc (patch) | |
| tree | 846fb2f7fef6695400d58f3a472f915dba80a9ef /modules/gdscript/gd_parser.h | |
| parent | ba3c47c696d9dd797a9053d77557259400b97586 (diff) | |
| parent | 9f66f59477bb75b804f265f373106b9de1715500 (diff) | |
Merge pull request #6281 from bojidar-bg/gdscript-ternary-operator
Ternary operator in GDScript (a if x else b)
Diffstat (limited to 'modules/gdscript/gd_parser.h')
| -rw-r--r-- | modules/gdscript/gd_parser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h index 9e6f6e6765..aca77e0df0 100644 --- a/modules/gdscript/gd_parser.h +++ b/modules/gdscript/gd_parser.h @@ -247,6 +247,9 @@ public: OP_BIT_AND, OP_BIT_OR, OP_BIT_XOR, + //ternary operators + OP_TERNARY_IF, + OP_TERNARY_ELSE, }; Operator op; |