Explicit cmp function

Author: mlazdans

lib/RangeDB.php

@@ -66,15 +66,15 @@ function save(string $file) {
 	// 	});
 	// }
 
-	function sort($mode = "Start") {
-		usort($this->ranges, ["Range", "cmp$mode"]);
+	function sort(string $cmpFunction) {
+		usort($this->ranges, ["Range", $cmpFunction]);
 	}
 
-	function equals($compact = true) {
+	function equals() {
 		$deleted = 0;
 		$i = $this->recCount;
 
-		$this->sort("Start");
+		$this->sort("cmpStart");
 		for($r = 0; $r < $i - 1; $r++) {
 			if(!isset($this->ranges[$r]))
 				continue;
@@ -110,18 +110,15 @@ function equals($compact = true) {
 			}
 		}
 
-		// if($compact)
-		// 	$this->compact();
-
 		return $deleted;
 	}
 
 	# TODO: remove?
-	function overlapopen($compact = true) {
+	function overlapopen() {
 		$deleted = 0;
 		$i = $this->recCount;
 
-		$this->sort("Start");
+		$this->sort("cmpStart");
 		for($r = 0; $r < $i - 1; $r++) {
 			if(!isset($this->ranges[$r]))
 				continue;
@@ -144,18 +141,15 @@ function overlapopen($compact = true) {
 			}
 		}
 
-		// if($compact)
-		// 	$this->compact();
-
 		return $deleted;
 	}
 
-	function overlap($compact = true) {
+	function overlap() {
 		$deleted = 0;
 
 		$i = $this->recCount;
 
-		$this->sort("Start");
+		$this->sort("cmpStart");
 		for($r = 0; $r < $i - 1; $r++) {
 			if(!isset($this->ranges[$r]))
 				continue;
@@ -176,9 +170,6 @@ function overlap($compact = true) {
 			}
 		}
 
-		// if($compact)
-		// 	$this->compact();
-
 		return $deleted;
 	}
 }

step3-combine-all.php

@@ -59,7 +59,7 @@ function usage(){
 print "DONE\n";
 
 print "Sorting...";
-$db->sort();
+$db->sort("cmpStart");
 print "DONE\n";
 
 print "Saving $COMBINED...";

tests/tree1.phpt

@@ -24,7 +24,7 @@ $db->addRecord(new CountryRange('LV', 5,6));
 $db->addRecord(new CountryRange('LV', 6,6));
 $db->addRecord(new CountryRange('LV', 7,8));
 
-$db->sort();
+$db->sort("cmpStart");
 $data = $db->getRanges();
 
 $root = build_tree($data, 0, count($data) - 1);