Use more and and or

Author: MatheusRich

samples/brainfuck.lit

@@ -55,7 +55,7 @@ type Parser {
 
         if c == "[" {
           bracket_stack.push(i)
-        } else if c == "]" && !bracket_stack.is_empty?() {
+        } else if c == "]" and !bracket_stack.is_empty?() {
           let left = bracket_stack.pop()
           let right = i
           bracket_map[left] = right
@@ -128,7 +128,7 @@ fn help {
 }
 
 fn parse_options {
-  let option = argv()[0] || help()
+  let option = argv()[0] or help()
 
   if "--hello-world".includes?(option) {
     "
@@ -159,9 +159,9 @@ fn parse_options {
       http://www.hevanet.com/cristofd/brainfuck/]
 
     "
-  } else if "--file".includes?(option) && argv()[1] {
+  } else if "--file".includes?(option) and argv()[1] {
     open(argv()[1])
-  } else if "--eval".includes?(option) && argv()[1] {
+  } else if "--eval".includes?(option) and argv()[1] {
     argv()[1]
   } else {
     help()

spec/e2e/custom_types/operator_overload.lit

@@ -21,23 +21,23 @@ type Vector2D {
   }
 
   eq { |other|
-    return self.x == other.x && self.y == other.y
+    return self.x == other.x and self.y == other.y
   }
 
   lt { |other|
-    return self.x < other.x || (self.x == other.x && self.y < other.y)
+    return self.x < other.x or (self.x == other.x and self.y < other.y)
   }
 
   lte { |other|
-    return self.x < other.x || (self.x == other.x && self.y <= other.y)
+    return self.x < other.x or (self.x == other.x and self.y <= other.y)
   }
 
   gt { |other|
-    return self.x > other.x || (self.x == other.x && self.y > other.y)
+    return self.x > other.x or (self.x == other.x and self.y > other.y)
   }
 
   gte { |other|
-    return self.x > other.x || (self.x == other.x && self.y >= other.y)
+    return self.x > other.x or (self.x == other.x and self.y >= other.y)
   }
 
   mod { |other|

spec/e2e/loops/while/syntax.lit

@@ -44,7 +44,7 @@ println(
 var e = 0
 println(
   inspect(while e < 3 {
-    if e == 0 || e == 2 {
+    if e == 0 or e == 2 {
       e += 1
       next # next returns nil
     }

spec/e2e/string/literals.lit

@@ -10,7 +10,7 @@ println('a\nstring') # expect: a\nstring
 println("A~¶Þॐஃ") # expect: A~¶Þॐஃ
 
 # symbol strings
-println(:hey == 'hey' && :hey == "hey") # expect: true
+println(:hey == 'hey' and :hey == "hey") # expect: true
 println(:hey) # expect: hey
 println(:123) # expect: 123
 println(:1a2b3c) # expect: 1a2b3c

spec/stdlib/test_runner.lit

@@ -22,7 +22,7 @@ type TestRunner {
     self.tests.each(fn { |t|
       let result = t[:block](Should())
 
-      if result && result[:ok] == false {
+      if result and result[:ok] == false {
         print("F")
         failed_tests.push({ name: "{self.current_group} {t[:name]}", message: result[:message] })
       } else {