add more methods and fix some known issues

Author: guyingzhao

include/plist/Array.h

@@ -43,6 +43,8 @@ public :
     typedef std::vector<Node*>::const_iterator const_iterator;
 
     Node* operator[](unsigned int index);
+    Node *back();
+    Node *Back();
     iterator Begin();
     iterator begin();
     iterator End();
@@ -52,20 +54,18 @@ public :
     const_iterator End() const;
     const_iterator end() const;
     size_t size() const;
-    void Append(Node* node);
-    void Insert(Node* node, unsigned int pos);
+    void Append(const Node &node);
+    void Append(const Node* node);
+    void Insert(const Node &node, unsigned int pos);
+    void Insert(const Node* node, unsigned int pos);
     void Remove(Node* node);
     void Remove(unsigned int pos);
     unsigned int GetNodeIndex(Node* node) const;
-    template <typename T>
-    T* at(unsigned int index)
-    {
-        return (T*)(_array.at(index));
+    template <typename T> T *at(unsigned int index) {
+        return (T *)(_array.at(index));
     }
-    template <typename T>
-    T* At(unsigned int index)
-    {
-        return (T*)(_array.at(index));
+    template <typename T> T *At(unsigned int index) {
+        return (T *)(_array.at(index));
     }
 
 private :

include/plist/Data.h

@@ -36,6 +36,7 @@ public :
     Data(const Data& d);
     Data& operator=(const Data& b);
     Data(const std::vector<char>& buff);
+    Data(const char *bin, uint64_t size);
     virtual ~Data();
 
     Node* Clone() const;

include/plist/Dictionary.h

@@ -55,15 +55,13 @@ public :
     const_iterator end() const;
     size_t size() const;
     const_iterator Find(const std::string& key) const;
-    iterator Set(const std::string& key, const Node* node);
     iterator Set(const std::string& key, const Node& node);
+    iterator Set(const std::string& key, const Node* node);
     void Remove(Node* node);
     void Remove(const std::string& key);
     std::string GetNodeKey(Node* node);
-    template <typename T>
-    T* Get(const std::string& key)
-    {
-        return (T*)(_map[key]);
+    template <typename T> T *Get(const std::string &key) {
+        return (T *)(_map[key]);
     }
 
 private :

include/plist/Integer.h

@@ -36,6 +36,8 @@ public :
     Integer& operator=(const Integer& i);
     Integer(uint64_t i);
     Integer(int64_t i);
+    Integer(unsigned long i);
+    Integer(long i);
     virtual ~Integer();
 
     Node* Clone() const;

include/plist/String.h

@@ -34,8 +34,9 @@ public :
     String(Node* parent = NULL);
     String(plist_t node, Node* parent = NULL);
     String(const String& s);
+    String(const char *s);
     String& operator=(const String& s);
-    String& operator=(const char* s);
+    String &operator=(const char *s);
     String(const std::string& s);
     virtual ~String();
 

include/plist/Structure.h

@@ -43,7 +43,7 @@ public :
 
     static Structure* FromXml(const std::string& xml);
     static Structure* FromBin(const std::vector<char>& bin);
-    static Structure* FromBin(const char* bin, uint64_t size);
+    static Structure *FromBuffer(const char *bin, uint64_t size);
 
 protected:
     Structure(Node* parent = NULL);

src/Array.cpp

@@ -40,7 +40,9 @@ static void array_fill(Array *_this, std::vector<Node*> &array, plist_t node)
     do {
         subnode = NULL;
         plist_array_next_item(node, iter, &subnode);
-        array.push_back( Node::FromPlist(subnode, _this) );
+        if (subnode != NULL) {
+            array.push_back( Node::FromPlist(subnode, _this) );
+        }
     } while (subnode);
     free(iter);
 }
@@ -88,6 +90,16 @@ Node* Array::operator[](unsigned int array_index)
     return _array.at(array_index);
 }
 
+Node *Array::back()
+{
+    return _array.back();
+}
+
+Node *Array::Back()
+{
+    return _array.back();
+}
+
 Array::iterator Array::Begin()
 {
     return _array.begin();
@@ -132,7 +144,7 @@ size_t Array::size() const {
     return _array.size();
 }
 
-void Array::Append(Node* node)
+void Array::Append(const Node* node)
 {
     if (node)
     {
@@ -143,7 +155,15 @@ void Array::Append(Node* node)
     }
 }
 
-void Array::Insert(Node* node, unsigned int pos)
+void Array::Append(const Node &node)
+{
+    Node *clone = node.Clone();
+    UpdateNodeParent(clone);
+    plist_array_append_item(_node, clone->GetPlist());
+    _array.push_back(clone);
+}
+
+void Array::Insert(const Node* node, unsigned int pos)
 {
     if (node)
     {
@@ -156,6 +176,10 @@ void Array::Insert(Node* node, unsigned int pos)
     }
 }
 
+void Array::Insert(const Node &node, unsigned int pos)
+{
+    Insert(&node, pos);
+}
 void Array::Remove(Node* node)
 {
     if (node)

src/Data.cpp

@@ -50,6 +50,11 @@ Data::Data(const std::vector<char>& buff) : Node(PLIST_DATA)
     plist_set_data_val(_node, &buff[0], buff.size());
 }
 
+Data::Data(const char *bin, uint64_t size) : Node(PLIST_DATA)
+{
+    plist_set_data_val(_node, bin, size);
+}
+
 Data::~Data()
 {
 }

src/Integer.cpp

@@ -55,6 +55,16 @@ Integer::Integer(int64_t i) : Node(PLIST_INT)
     plist_set_int_val(_node, i);
 }
 
+Integer::Integer(unsigned long i) : Node(PLIST_INT)
+{
+    plist_set_uint_val(_node, i);
+}
+
+Integer::Integer(long i) : Node(PLIST_INT)
+{
+    plist_set_int_val(_node, i);
+}
+
 Integer::~Integer()
 {
 }

src/String.cpp

@@ -45,7 +45,7 @@ String& String::operator=(const PList::String& s)
     return *this;
 }
 
-String& String::operator=(const char* s)
+String &String::operator=(const char *s)
 {
     plist_free(_node);
     _node = plist_new_string(s);
@@ -57,6 +57,11 @@ String::String(const std::string& s) : Node(PLIST_STRING)
     plist_set_string_val(_node, s.c_str());
 }
 
+String::String(const char *s) : Node(PLIST_STRING)
+{
+    plist_set_string_val(_node, s);
+}
+
 String::~String()
 {
 }