From 8a112dcef26e22f9dd1d24ea74ab8207c3061370 Mon Sep 17 00:00:00 2001 From: Thiago Lages de Alencar Date: Mon, 27 Feb 2023 03:37:17 -0300 Subject: [PATCH] Add bang operator to operators table (#6558) * Add bang operator to operators table * Add symbolic aliases for `and` & `or` * Remove comma from operators table * Add bang to the aliases list --------- Co-authored-by: Max Hilbrunner --- tutorials/scripting/gdscript/gdscript_basics.rst | 13 ++++++++----- .../scripting/gdscript/gdscript_styleguide.rst | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tutorials/scripting/gdscript/gdscript_basics.rst b/tutorials/scripting/gdscript/gdscript_basics.rst index de0d8bdbc..b713a68d1 100644 --- a/tutorials/scripting/gdscript/gdscript_basics.rst +++ b/tutorials/scripting/gdscript/gdscript_basics.rst @@ -274,16 +274,19 @@ The following is the list of supported operators and their precedence. +--------------------------------------------------------------------------------+-------------------------------------------+ | ``in`` | Inclusion checker (when used with | | | control flow keywords or in a | -| | standalone expression). | +| | standalone expression) | | | | | | Content iterator (when used with the | -| | for_ keyword). | +| | for_ keyword) | +--------------------------------------------------------------------------------+-------------------------------------------+ -| ``not`` | Boolean NOT | +| ``not`` ``!`` | Boolean NOT and its | +| | :ref:`aliases` | +--------------------------------------------------------------------------------+-------------------------------------------+ -| ``and`` | Boolean AND | +| ``and`` ``&&`` | Boolean AND and its | +| | :ref:`aliases` | +--------------------------------------------------------------------------------+-------------------------------------------+ -| ``or`` | Boolean OR | +| ``or`` ``||`` | Boolean OR and its | +| | :ref:`aliases` | +--------------------------------------------------------------------------------+-------------------------------------------+ | ``if x else`` | Ternary if/else | +--------------------------------------------------------------------------------+-------------------------------------------+ diff --git a/tutorials/scripting/gdscript/gdscript_styleguide.rst b/tutorials/scripting/gdscript/gdscript_styleguide.rst index 9be95e050..921715012 100644 --- a/tutorials/scripting/gdscript/gdscript_styleguide.rst +++ b/tutorials/scripting/gdscript/gdscript_styleguide.rst @@ -407,6 +407,8 @@ they only reduce readability. if (is_colliding()): queue_free() +.. _boolean_operators: + Boolean operators ~~~~~~~~~~~~~~~~~ @@ -425,7 +427,7 @@ This can make long expressions easier to read. :: - if (foo and bar) or baz: + if (foo and bar) or not baz: print("condition is true") **Bad**: @@ -434,7 +436,7 @@ This can make long expressions easier to read. :: - if foo && bar || baz: + if foo && bar || !baz: print("condition is true") Comment spacing