[[ StdMlc ]] Implement repeat for each byte, add repeat for each examples

runrevali · runrevali · commit e885b8226798 · 2014-12-09T15:21:28.000Z
diff --git a/libscript/src/byte.mlc b/libscript/src/byte.mlc
@@ -25,6 +25,8 @@ public foreign handler StoreByteRangeOf(in Value as data, in Start as index, in
 public foreign handler StoreBeforeByteOf(in Value as data, in Index as index, inout Target as data) as undefined binds to "<builtin>"
 public foreign handler StoreAfterByteOf(in Value as data, in Index as index, inout Target as data) as undefined binds to "<builtin>"
 
+public foreign handler RepeatForEachByte(inout Iterator as optional pointer, out Iterand as data, in Container as data) as bool binds to "<builtin>"
+
 --
 
 /*
@@ -219,6 +221,12 @@ begin
 	StoreByteRangeOf(input, Start, Finish, Target)
 end syntax
 
+syntax RepeatForEachByte is iterator
+    "byte" <Iterand: Expression>
+begin
+    MCByteRepeatForEachByte(iterator, Iterand, container)
+end syntax
+
 --
 
 end module
diff --git a/libscript/src/char.mlc b/libscript/src/char.mlc
@@ -301,6 +301,27 @@ begin
     MCCharEvalNewlineCharacter(output)
 end syntax
 
+/*
+Summary:        Repeat over the elements of a list
+Iterand:        An expression of the form 'tVar in tList'
+
+Example:
+	variable tString as string
+	put "stressed" into tString
+	
+	variable tReversed as string
+	variable tChar as string
+	put "" into tReversed
+	repeat for each char tChar in tString
+		put tChar before tReversed
+	end repeat
+
+    // tReversed is "desserts"
+
+Description:
+The repeat for each form is more efficient that the alternative formation using repeat **tCount** times.
+*/
+
 syntax RepeatForEachChar is iterator
     "char" <Iterand: Expression>
 begin
diff --git a/libscript/src/list.mlc b/libscript/src/list.mlc
@@ -460,6 +460,28 @@ begin
 	MCListEvalEmpty(output)
 end syntax
 
+/*
+Summary:        Repeat over the elements of a list
+Iterand:        An expression of the form 'tVar in tList'
+
+Example:
+    variable tList as list
+    put [1, 1, 2, 3, 5, 8, 13] into tList
+
+    variable tRelist as list
+    variable tElement as any
+    put the empty list into tRelist
+
+    repeat for each element tElement in tList
+        push tElement onto tRelist
+    end repeat
+
+    // tRelist is the same as tList
+
+Description:
+The repeat for each form is more efficient that the alternative formation using repeat **tCount** times.
+*/
+
 syntax RepeatForEachElement is iterator
     "element" <Iterand: Expression>
 begin
diff --git a/libscript/src/module-byte.cpp b/libscript/src/module-byte.cpp
@@ -145,56 +145,20 @@ extern "C" void MCByteStoreByteOf(MCDataRef p_value, index_t p_index, MCDataRef&
     MCByteStoreByteRangeOf(p_value, p_index, p_index, x_target);
 }
 
-extern "C" void MCByteStoreAfterByteOf(MCDataRef p_value, index_t p_index, MCDataRef& x_target)
+extern "C" bool MCByteRepeatForEachByte(void*& x_iterator, MCDataRef& r_iterand, MCDataRef p_data)
 {
-    uindex_t t_start, t_count;
-    MCChunkGetExtentsOfByteChunkByExpression(x_target, p_index, t_start, t_count);
-    
-    if (t_count == 0)
-        return;
-    
-    if (t_start + t_count > MCDataGetLength(x_target))
-        return;
-    
-    t_start += t_count;
-    
-    MCAutoDataRef t_data;
-    if (!MCDataMutableCopy(x_target, &t_data))
-        return;
-    
-    if (!MCDataInsert(*t_data, t_start, p_value))
-        return;
-    
-    MCAutoDataRef t_new_data;
-    if (!MCDataCopy(*t_data, &t_new_data))
-        return;
-    
-    MCValueAssign(x_target, *t_new_data);
-}
-
-extern "C" void MCByteStoreBeforeByteOf(MCDataRef p_value, index_t p_index, MCDataRef& x_target)
-{
-    uindex_t t_start, t_count;
-    MCChunkGetExtentsOfByteChunkByRange(x_target, p_index, p_index, t_start, t_count);
-    
-    if (t_count == 0)
-        return;
-    
-    if (t_start + t_count > MCDataGetLength(x_target))
-        return;
+    uindex_t t_offset;
+    t_offset = (uindex_t)x_iterator;
     
-    MCAutoDataRef t_data;
-    if (!MCDataMutableCopy(x_target, &t_data))
-        return;
+    if (t_offset == MCDataGetLength(p_data))
+        return false;
     
-    if (!MCDataInsert(*t_data, t_start, p_value))
-        return;
+    if (!MCDataCopyRange(p_data, MCRangeMake(t_offset, 1), r_iterand))
+        return false;
     
-    MCAutoDataRef t_new_data;
-    if (!MCDataCopy(*t_data, &t_new_data))
-        return;
+    x_iterator = (void *)(t_offset + 1);
     
-    MCValueAssign(x_target, *t_new_data);
+    return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/libscript/src/module-char.cpp b/libscript/src/module-char.cpp
@@ -83,58 +83,6 @@ extern "C" void MCCharStoreCharOf(MCStringRef p_value, index_t p_index, MCString
     MCCharStoreCharRangeOf(p_value, p_index, p_index, x_target);
 }
 
-extern "C" void MCCharStoreAfterCharOf(MCStringRef p_value, index_t p_index, MCStringRef& x_target)
-{
-    uindex_t t_start, t_count;
-    MCChunkGetExtentsOfCodeunitChunkByRange(x_target, p_index, p_index, t_start, t_count);
-    
-    if (t_count == 0)
-        return;
-    
-    if (t_start + t_count > MCStringGetLength(x_target))
-        return;
-    
-    t_start += t_count;
-    
-    MCAutoStringRef t_string;
-    if (!MCStringMutableCopy(x_target, &t_string))
-        return;
-    
-    if (!MCStringInsert(*t_string, t_start, p_value))
-        return;
-    
-    MCAutoStringRef t_new_string;
-    if (!MCStringCopy(*t_string, &t_new_string))
-        return;
-    
-    MCValueAssign(x_target, *t_new_string);
-}
-
-extern "C" void MCCharStoreBeforeCharOf(MCStringRef p_value, index_t p_index, MCStringRef& x_target)
-{
-    uindex_t t_start, t_count;
-    MCChunkGetExtentsOfCodeunitChunkByRange(x_target, p_index, p_index, t_start, t_count);
-    
-    if (t_count == 0)
-        return;
-    
-    if (t_start + t_count > MCStringGetLength(x_target))
-        return;
-    
-    MCAutoStringRef t_string;
-    if (!MCStringMutableCopy(x_target, &t_string))
-        return;
-    
-    if (!MCStringInsert(*t_string, t_start, p_value))
-        return;
-    
-    MCAutoStringRef t_new_string;
-    if (!MCStringCopy(*t_string, &t_new_string))
-        return;
-    
-    MCValueAssign(x_target, *t_new_string);
-}
-
 extern "C" void MCCharEvalOffsetOfCharsInRange(bool p_is_last, MCStringRef p_needle, MCStringRef p_target, MCRange p_range, uindex_t& r_output)
 {
     uindex_t t_offset;
