Merge pull request #144 from IIIM-IS/evaluate-boolean-guard

Boolean operators should return true for successful evaluation
IIIM-IS · Mar 18, 2021 · 7c3fdea · 7c3fdea
2 parents aab5adc + 00ba990
commit 7c3fdea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/r_exec/hlp_overlay.cpp b/r_exec/hlp_overlay.cpp
@@ -132,6 +132,9 @@ inline bool HLPOverlay::evaluate_guards(uint16 guard_set_iptr_index) {
     uint16 result_index;
     if (!evaluate(guard_set_index + i, result_index))
       return false;
+    if (code_[result_index].isBooleanFalse())
+      // This is a boolean guard (not an assignment) and it is false.
+      return false;
   }
   return true;
 }

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;
     }
   }
 

diff --git a/r_exec/pgm_overlay.cpp b/r_exec/pgm_overlay.cpp
@@ -751,6 +751,9 @@ bool PGMOverlay::check_guards() {
     uint16 result_index;
     if (!evaluate(guard_set_index + i, result_index))
       return false;
+    if (code_[result_index].isBooleanFalse())
+      // The boolean guard is false.
+      return false;
   }
   return true;
 }

diff --git a/r_exec/pgm_overlay.h b/r_exec/pgm_overlay.h
@@ -162,6 +162,9 @@ class r_exec_dll PGMOverlay :
     uint16 result_index;
     if (!evaluate(guard_set_index, result_index))
       return FAILURE;
+    if (code_[result_index].isBooleanFalse())
+      // The boolean guard is false.
+      return FAILURE;
     return SUCCESS;
   }