fixed compiling in ZTS environments (reported in issue #57)

2 files changed, 9 insertions, 79 deletions

diff --git a/include/opcodes.h b/include/opcodes.h
deleted file mode 100644
index 5a40d05..0000000
--- a/include/opcodes.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- *  Opcodes.h
- *
- *  Class represents a set of opcodes of a PHP script that can be executed. This
- *  is an internal file that you normally do not have to instantiate yourself.
- *  Better use the Php::Script of Php::File classes.
- *
- *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
- *  @copyright 2014 Copernica BV
- */
-
-/**
- *  Forward declarations
- */
-struct _zend_op_array;
-
-/**
- *  Namespace
- */
-namespace Php {
-
-/**
- *  Class definition
- */
-class Opcodes
-{
-public:
-    /**
-     *  Constructor
-     *  @param  opcodes
-     */
-    Opcodes(struct _zend_op_array *opcodes) : _opcodes(opcodes) 
-    {
-        // no other initialisation is necessary
-    }
-    
-    /**
-     *  Destructor
-     */
-    virtual ~Opcodes();
-    
-    /**
-     *  Are the opcodes valid?
-     *  @return bool
-     */
-    bool valid() const
-    {
-        return _opcodes != nullptr;
-    }
-    
-    /**
-     *  Execute the opcodes
-     *  @return Value
-     */
-    Value execute() const;
-    
-private:
-    /**
-     *  The opcodes
-     *  @var zend_op_array
-     */
-    struct _zend_op_array *_opcodes;
-};
-    
-/**
- *  End of namespace
- */
-}
-
diff --git a/include/script.h b/include/script.h
index a9c2921..af68a59 100644
--- a/include/script.h
+++ b/include/script.h
@@ -21,6 +21,11 @@ struct _zend_op_array;
 namespace Php {
 
 /**
+ *  Forward declarations
+ */
+class Opcodes;
+
+/**
  *  Class definition
  */
 class Script
@@ -62,33 +67,27 @@ public:
     /**
      *  Destructor
      */
-    virtual ~Script() {}
+    virtual ~Script();
     
     /**
      *  Is the script a valid PHP script without syntax errors?
      *  @return bool
      */
-    bool valid() const
-    {
-        return _opcodes.valid();
-    }
+    bool valid() const;
     
     /**
      *  Execute the script
      *  The return value of the script is returned
      *  @return Value
      */
-    Value execute() const
-    {
-        return _opcodes.execute();
-    }
+    Value execute() const;
     
 private:
     /**
      *  The opcodes
      *  @var Opcodes
      */
-    Opcodes _opcodes;
+    Opcodes *_opcodes;
     
     /**
      *  Helper function to compile the source code