repair bugs

ast/buffer.go

@@ -204,28 +204,6 @@ func (self *linkedPairs) Get(key string) (*Pair, int) {
     return nil, -1
 }
 
-func (self *linkedPairs) ToSlice(con []Pair) {
-    if len(con) < self.size {
-        return
-    }
-    i := self.size-1
-    a, b := i/_DEFAULT_NODE_CAP-1, i%_DEFAULT_NODE_CAP
-
-    if a < 0 {
-        copy(con, self.head[:b+1])
-        return
-    } else {
-        copy(con, self.head[:])
-        con = con[_DEFAULT_NODE_CAP:]
-    }
-
-    for i:=0; i<a; i++ {
-        copy(con, self.tail[i][:])
-        con = con[_DEFAULT_NODE_CAP:]
-    }
-    copy(con, self.tail[a][:b+1])
-}
-
 func (self *linkedPairs) ToMap(con map[string]Node) {
     for i:=0; i<self.size; i++ {
         n := self.At(i)

ast/node.go

@@ -1396,9 +1396,11 @@ func (self *Node) toGenericArrayUseNode() ([]Node, error) {
         return []Node{}, nil
     }
 
-    var s = (*linkedNodes)(self.p)
     var out = make([]Node, nb)
-    s.ToSlice(out)
+    it := self.values()
+    for v := it.next(); v != nil; v = it.next() {
+        out = append(out, *v)
+    }
 
     return out, nil
 }
@@ -1460,6 +1462,22 @@ func (self *Node) toGenericObjectUseNode() (map[string]Node, error) {
     return out, nil
 }
 
+func (self *Node) toGenericObjectUsePair() ([]Pair, error) {
+    var nb = self.len()
+    if nb == 0 {
+        return []Pair{}, nil
+    }
+
+    var out = make([]Pair, 0, nb)
+    it := self.properties()
+    for v := it.next(); v != nil; v = it.next() {
+        out = append(out, *v)
+    }
+
+    /* all done */
+    return out, nil
+}
+
 /**------------------------------------ Factory Methods ------------------------------------**/
 
 var (