added Value::subclassOf(), and implemented Php::is_a() and Php::is_subclass_of()

3 files changed, 38 insertions, 32 deletions

diff --git a/include/call.h b/include/call.h
index e1bb12d..dff815c 100644
--- a/include/call.h
+++ b/include/call.h
@@ -19,6 +19,13 @@ extern bool  class_exists(const char *classname, size_t size, bool autoload = tr
 inline bool  class_exists(const char *classname, bool autoload = true) { return class_exists(classname, strlen(classname), autoload); }
 inline bool  class_exists(const std::string &classname, bool autoload = true) { return class_exists(classname.c_str(), classname.size(), autoload); }
 extern Value eval(const std::string &phpCode);
+inline bool  is_a(const Value &obj, const char *classname, size_t size, bool allow_string = false) { return obj.instanceOf(classname, size, allow_string); }
+inline bool  is_a(const Value &obj, const char *classname, bool allow_string = false) { return is_a(obj, classname, strlen(classname), allow_string); }
+inline bool  is_a(const Value &obj, const std::string &classname, bool allow_string = false) { return is_a(obj, classname.c_str(), classname.size(), allow_string); }
+inline bool  is_subclass_of(const Value &obj, const char *classname, size_t size, bool allow_string = true) { return obj.subclassOf(classname, size, allow_string); }
+inline bool  is_subclass_of(const Value &obj, const char *classname, bool allow_string = true) { return is_subclass_of(obj, classname, strlen(classname), allow_string); }
+inline bool  is_subclass_of(const Value &obj, const std::string &classname, bool allow_string = true) { return is_subclass_of(obj, classname.c_str(), classname.size(), allow_string); }
+
 
 /**
  *  Call a function in PHP
diff --git a/include/fastcall.h b/include/fastcall.h
deleted file mode 100644
index 778a9b2..0000000
--- a/include/fastcall.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- *  fastcall.h
- *
- *  This file holds some PHP functions implementation in C directly.
- *
- */
-
-namespace Php {
-
-    inline bool is_a(const Value &obj, const std::string classname, bool allow_string = false) {
-        return obj.is(classname, allow_string);
-    }
-    inline bool is_subclass_of(const Value &obj, const std::string classname, bool allow_string = true) {
-        return obj.isSubClassOf(classname, allow_string);
-    }
-
-}
-
diff --git a/include/value.h b/include/value.h
index b3c288c..e6b8d69 100644
--- a/include/value.h
+++ b/include/value.h
@@ -964,29 +964,39 @@ public:
         // try casting it
         return dynamic_cast<T*>(base);
     }
-
+    
     /**
-     *  Checks if this object is of the class or has the class as one of its parents
-     *  @param classname
-     *  @param allow_string
+     *  Check whether this object is an instance of a certain class
+     * 
+     *  If you set the parameter 'allowString' to true, and the Value object
+     *  holds a string, the string will be treated as class name.
+     * 
+     *  @param  classname   The class of which this should be an instance
+     *  @param  size        Length of the classname string
+     *  @param  allowString Is it allowed for 'this' to be a string
      *  @return bool
      */
-    inline bool is(const std::string &classname, bool allow_string=false) const {
-        return isImpl(classname, allow_string, false);
-    }
+    bool instanceOf(const char *classname, size_t size, bool allowString = false) const;
+    bool instanceOf(const char *classname, bool allowString = false) const { return instanceOf(classname, strlen(classname), allowString); }
+    bool instanceOf(const std::string &classname, bool allowString = false) const { return instanceOf(classname.c_str(), classname.size(), allowString); }
 
     /**
-     *  Checks if this object has the class as one of its parents
-     *  @param classname
+     *  Check whether this object is derived from a certain class.
+     * 
+     *  If you set the parameter 'allowString' to true, and the Value object
+     *  holds a string, the string will be treated as class name.
+     * 
+     *  @param  classname   The class of which this should be an instance
+     *  @param  size        Length of the classname string
+     *  @param  allowString Is it allowed for 'this' to be a string
      *  @return bool
      */
-    inline bool isSubClassOf(const std::string &classname, bool allow_string=true) const {
-        return isImpl(classname, allow_string, true);
-    }
+    bool subclassOf(const char *classname, size_t size, bool allowString = false) const;
+    bool subclassOf(const char *classname, bool allowString = false) const { return subclassOf(classname, strlen(classname), allowString); }
+    bool subclassOf(const std::string &classname, bool allowString = false) const { return subclassOf(classname.c_str(), classname.size(), allowString); }
 
-private:
 
-    bool isImpl(const std::string &classname, bool allow_string, bool only_subclass) const;
+private:
     /**
      *  Call function with a number of parameters
      *  @param  argc        Number of parameters
@@ -1070,6 +1080,13 @@ protected:
     iterator createIterator(bool begin) const;
     
     /**
+     *  Retrieve the class entry
+     *  @param  allowString Allow the 'this' object to be a string
+     *  @return zend_class_entry
+     */
+    struct _zend_class_entry *classEntry(bool allowString = true) const;
+    
+    /**
      *  The Globals and Member classes can access the zval directly
      */
     friend class Globals;