Jelajahi Sumber

[std] DynamicAccess iterator() (#7892)

followup for #7769
Jens Fischer 6 tahun lalu
induk
melakukan
bc63451b61

+ 10 - 0
std/haxe/DynamicAccess.hx

@@ -21,6 +21,7 @@
  */
 package haxe;
 
+import haxe.iterators.DynamicAccessIterator;
 import haxe.iterators.DynamicAccessKeyValueIterator;
 
 /**
@@ -99,6 +100,15 @@ abstract DynamicAccess<T>(Dynamic<T>) from Dynamic<T> to Dynamic<T> {
 	**/
 	public inline function copy():DynamicAccess<T> return Reflect.copy(this);
 
+	/**
+		Returns an Iterator over the values of this `DynamicAccess`.
+
+		The order of values is undefined.
+	**/
+	public inline function iterator():DynamicAccessIterator<T> {
+		return new DynamicAccessIterator(this);
+	}	
+
 	/**
 		Returns an Iterator over the keys and values of this `DynamicAccess`.
 

+ 51 - 0
std/haxe/iterators/DynamicAccessIterator.hx

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C)2005-2019 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe.iterators;
+
+/**
+	This iterator can be used to iterate over the values of `haxe.DynamicAccess`.
+**/
+class DynamicAccessIterator<T> {
+	final access:DynamicAccess<T>;
+	final keys:Array<String>;
+	var index:Int;
+
+	public inline function new(access:DynamicAccess<T>) {
+		this.access = access;
+		this.keys = access.keys();
+		index = 0;
+	}
+
+	/**
+		See `Iterator.hasNext`
+	**/
+ 	public inline function hasNext():Bool {
+		return index < keys.length;
+	}
+
+	/**
+		See `Iterator.next`
+	**/
+ 	public inline function next():T {
+		return access[keys[index++]];
+	}
+}

+ 9 - 0
tests/unit/src/unitstd/haxe/DynamicAccess.unit.hx

@@ -42,6 +42,15 @@ map["a"] = 1;
 map["b"] = 2;
 map["c"] = 3;
 
+var values = [];
+for (value in map) {
+	values.push(value);
+}
+values.length == 3;
+values[0] in [1, 2, 3];
+values[1] in [1, 2, 3];
+values[2] in [1, 2, 3];
+
 var keys = [];
 var values = [];
 for (key => value in map) {