Changeset 571

Timestamp:

06/25/08 12:20:23 (5 months ago)

Author:

weyrick

Message:

playing with an add operator

Files:

• trunk/rphp/runtime/var-test.cpp (modified) (3 diffs)

trunk/rphp/runtime/var-test.cpp

@@ -29 +29 @@
-    return os << "php_hash" << std::endl;
-}
-
-
-// using the c++ bool as a type seems to cause problems, so we implement php bool
@@ -162 +161 @@
-
-
+// non destructive cast (makes a copy)
+pvar pvar_cast_to_number(const pvar p) {
+
+    pvar r = p;
+    boost::apply_visitor( convert_to_num_visitor(r), r );
+    return r;
+    
+}
+
+
+// define operators for working with pvars
+// php hashes would concat, otherwise convert to number
+pvar pvar_add (const pvar lhs, const pvar rhs)
+{
+    pvar l,r,result;
+
+    int lhs_type = boost::apply_visitor( type_checker(), lhs );
+    int rhs_type = boost::apply_visitor( type_checker(), rhs );
+    if ( (lhs_type == PVAR_HASH) && (rhs_type == PVAR_HASH) ) {
+        std::cout << "fixme: concat hashes" << std::endl;
+        result = 0l;
+    }
+    else {
+        // convert to number, then add
+        l = pvar_cast_to_number(lhs);
+        std::cout << "pvar_add: l is " << l << std::endl;
+        r = pvar_cast_to_number(rhs);
+        std::cout << "pvar_add: r is " << r << std::endl;
+        result = boost::get<long>(l) + boost::get<long>(r);
+        std::cout << "pvar_add: result is " << result << std::endl;
+    }
+
+    return result;
+}
+
-// driver
-int main()
-{
-
+,t,r
-
-    // string
@@ -236 +270 @@
-    std::cout << "final: " << u << std::endl;
-
-
+
+
+
+
+
+
+
+
+
+
+