From ee29a15119f898b531857b3ab9d379ba641d1abc Mon Sep 17 00:00:00 2001
From: JT <547158+jntrnr@users.noreply.github.com>
Date: Sat, 23 Apr 2022 07:14:31 +1200
Subject: [PATCH] Add 'and' and 'or' operators (#5297)

---
 crates/nu-parser/src/parser.rs | 4 ++--
 src/tests/test_parser.rs       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 8621021006..d84da91973 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4000,8 +4000,8 @@ pub fn parse_operator(
         b"in" => Operator::In,
         b"not-in" => Operator::NotIn,
         b"mod" => Operator::Modulo,
-        b"&&" => Operator::And,
-        b"||" => Operator::Or,
+        b"&&" | b"and" => Operator::And,
+        b"||" | b"or" => Operator::Or,
         b"**" => Operator::Pow,
         _ => {
             return (
diff --git a/src/tests/test_parser.rs b/src/tests/test_parser.rs
index 44e7f54501..a956950b6c 100644
--- a/src/tests/test_parser.rs
+++ b/src/tests/test_parser.rs
@@ -409,3 +409,8 @@ fn unary_not_6() -> TestResult {
 fn date_literal() -> TestResult {
     run_test(r#"2022-09-10 | date to-record | get day"#, "10")
 }
+
+#[test]
+fn and_and_or() -> TestResult {
+    run_test(r#"true and false or true"#, "true")
+}