update cpp class

Author: phpzc

CListNode.cc

@@ -18,25 +18,19 @@ CListNode::CListNode()
 
 CListNode::~CListNode()
 {
-    cout << "CListNode Destory" << endl;
 
     if (this->head != nullptr){
         list_node *current = this->head;
         list_node *pNext = head->next;
 
         while (current != nullptr)
         {
-
-            cout << "CListNode Destory -- node->" << Z_STRVAL_P(current->value) << endl;
-            //zval_dtor(current->value);
             efree(current);
             current = nullptr;
             if (pNext){
                 current = pNext;
                 pNext = current->next;
             }
-
-            cout << "CListNode Destory -- while" << endl;
         }
 
     }
@@ -64,8 +58,8 @@ int CListNode::add_value(zval* val) {
     zval *new_val;
     MAKE_STD_ZVAL(new_val);
     *new_val = *val;
-    zval_copy_ctor(new_val);
-    convert_to_string(new_val);//转成string
+    zval_copy_ctor(new_val);//如果是非标量 添加引用计数 
+    //convert_to_string(new_val);//转成string
 
     node->value = new_val;
     node->next = nullptr;
@@ -82,7 +76,7 @@ int CListNode::add_value(zval* val) {
     }
 
     this->size = this->size + 1;
-    cout << "CListNode Add" << endl;
+
     return 0;
 }
 
@@ -107,3 +101,53 @@ zval* CListNode::fetch_index(int index) {
     }
 
 }
+
+int CListNode::del_value(int index)
+{
+    if (index <= 0 || index > this->size)
+    {
+        return -1;
+    }
+
+    list_node* pCurrent = head;
+    list_node* tmp = nullptr;
+
+    if (pCurrent != nullptr){
+        int i = 1;
+        if (i == index){
+
+            head = head->next;
+            head->prev = nullptr;
+            efree(pCurrent);
+            --this->size;
+            return 0;
+        }
+        else{
+            while (pCurrent != nullptr){
+                ++i;
+                tmp = pCurrent;
+                pCurrent = pCurrent->next;
+                if (i == index && pCurrent != nullptr){
+                    tmp->next = pCurrent->next;
+                    if (pCurrent->next != nullptr){
+                        pCurrent->next->prev = tmp;
+                    }
+                    else{
+                        tail = tmp;
+                    }
+                    zval_dtor(pCurrent->value);
+                    efree(pCurrent);
+                    --this->size;
+                    return 0;
+                }
+                
+            }
+
+            return -1;
+        }
+
+    }
+    else{
+        return -1;
+    }
+}

CListNode.h

@@ -15,7 +15,7 @@ class CListNode {
     static CListNode* create();
 
     int add_value(zval *val);
-
+	int del_value(int index);
     zval* fetch_index(int index);
 
     int get_length() const;

ListNode.cc

@@ -104,7 +104,6 @@ PHP_METHOD(ListNode,__construct)
     zend_update_property_string(listnode_ce,thisptr,"p1",strlen("p1"),"bbb" TSRMLS_CC);
     zend_declare_class_constant_string(listnode_ce,"AAA",strlen("AAA"),"bbb" TSRMLS_CC);
 
-  php_printf("---CListNode -- %d\n", ln);
 }
 
 
@@ -116,7 +115,7 @@ PHP_METHOD(ListNode, add_value)
   zval* thisptr = getThis();
   ListNode_object* ln_obj = (ListNode_object*)zend_object_store_get_object(thisptr TSRMLS_CC);
   CListNode *cListNode = ln_obj->listnode;
-  php_printf("---CListNode -- %d\n", cListNode);
+  
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &value) == FAILURE)
   {
     WRONG_PARAM_COUNT;
@@ -128,16 +127,11 @@ PHP_METHOD(ListNode, add_value)
       return;
     }
 
-    if (IS_LONG == Z_TYPE(*value)){
-      php_printf("pre -  %d\n", Z_LVAL_P(value));
-    }
-
-    php_printf("ret %d\n", ret);
     RETURN_LONG(ret);
 
   }
   else{
-    php_printf("nullptr %d\n", value);
+    php_error(E_ERROR,"cpp obj is nullptr\n");
   }
 
 }
@@ -160,11 +154,33 @@ PHP_METHOD(ListNode, fetch_index)
   }
 
 }
+
+PHP_METHOD(ListNode, del_value)
+{
+  long index;
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == FAILURE)
+  {
+    WRONG_PARAM_COUNT;
+  }
+  zval* thisptr = getThis();
+  ListNode_object* ln_obj = (ListNode_object*)zend_object_store_get_object(thisptr TSRMLS_CC);
+  CListNode *cListNode = ln_obj->listnode;
+  int ret = cListNode->del_value(index);
+
+  if (ret == 0){
+    RETURN_BOOL(1);
+  }
+  else{
+    RETURN_BOOL(0);
+  }
+}
+
 static zend_function_entry listnode_methods[]=
 {
     ZEND_ME(ListNode,__construct,NULL,ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
   ZEND_ME(ListNode, add_value, NULL, ZEND_ACC_PUBLIC)
   ZEND_ME(ListNode, fetch_index, NULL, ZEND_ACC_PUBLIC)
+  ZEND_ME(ListNode, del_value, NULL, ZEND_ACC_PUBLIC)
   {NULL,NULL,NULL}  
 };
 
@@ -173,7 +189,7 @@ static zend_function_entry listnode_methods[]=
 
 void free_listnode_object(void* obj TSRMLS_DC)
 {
-  php_printf("free -- CListNode Destory\n");
+    //php_printf("free -- CListNode Destory\n");
 
     ListNode_object* listnode_obj = (ListNode_object*)obj;
     delete listnode_obj->listnode;