diff options
| author | Bojidar Marinov | 2016-08-25 21:18:35 +0300 |
|---|---|---|
| committer | Pedro J. Estébanez | 2017-01-10 17:09:26 +0100 |
| commit | 6ad84850abdccb5867de26d5eab198da9d57603e (patch) | |
| tree | c1b43ceeb124d8d518e4bc6f3cea31b3fe9a2c33 /modules/gdscript/gd_parser.h | |
| parent | c0743f898a40c41c204e817c34a46fdc19e03dd2 (diff) | |
| download | godot-6ad84850abdccb5867de26d5eab198da9d57603e.tar.gz godot-6ad84850abdccb5867de26d5eab198da9d57603e.tar.zst godot-6ad84850abdccb5867de26d5eab198da9d57603e.zip | |
Ternary operator in GDScript (a if x else b)
Fixes #1961
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 4afc534a8..f20dffa48 100644 --- a/modules/gdscript/gd_parser.h +++ b/modules/gdscript/gd_parser.h @@ -244,6 +244,9 @@ public: OP_BIT_AND, OP_BIT_OR, OP_BIT_XOR, + //ternary operators + OP_TERNARY_IF, + OP_TERNARY_ELSE, }; Operator op; |