update to 2.0.0

rename to php-pecl-ds2
run standard php test suite from extension sources
  instead of separate tests using phpunit
drop ZTS build

1 files changed, 82 insertions, 1012 deletions

diff --git a/REFLECTION b/REFLECTION
index 755545e..c37096c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,108 +1,40 @@
-Extension [ <persistent> extension #154 ds version 1.8.0 ] {
+Extension [ <persistent> extension #154 ds version 2.0.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
     Dependency [ spl (Required) ]
   }
 
-  - Classes [11] {
-    Interface [ <internal:ds> interface Ds\Hashable ] {
+  - Functions {
+    Function [ <internal:ds> function Ds\seq ] {
 
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [2] {
-        Method [ <internal:ds> abstract public method hash ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method equals ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $obj ]
-          }
-          - Return [ bool ]
-        }
+      - Parameters [1] {
+        Parameter #0 [ <optional> $values = <default> ]
       }
     }
+    Function [ <internal:ds> function Ds\map ] {
 
-    Interface [ <internal:ds> interface Ds\Collection extends IteratorAggregate, Traversable, Countable, JsonSerializable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
+      - Parameters [1] {
+        Parameter #0 [ <optional> $values = <default> ]
       }
+    }
+    Function [ <internal:ds> function Ds\set ] {
 
-      - Properties [0] {
+      - Parameters [1] {
+        Parameter #0 [ <optional> $values = <default> ]
       }
+    }
+    Function [ <internal:ds> function Ds\heap ] {
 
-      - Methods [7] {
-        Method [ <internal:ds> abstract public method clear ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Collection ]
-        }
-
-        Method [ <internal:ds> abstract public method isEmpty ] {
-
-          - Parameters [0] {
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds> abstract public method toArray ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:Core, inherits IteratorAggregate> abstract public method getIterator ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ Traversable ]
-        }
-
-        Method [ <internal:Core, inherits Countable> abstract public method count ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ int ]
-        }
-
-        Method [ <internal:json, inherits JsonSerializable> abstract public method jsonSerialize ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ mixed ]
-        }
+      - Parameters [2] {
+        Parameter #0 [ <optional> $values = <default> ]
+        Parameter #1 [ <optional> ?callable $comparator = <default> ]
       }
     }
+  }
 
-    Interface [ <internal:ds> interface Ds\Sequence extends Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate, ArrayAccess ] {
+  - Classes [6] {
+    Interface [ <internal:ds> interface Ds\Key ] {
 
       - Constants [0] {
       }
@@ -116,260 +48,26 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       - Properties [0] {
       }
 
-      - Methods [34] {
-        Method [ <internal:ds> abstract public method allocate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $capacity ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method capacity ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds> abstract public method contains ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds> abstract public method filter ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ?callable $callback = <default> ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds> abstract public method find ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $value ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method first ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method get ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $index ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method insert ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
-            Parameter #1 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method join ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> string $glue = <default> ]
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:ds> abstract public method last ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method map ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> callable $callback ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds> abstract public method merge ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $values ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds> abstract public method pop ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method push ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method reduce ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> callable $callback ]
-            Parameter #1 [ <optional> $initial = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method remove ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $index ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method reverse ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> abstract public method rotate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $rotations ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method set ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
-            Parameter #1 [ <required> $value ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method shift ] {
+      - Methods [2] {
+        Method [ <internal:ds> abstract public method hash ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds> abstract public method slice ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
-            Parameter #1 [ <optional> ?int $length = <default> ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds> abstract public method sort ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ?callable $comparator = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> abstract public method unshift ] {
+        Method [ <internal:ds> abstract public method equals ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds, inherits Ds\Collection> abstract public method clear ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, inherits Ds\Collection> abstract public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Collection ]
-        }
-
-        Method [ <internal:ds, inherits Ds\Collection> abstract public method isEmpty ] {
-
-          - Parameters [0] {
+            Parameter #0 [ <required> $other ]
           }
           - Return [ bool ]
         }
-
-        Method [ <internal:ds, inherits Ds\Collection> abstract public method toArray ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:Core, inherits IteratorAggregate> abstract public method getIterator ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ Traversable ]
-        }
-
-        Method [ <internal:Core, inherits Countable> abstract public method count ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ int ]
-        }
-
-        Method [ <internal:json, inherits JsonSerializable> abstract public method jsonSerialize ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:Core, inherits ArrayAccess> abstract public method offsetExists ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ bool ]
-        }
-
-        Method [ <internal:Core, inherits ArrayAccess> abstract public method offsetGet ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:Core, inherits ArrayAccess> abstract public method offsetSet ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> mixed $offset ]
-            Parameter #1 [ <required> mixed $value ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:Core, inherits ArrayAccess> abstract public method offsetUnset ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ void ]
-        }
       }
     }
 
-    Class [ <internal:ds> <iterateable> final class Ds\Vector implements Ds\Sequence, ArrayAccess, IteratorAggregate, Traversable, Countable, JsonSerializable, Ds\Collection ] {
+    Class [ <internal:ds> final readonly class Ds\Pair implements JsonSerializable ] {
 
-      - Constants [1] {
-        Constant [ public int MIN_CAPACITY ] { 8 }
+      - Constants [0] {
       }
 
       - Static properties [0] {
@@ -378,278 +76,20 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       - Static methods [0] {
       }
 
-      - Properties [0] {
+      - Properties [2] {
+        Property [ public protected(set) readonly mixed $key ]
+        Property [ public protected(set) readonly mixed $value ]
       }
 
-      - Methods [41] {
+      - Methods [5] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> $values = <default> ]
-          }
-        }
-
-        Method [ <internal:ds, prototype IteratorAggregate> public method getIterator ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Traversable ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method allocate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $capacity ]
-          }
-        }
-
-        Method [ <internal:ds> public method apply ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> callable $callback ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method capacity ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method contains ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method filter ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ?callable $callback = <default> ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method find ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $value ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method first ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method get ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $index ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method insert ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
-            Parameter #1 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method join ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> string $glue = <default> ]
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method last ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method map ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> callable $callback ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method merge ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $values ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetExists ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $offset ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetGet ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetSet ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> mixed $offset ]
-            Parameter #1 [ <required> mixed $value ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetUnset ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method pop ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method push ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method reduce ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> callable $callback ]
-            Parameter #1 [ <optional> $initial = <default> ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method remove ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $index ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method reverse ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> public method reversed ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method rotate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $rotations ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method set ] {
-
           - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
+            Parameter #0 [ <required> $key ]
             Parameter #1 [ <required> $value ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method shift ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method slice ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> int $index ]
-            Parameter #1 [ <optional> ?int $length = <default> ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method sort ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ?callable $comparator = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> public method sorted ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ?callable $comparator = <default> ]
-          }
-          - Return [ Ds\Sequence ]
-        }
-
-        Method [ <internal:ds> public method sum ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Sequence> public method unshift ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Collection ]
-        }
-
-        Method [ <internal:ds, prototype Countable> public method count ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
-
-          - Parameters [0] {
-          }
-          - Return [ bool ]
-        }
-
         Method [ <internal:ds, prototype JsonSerializable> public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -657,7 +97,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ mixed ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
+        Method [ <internal:ds> public method toArray ] {
 
           - Parameters [0] {
           }
@@ -680,7 +120,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       }
     }
 
