Changeset 590

Timestamp:

07/14/08 09:27:02 (6 months ago)

Author:

weyrick

Message:

switch p3state to a boost::tribool. we now have pTrue, pFalse, and pNull
values, which evaluate properly in conditionals (i.e. only pTrue is true)

Location:

trunk/rphp/runtime

Files:

• rphp_pvar.h (modified) (1 diff)
• rphp_types.h (modified) (2 diffs)
• test/pvarTestCase.cpp (modified) (4 diffs)

trunk/rphp/runtime/rphp_pvar.h

@@ -21 +21 @@
 #define RPHP_PVAR_H_
 
-#include "boost/variant.hpp"
-#include "boost/shared_ptr.hpp"
+#include <boost/logic/tribool.hpp>
+#include <boost/variant.hpp>
+#include <boost/shared_ptr.hpp>
 
-#include "unicode/unistr.h"
-#include "unicode/ustream.h" // ostream API for UnicodeString
+#include <unicode/unistr.h>
+#include <unicode/ustream.h> // ostream API for UnicodeString
 
 #include <iostream>
 
+BOOST_TRIBOOL_THIRD_STATE(pNull)
+
 namespace rphp {
 
-// this represents a php bool and null value
-// it is stored in the variant as an int type
-enum p3state
-{
-    Null,
-    False,
-    True
-};
+// a boost::tribool represents php true, false and null values
+typedef boost::logic::tribool p3state;
+
+// pNull is defined above
+#define pTrue rphp::p3state(true)
+#define pFalse rphp::p3state(false)
 
 // pvar numbers

trunk/rphp/runtime/rphp_types.h

@@ -33 +33 @@
 
     pvarType operator()(const p3state &h) const {
-        return (h == rphp::Null) ? PVAR_NULL : PVAR_BOOL;
+        return (pNull(h)) ? PVAR_NULL : PVAR_BOOL;
     }
 
@@ -77 +77 @@
 
     void operator()(const p3state &h) const {
-            (h == rphp::True) ? var = 1l : var = 0l;
+            (h) ? var = 1l : var = 0l;
     }
 

trunk/rphp/runtime/test/pvarTestCase.cpp

@@ -21 +21 @@
 
     int operator()(const rphp::p3state &i) const {
-        if (i == rphp::Null) {
+        if (pNull(i)) {
             std::cout << "i see a null" << std::endl;
         }
@@ -27 +27 @@
             std::cout << "i see a bool" << std::endl;
         }
-        return i;
+        return (i) ? 1 : 0;
     }
 
@@ -122 +122 @@
 
     // bool
-    u = rphp::True;
-
-    std::cout << u << std::endl;
-    result = boost::apply_visitor( my_visitor(), u );
-
-    if (rphp::pvar_getVal_bool(u) == rphp::True) {
+    u = pTrue;
+
+    std::cout << u << std::endl;
+    result = boost::apply_visitor( my_visitor(), u );
+
+    if (rphp::pvar_getVal_bool(u)) {
         std::cout << "the bool was true" << std::endl;
     }
+    else {
+        std::cout << "the bool was false" << std::endl;
+    }
+    
+    u = pFalse;
+
+    std::cout << u << std::endl;
+    result = boost::apply_visitor( my_visitor(), u );
+
+    if (rphp::pvar_getVal_bool(u)) {
+        std::cout << "the bool was true" << std::endl;
+    }
+    else {
+        std::cout << "the bool was false" << std::endl;
+    }
 
     // null
-    u = rphp::Null;
+    u = pNull;
 
     std::cout << u << std::endl;
@@ -161 +176 @@
         std::cout << "found a float" << std::endl;
         break;
+    case rphp::PVAR_NULL:
+        std::cout << "found a null" << std::endl;
+        break;
     default:
         std::cout << "woops, what type was it?" << std::endl;