�Bugfix for using "tables with holes" in pairs() reverted. Better sol…

…ution found.
gamesys · Oct 29, 2014 · e69a84d · e69a84d
1 parent fc9ffee
commit e69a84d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/test/scripts/lib.lua b/test/scripts/lib.lua
@@ -244,6 +244,16 @@ assertTrue (r.string, 'pairs() should iterate over string keys')
 assertTrue (r.half, 'pairs() should iterate over non-integer numberic keys')
 
 
+t = { nil, nil, 123 }
+a = ''
+
+for i, v in pairs(t) do
+  a = a..i..':'..v..';'
+end
+
+assertTrue (a == '3:123;', 'pairs() should iterate over numeric table items')
+
+
 
 
 

diff --git a/vm/src/Table.js b/vm/src/Table.js
@@ -180,12 +180,7 @@
 
 			case 'number':
 				if (positiveIntegerKey) {
-					if (value === undefined) {
-						delete this.__shine.numValues[key];
-					} else {
-						this.__shine.numValues[key] = value;
-					}
-
+					this.__shine.numValues[key] = value;
 					break;
 				}
 

diff --git a/vm/src/lib.js b/vm/src/lib.js
@@ -340,6 +340,7 @@
 			var found = (index === undefined),
 				numValues = table.__shine.numValues,
 				keys,
+				key, value,
 				i, l;
 
 			if (found || (typeof index == 'number' && index > 0 && index == index >> 0)) {
@@ -355,8 +356,9 @@
 						found = true;
 					} 
 
-					if (found && (i = keys[i]) !== undefined && numValues[i] !== undefined) {
-						return [i >>= 0, numValues[i]];
+					if (found) {
+						while ((key = keys[i]) !== void 0 && (value = numValues[key]) === void 0) i++;
+						if (value !== void 0) return [i >>= 0, value];
 					}
 
 				} else {