-    Class [ <internal:ds> <iterateable> final class Ds\Deque implements Ds\Sequence, ArrayAccess, IteratorAggregate, Traversable, Countable, JsonSerializable, Ds\Collection ] {
+    Class [ <internal:ds> <iterateable> final class Ds\Seq implements IteratorAggregate, Traversable, Countable, JsonSerializable, ArrayAccess ] {
 
       - Constants [1] {
         Constant [ public int MIN_CAPACITY ] { 8 }
@@ -710,17 +150,16 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Traversable ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
+        Method [ <internal:ds> public method clear ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
+        Method [ <internal:ds> public method copy ] {
 
           - Parameters [0] {
           }
-          - Return [ Ds\Collection ]
         }
 
         Method [ <internal:ds, prototype Countable> public method count ] {
@@ -730,7 +169,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
+        Method [ <internal:ds> public method isEmpty ] {
 
           - Parameters [0] {
           }
@@ -744,7 +183,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ mixed ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
+        Method [ <internal:ds> public method toArray ] {
 
           - Parameters [0] {
           }
@@ -765,7 +204,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method allocate ] {
+        Method [ <internal:ds> public method allocate ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> int $capacity ]
@@ -779,14 +218,14 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method capacity ] {
+        Method [ <internal:ds> public method capacity ] {
 
           - Parameters [0] {
           }
           - Return [ int ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method contains ] {
+        Method [ <internal:ds> public method contains ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> ...$values ]
@@ -794,7 +233,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ bool ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method filter ] {
+        Method [ <internal:ds> public method filter ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> ?callable $callback = <default> ]
@@ -802,27 +241,27 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Ds\Sequence ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method find ] {
+        Method [ <internal:ds> public method find ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> $value ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method first ] {
+        Method [ <internal:ds> public method first ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method get ] {
+        Method [ <internal:ds> public method get ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> int $index ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method insert ] {
+        Method [ <internal:ds> public method insert ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> int $index ]
@@ -830,7 +269,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method join ] {
+        Method [ <internal:ds> public method join ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> string $glue = <default> ]
@@ -838,13 +277,13 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method last ] {
+        Method [ <internal:ds> public method last ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method map ] {
+        Method [ <internal:ds> public method map ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> callable $callback ]
@@ -852,7 +291,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Ds\Sequence ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method merge ] {
+        Method [ <internal:ds> public method merge ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> $values ]
@@ -893,20 +332,20 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ void ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method pop ] {
+        Method [ <internal:ds> public method pop ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method push ] {
+        Method [ <internal:ds> public method push ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> ...$values ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method reduce ] {
+        Method [ <internal:ds> public method reduce ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> callable $callback ]
@@ -914,14 +353,14 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method remove ] {
+        Method [ <internal:ds> public method remove ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> int $index ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method reverse ] {
+        Method [ <internal:ds> public method reverse ] {
 
           - Parameters [0] {
           }
@@ -934,14 +373,14 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Ds\Sequence ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method rotate ] {
+        Method [ <internal:ds> public method rotate ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> int $rotations ]
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method set ] {
+        Method [ <internal:ds> public method set ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> int $index ]
@@ -949,13 +388,13 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method shift ] {
+        Method [ <internal:ds> public method shift ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method slice ] {
+        Method [ <internal:ds> public method slice ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> int $index ]
@@ -964,7 +403,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Ds\Sequence ]
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method sort ] {
+        Method [ <internal:ds> public method sort ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> ?callable $comparator = <default> ]
@@ -985,321 +424,16 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Sequence> public method unshift ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-      }
-    }
-
-    Class [ <internal:ds> <iterateable> final class Ds\Stack implements Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate, ArrayAccess ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [19] {
-        Method [ <internal:ds, ctor> public method __construct ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> $values = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> public method allocate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $capacity ]
-          }
-        }
-
-        Method [ <internal:ds> public method capacity ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds> public method peek ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> public method pop ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> public method push ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> ...$values ]
-          }
-        }
-
-        Method [ <internal:ds, prototype IteratorAggregate> public method getIterator ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Traversable ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetExists ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $offset ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetGet ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetSet ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> mixed $offset ]
-            Parameter #1 [ <required> mixed $value ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetUnset ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Collection ]
-        }
-
-        Method [ <internal:ds, prototype Countable> public method count ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
-
-          - Parameters [0] {
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype JsonSerializable> public method jsonSerialize ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $data ]
-          }
-        }
-      }
-    }
-
-    Class [ <internal:ds> <iterateable> final class Ds\Queue implements Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate, ArrayAccess ] {
-
-      - Constants [1] {
-        Constant [ public int MIN_CAPACITY ] { 8 }
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [19] {
-        Method [ <internal:ds, ctor> public method __construct ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <optional> $values = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> public method allocate ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> int $capacity ]
-          }
-        }
-
-        Method [ <internal:ds> public method capacity ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds> public method peek ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> public method pop ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds> public method push ] {
+        Method [ <internal:ds> public method unshift ] {
 
           - Parameters [1] {
             Parameter #0 [ <optional> ...$values ]
           }
         }
-
-        Method [ <internal:ds, prototype IteratorAggregate> public method getIterator ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Traversable ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetExists ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $offset ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetGet ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetSet ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> mixed $offset ]
-            Parameter #1 [ <required> mixed $value ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype ArrayAccess> public method offsetUnset ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> mixed $offset ]
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Collection ]
-        }
-
-        Method [ <internal:ds, prototype Countable> public method count ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
-
-          - Parameters [0] {
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:ds, prototype JsonSerializable> public method jsonSerialize ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ mixed ]
-        }
-
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $data ]
-          }
-        }
       }
     }
 
-    Class [ <internal:ds> <iterateable> final class Ds\Map implements Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate, ArrayAccess ] {
+    Class [ <internal:ds> <iterateable> final class Ds\Map implements IteratorAggregate, Traversable, Countable, JsonSerializable, ArrayAccess ] {
 
       - Constants [1] {
         Constant [ public int MIN_CAPACITY ] { 8 }
@@ -1595,17 +729,16 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ void ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
+        Method [ <internal:ds> public method clear ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
+        Method [ <internal:ds> public method copy ] {
 
           - Parameters [0] {
           }
-          - Return [ Ds\Collection ]
         }
 
         Method [ <internal:ds, prototype Countable> public method count ] {
@@ -1615,7 +748,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
+        Method [ <internal:ds> public method isEmpty ] {
 
           - Parameters [0] {
           }
@@ -1629,7 +762,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ mixed ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
+        Method [ <internal:ds> public method toArray ] {
 
           - Parameters [0] {
           }
@@ -1652,7 +785,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       }
     }
 
-    Class [ <internal:ds> <iterateable> final class Ds\Set implements Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate, ArrayAccess ] {
+    Class [ <internal:ds> <iterateable> final class Ds\Set implements IteratorAggregate, Traversable, Countable, JsonSerializable, ArrayAccess ] {
 
       - Constants [1] {
         Constant [ public int MIN_CAPACITY ] { 8 }
@@ -1884,17 +1017,16 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ void ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
+        Method [ <internal:ds> public method clear ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
+        Method [ <internal:ds> public method copy ] {
 
           - Parameters [0] {
           }
-          - Return [ Ds\Collection ]
         }
 
         Method [ <internal:ds, prototype Countable> public method count ] {
@@ -1904,7 +1036,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
+        Method [ <internal:ds> public method isEmpty ] {
 
           - Parameters [0] {
           }
@@ -1918,7 +1050,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ mixed ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
+        Method [ <internal:ds> public method toArray ] {
 
           - Parameters [0] {
           }
@@ -1941,7 +1073,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       }
     }
 
-    Class [ <internal:ds> <iterateable> final class Ds\PriorityQueue implements Ds\Collection, JsonSerializable, Countable, Traversable, IteratorAggregate ] {
+    Class [ <internal:ds> <iterateable> final class Ds\Heap implements IteratorAggregate, Traversable, Countable, JsonSerializable ] {
 
       - Constants [1] {
         Constant [ public int MIN_CAPACITY ] { 8 }
@@ -1959,7 +1091,9 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
       - Methods [15] {
         Method [ <internal:ds, ctor> public method __construct ] {
 
-          - Parameters [0] {
+          - Parameters [2] {
+            Parameter #0 [ <optional> $values = <default> ]
+            Parameter #1 [ <optional> ?callable $comparator = <default> ]
           }
         }
 
@@ -1977,9 +1111,10 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal:ds> public method peek ] {
+        Method [ <internal:ds> public method push ] {
 
-          - Parameters [0] {
+          - Parameters [1] {
+            Parameter #0 [ <optional> ...$values ]
           }
         }
 
@@ -1989,11 +1124,9 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           }
         }
 
-        Method [ <internal:ds> public method push ] {
+        Method [ <internal:ds> public method peek ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <required> $value ]
-            Parameter #1 [ <required> $priority ]
+          - Parameters [0] {
           }
         }
 
@@ -2004,17 +1137,16 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ Traversable ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method clear ] {
+        Method [ <internal:ds> public method clear ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method copy ] {
+        Method [ <internal:ds> public method copy ] {
 
           - Parameters [0] {
           }
-          - Return [ Ds\Collection ]
         }
 
         Method [ <internal:ds, prototype Countable> public method count ] {
@@ -2024,7 +1156,7 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method isEmpty ] {
+        Method [ <internal:ds> public method isEmpty ] {
 
           - Parameters [0] {
           }
@@ -2038,68 +1170,6 @@ Extension [ <persistent> extension #154 ds version 1.8.0 ] {
           - Tentative return [ mixed ]
         }
 
-        Method [ <internal:ds, prototype Ds\Collection> public method toArray ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:ds> public method __unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $data ]
-          }
-        }
-      }
-    }
-
-    Class [ <internal:ds> final class Ds\Pair implements JsonSerializable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [2] {
-        Property [ public $key = NULL ]
-        Property [ public $value = NULL ]
-      }
-
-      - Methods [6] {
-        Method [ <internal:ds, ctor> public method __construct ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <optional> $key = <default> ]
-            Parameter #1 [ <optional> $value = <default> ]
-          }
-        }
-
-        Method [ <internal:ds> public method copy ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Ds\Pair ]
-        }
-
-        Method [ <internal:ds, prototype JsonSerializable> public method jsonSerialize ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ mixed ]
-        }
-
         Method [ <internal:ds> public method toArray ] {
 
           - Parameters [0] {