Przeglądaj źródła

fix premature push

Alexander Kuzmenko 6 lat temu
rodzic
commit
a80058ca8a
2 zmienionych plików z 7 dodań i 5 usunięć
  1. 4 2
      std/php/NativeArray.hx
  2. 3 3
      std/php/NativeAssocArray.hx

+ 4 - 2
std/php/NativeArray.hx

@@ -21,6 +21,8 @@
  */
 package php;
 
+import haxe.extern.EitherType;
+
 using php.Global;
 
 /**
@@ -55,7 +57,7 @@ private class NativeArrayKeyValueIterator {
 	public inline function new(data:NativeArray) {
 		length = Global.count(data);
 		this.keys = Global.array_keys(data);
-		this.data = Global.array_values(data);
+		this.values = Global.array_values(data);
 	}
 
 	public inline function hasNext():Bool {
@@ -63,6 +65,6 @@ private class NativeArrayKeyValueIterator {
 	}
 
 	public inline function next():{key:EitherType<String,Int>, value:Dynamic} {
-		return {key:keys[current], value:data[current++]};
+		return {key:keys[current], value:values[current++]};
 	}
 }

+ 3 - 3
std/php/NativeAssocArray.hx

@@ -45,13 +45,13 @@ abstract NativeAssocArray<T>(NativeArray) from NativeArray to NativeArray {
 private class NativeAssocArrayKeyValueIterator<T> {
 	var length:Int;
 	var current:Int = 0;
-	var keys:NativeIndexedArray<T>;
+	var keys:NativeIndexedArray<String>;
 	var values:NativeIndexedArray<T>;
 
 	public inline function new(data:NativeIndexedArray<T>) {
 		length = Global.count(data);
 		this.keys = Global.array_keys(data);
-		this.data = Global.array_values(data);
+		this.values = cast Global.array_values(data);
 	}
 
 	public inline function hasNext():Bool {
@@ -59,6 +59,6 @@ private class NativeAssocArrayKeyValueIterator<T> {
 	}
 
 	public inline function next():{key:String, value:T} {
-		return {key:keys[current], value:data[current++]};
+		return {key:keys[current], value:values[current++]};
 	}
 }