From e9282cc37813c2632b2e55329343a6ab233b4cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 8 Mar 2021 17:15:46 +0100
Subject: check other operand if one is unknown

---
 src/lib.rs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 7e09dce..a138c33 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -601,7 +601,8 @@ mod op {
             (Value::Int(a), Value::Int(b)) => Value::Int(a + b),
             (Value::String(a), Value::String(b)) => Value::String(Rc::from(format!("{}{}", a, b))),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, add),
-            (Value::Unknown, a) | (a, Value::Unknown) => a.clone(),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => add(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -615,7 +616,8 @@ mod op {
             (Value::Float(a), Value::Float(b)) => Value::Float(a * b),
             (Value::Int(a), Value::Int(b)) => Value::Int(a * b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, mul),
-            (Value::Unknown, a) | (a, Value::Unknown) => a.clone(),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => mul(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -625,7 +627,8 @@ mod op {
             (Value::Float(a), Value::Float(b)) => Value::Float(a / b),
             (Value::Int(a), Value::Int(b)) => Value::Int(a / b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, div),
-            (Value::Unknown, a) | (a, Value::Unknown) => a.clone(),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => div(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -637,7 +640,8 @@ mod op {
             (Value::String(a), Value::String(b)) => Value::Bool(a == b),
             (Value::Bool(a), Value::Bool(b)) => Value::Bool(a == b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, eq),
-            (Value::Unknown, _) | (_, Value::Unknown) => Value::from(Type::Bool),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => eq(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -649,7 +653,8 @@ mod op {
             (Value::String(a), Value::String(b)) => Value::Bool(a < b),
             (Value::Bool(a), Value::Bool(b)) => Value::Bool(a < b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, less),
-            (Value::Unknown, _) | (_, Value::Unknown) => Value::from(Type::Bool),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => less(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -662,7 +667,8 @@ mod op {
         match (a, b) {
             (Value::Bool(a), Value::Bool(b)) => Value::Bool(*a && *b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, and),
-            (Value::Unknown, _) | (_, Value::Unknown) => Value::from(Type::Bool),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => and(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
@@ -671,7 +677,8 @@ mod op {
         match (a, b) {
             (Value::Bool(a), Value::Bool(b)) => Value::Bool(*a || *b),
             (Value::Tuple(a), Value::Tuple(b)) if a.len() == b.len() => tuple_bin_op(a, b, or),
-            (Value::Unknown, _) | (_, Value::Unknown) => Value::from(Type::Bool),
+            (Value::Unknown, a) | (a, Value::Unknown) if !matches!(a, Value::Unknown) => or(a, a),
+            (Value::Unknown, Value::Unknown) => Value::Unknown,
             _ => Value::Nil,
         }
     }
-- 
cgit v1.2.1