r_exec: In boolean operators equ(), etc. return true even if the bool…

…ean result is false. See pull request #144.
IIIM-IS · Mar 17, 2021 · 4d98422 · 4d98422
1 parent eadc29a
commit 4d98422
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/r_exec/operator.cpp b/r_exec/operator.cpp
@@ -137,7 +137,7 @@ bool equ(const Context &context, uint16 &index) {
 
   bool r = (lhs == rhs);
   index = context.setAtomicResult(Atom::Boolean(r));
-  return r;
+  return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -146,7 +146,7 @@ bool neq(const Context &context, uint16 &index) {
 
   bool r = *context.getChild(1) != *context.getChild(2);
   index = context.setAtomicResult(Atom::Boolean(r));
-  return r;
+  return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -162,15 +162,15 @@ bool gtr(const Context &context, uint16 &index) {
 
       bool r = lhs[0].asFloat() > rhs[0].asFloat();
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   } else if (lhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
     if (rhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
       bool r = Utils::GetTimestamp(&lhs[0]) > Utils::GetTimestamp(&rhs[0]);
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   }
 
@@ -191,15 +191,15 @@ bool lsr(const Context &context, uint16 &index) {
 
       bool r = lhs[0].asFloat() < rhs[0].asFloat();
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   } else if (lhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
     if (rhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
       bool r = Utils::GetTimestamp(&lhs[0]) < Utils::GetTimestamp(&rhs[0]);
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   }
 
@@ -220,15 +220,15 @@ bool gte(const Context &context, uint16 &index) {
 
       bool r = lhs[0].asFloat() >= rhs[0].asFloat();
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   } else if (lhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
     if (rhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
       bool r = Utils::GetTimestamp(&lhs[0]) >= Utils::GetTimestamp(&rhs[0]);
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   }
 
@@ -249,15 +249,15 @@ bool lse(const Context &context, uint16 &index) {
 
       bool r = lhs[0].asFloat() <= rhs[0].asFloat();
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   } else if (lhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
     if (rhs[0].getDescriptor() == Atom::TIMESTAMP) {
 
       bool r = Utils::GetTimestamp(&lhs[0]) <= Utils::GetTimestamp(&rhs[0]);
       index = context.setAtomicResult(Atom::Boolean(r));
-      return r;
+      return true;
     }
   }