Merge pull request livecode#2396 from livecodesebastien/bugfix-15457

livecodesebastien · livecodesebastien · commit 255918531f7e · 2015-06-15T14:22:27.000+01:00
[[ Bug 15457 ]] &lt;repeat for each element&gt; should use numeric order fo…
diff --git a/docs/notes/bugfix-15457.md b/docs/notes/bugfix-15457.md
@@ -0,0 +1 @@
+# Repeat for each element subtly different in 7.0
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -385,6 +385,8 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
 	MCNameRef t_key;
 	MCValueRef t_value;
 	uintptr_t t_iterator;
+    // SN2015-06-15: [[ Bug 15457 ]] The index can be a negative index.
+    index_t t_sequenced_iterator;
     const byte_t *t_data_ptr, *t_data_end;
     Parse_stat ps;
     MCScriptPoint *sp = nil;
@@ -405,12 +407,12 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
             if (!ctxt . ConvertToArray(*t_condition, &t_array))
                 return;
             
-            // If this is a numerical array, do it in order
-            if (each == FU_ELEMENT && MCArrayIsSequence(*t_array))
+            // SN-2015-06-15: [[ Bug 15457 ]] If this is a numerical array, do
+            //  it in order - even if it does not start at 1
+            if (each == FU_ELEMENT && MCArrayIsNumericSequence(*t_array, t_sequenced_iterator))
             {
                 t_sequence_array = true;
-                t_iterator = 1;
-                if (!MCArrayFetchValueAtIndex(*t_array, t_iterator, t_value))
+                if (!MCArrayFetchValueAtIndex(*t_array, t_sequenced_iterator, t_value))
                     return;
             }
             else
@@ -513,9 +515,11 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
                 case FU_ELEMENT:
                 {
                     loopvar -> set(ctxt, t_value);
+                    // SN-2015-06-15: [[ Bug 15457 ]] Sequenced, numeric arrays
+                    //  have their own iterator
                     if (t_sequence_array)
                     {
-                        if (!MCArrayFetchValueAtIndex(*t_array, ++t_iterator, t_value))
+                        if (!MCArrayFetchValueAtIndex(*t_array, ++t_sequenced_iterator, t_value))
                             endnext = true;
                     }
                     else
diff --git a/engine/src/foundation-legacy.cpp b/engine/src/foundation-legacy.cpp
@@ -1178,6 +1178,14 @@ bool MCNameGetAsIndex(MCNameRef p_name, index_t& r_index)
     if (MCStringGetLength(t_key) != 1 && MCStringGetCodepointAtIndex(t_key, 0) == '0')
         return false;
     
+    // SN-2015-05-15: [[ Bug 15457 ]] Store the string-to-number conversion.
+    double t_double_index;
+    if (MCStringGetNumericValue(t_key, t_double_index))
+    {
+        r_index = (index_t)t_double_index;
+        return true;
+    }
+    
 	char *t_end;
 	index_t t_index;
     
@@ -1189,6 +1197,9 @@ bool MCNameGetAsIndex(MCNameRef p_name, index_t& r_index)
 	t_index = strtol(*t_cstring, &t_end, 10);
 	if (*t_end == '\0')
 	{
+        // SN-2015-06-15: [[ Bug 15457 ]] Store the converted value - improve
+        //  speed if repeating several times over the elements of a array.
+        MCStringSetNumericValue(t_key, t_index);
 		r_index = t_index;
 		return true;
 	}
@@ -1272,12 +1283,26 @@ static bool get_array_extent(void *context, MCArrayRef p_array, MCNameRef p_key,
 
 bool MCArrayIsSequence(MCArrayRef self)
 {
-	get_array_extent_context_t ctxt;
-	ctxt . minimum = INDEX_MAX;
-	ctxt . maximum = INDEX_MIN;
-	return MCArrayApply(self, get_array_extent, &ctxt) &&
-			ctxt . minimum == 1 &&
-			(ctxt . maximum - ctxt . minimum + 1) == MCArrayGetCount(self);
+    int32_t t_start_index;
+    
+    // IsSequence returns true if the sequence starts with 1 only
+    return MCArrayIsNumericSequence(self, t_start_index) && t_start_index == 1;
+}
+
+bool MCArrayIsNumericSequence(MCArrayRef self, int32_t &r_start_index)
+{
+    get_array_extent_context_t ctxt;
+    ctxt . minimum = INDEX_MAX;
+    ctxt . maximum = INDEX_MIN;
+    
+    if (MCArrayApply(self, get_array_extent, &ctxt) &&
+            (ctxt . maximum - ctxt . minimum + 1) == MCArrayGetCount(self))
+    {
+        r_start_index = ctxt . minimum;
+        return true;
+    }
+    
+    return false;
 }
 
 static bool list_keys(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)
diff --git a/engine/src/foundation-legacy.h b/engine/src/foundation-legacy.h
@@ -115,6 +115,10 @@ class MCObjectOutputStream;
 // with no holes).
 bool MCArrayIsSequence(MCArrayRef array);
 
+// SN-2015-06-15: [[ Bug 15457 ]] Returns true if the array a dense, numeric
+//  sequence - but does not have to start with 1.
+bool MCArrayIsNumericSequence(MCArrayRef self, index_t &r_start_index);
+
 // Constructs a string containing the list of all keys in the array separated by
 // the given delimiter.
 bool MCArrayListKeys(MCArrayRef array, char delimiter, MCStringRef& r_list);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Repeat for each element subtly different in 7.0`