[[ LCB StdLib ]] Allow undefined elements of arrays and lists

runrevali · runrevali · commit 8935432b894e · 2015-01-29T14:47:44.000Z
diff --git a/libscript/src/array.mlc b/libscript/src/array.mlc
@@ -25,17 +25,17 @@ public foreign handler MCArrayEvalElementsOf(in Target as array, out Value as li
 
 public foreign handler MCArrayEvalIsAmongTheKeysOfCaseless(in Needle as string, in IsNot as bool, in Target as array, out Result as bool) as undefined binds to "<builtin>"
 
-public foreign handler MCArrayEvalIsAmongTheElementsOf(in Needle as any, in IsNot as bool, in Target as array, out Result as bool) as undefined binds to "<builtin>"
+public foreign handler MCArrayEvalIsAmongTheElementsOf(in Needle as optional any, in IsNot as bool, in Target as array, out Result as bool) as undefined binds to "<builtin>"
 
 public foreign handler MCArrayEvalNumberOfElementsIn(in Target as array, out Count as index) as undefined binds to "<builtin>"
 
 // Case insensitive map access / storage
-public foreign handler MCArrayFetchElementOfCaseless(in Target as array, in Key as string, out Value as any) as undefined binds to "<builtin>"
-public foreign handler MCArrayStoreElementOfCaseless(in Value as any, inout Target as array, in Key as string) as undefined binds to "<builtin>"
+public foreign handler MCArrayFetchElementOfCaseless(in Target as array, in Key as string, out Value as optional any) as undefined binds to "<builtin>"
+public foreign handler MCArrayStoreElementOfCaseless(in Value as optional any, inout Target as array, in Key as string) as undefined binds to "<builtin>"
 
 public foreign handler MCArrayEvalEmpty(out Value as array) as undefined binds to "<builtin>"
 
-public foreign handler MCArrayRepeatForEachElement(inout Iterator as optional pointer, out Iterand as any, in Container as array) as bool binds to "<builtin>"
+public foreign handler MCArrayRepeatForEachElement(inout Iterator as optional pointer, out Iterand as optional any, in Container as array) as bool binds to "<builtin>"
 public foreign handler MCArrayRepeatForEachKey(inout Iterator as optional pointer, out Iterand as string, in Container as array) as bool binds to "<builtin>"
 
 public foreign handler MCArrayDeleteElementOfCaseless(inout Target as array, in Key as string) as undefined binds to "<builtin>"
diff --git a/libscript/src/list.mlc b/libscript/src/list.mlc
@@ -20,15 +20,15 @@ This library consists of the operations on lists included in the standard librar
 
 module com.livecode.list
 
-public foreign handler MCListEvalHeadOf(in Target as list, out Value as any) as undefined binds to "<builtin>"
-public foreign handler MCListEvalTailOf(in Target as list, out Value as any) as undefined binds to "<builtin>"
+public foreign handler MCListEvalHeadOf(in Target as list, out Value as optional any) as undefined binds to "<builtin>"
+public foreign handler MCListEvalTailOf(in Target as list, out Value as optional any) as undefined binds to "<builtin>"
 
-public foreign handler MCListExecPushSingleElementOnto(in Value as any, in IsFront as bool, inout Target as list) as undefined binds to "<builtin>"
-public foreign handler MCListExecPopElementInto(in IsFront as bool, inout Source as list, out Target as any) as undefined binds to "<builtin>"
+public foreign handler MCListExecPushSingleElementOnto(in Value as optional any, in IsFront as bool, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListExecPopElementInto(in IsFront as bool, inout Source as list, out Target as optional any) as undefined binds to "<builtin>"
 
 public foreign handler MCListEvalNumberOfElementsIn(in Target as list, out Count as index) as undefined binds to "<builtin>"
 
-public foreign handler MCListEvalIsAmongTheElementsOf(in Needle as any, in Target as list, out Result as bool) as undefined binds to "<builtin>"
+public foreign handler MCListEvalIsAmongTheElementsOf(in Needle as optional any, in Target as list, out Result as bool) as undefined binds to "<builtin>"
 public foreign handler MCListEvalContainsElements(in Target as list, in Needle as list, out Result as bool) as undefined binds to "<builtin>"
 
 public foreign handler MCListEvalBeginsWith(in Source as list, in Prefix as list, out Result as bool) as undefined binds to "<builtin>"
@@ -40,13 +40,13 @@ public foreign handler MCListEvalIsNotEqualTo(in Left as list, in Right as list,
 public foreign handler MCListFetchElementOf(in Index as int, in Target as list, out Value as any) as undefined binds to "<builtin>"
 public foreign handler MCListStoreElementOf(in Value as any, in Index as int, inout Target as list) as undefined binds to "<builtin>"
 public foreign handler MCListFetchElementRangeOf(in Start as int, in Finish as int, in Target as list, out Value as list) as undefined binds to "<builtin>"
-public foreign handler MCListStoreElementRangeOf(in Value as any, in Start as int, in Finish as int, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListStoreElementRangeOf(in Value as optional any, in Start as int, in Finish as int, inout Target as list) as undefined binds to "<builtin>"
 
-public foreign handler MCListFetchIndexOf(in Target as list, in Index as int, out Value as any) as undefined binds to "<builtin>"
-public foreign handler MCListStoreIndexOf(in Value as any, inout Target as list, in Index as int) as undefined binds to "<builtin>"
+public foreign handler MCListFetchIndexOf(in Target as list, in Index as int, out Value as optional any) as undefined binds to "<builtin>"
+public foreign handler MCListStoreIndexOf(in Value as optional any, inout Target as list, in Index as int) as undefined binds to "<builtin>"
 
-public foreign handler MCListStoreBeforeElementOf(in Value as any, in Index as int, inout Target as list) as undefined binds to "<builtin>"
-public foreign handler MCListStoreAfterElementOf(in Value as any, in Index as int, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListStoreBeforeElementOf(in Value as optional any, in Index as int, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListStoreAfterElementOf(in Value as optional any, in Index as int, inout Target as list) as undefined binds to "<builtin>"
 
 public foreign handler MCListSpliceIntoElementRangeOf(in Source as list, in Start as int, in Finish as int, inout Target as list) as undefined binds to "<builtin>"
 public foreign handler MCListSpliceIntoElementOf(in Source as list, in Index as int, inout Target as list) as undefined binds to "<builtin>"
@@ -58,13 +58,13 @@ public foreign handler MCListSpliceAfter(in Source as list, inout Target as list
 
 public foreign handler MCListEvalEmpty(out Value as list) as undefined binds to "<builtin>"
 
-public foreign handler MCListRepeatForEachElement(inout Iterator as optional pointer, out Iterand as any, in Container as list) as bool binds to "<builtin>"
+public foreign handler MCListRepeatForEachElement(inout Iterator as optional pointer, out Iterand as optional any, in Container as list) as bool binds to "<builtin>"
 
-public foreign handler MCListFetchFirstElementOf(in Target as list, out Value as any) as undefined binds to "<builtin>"
-public foreign handler MCListStoreFirstElementOf(in Value as any, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListFetchFirstElementOf(in Target as list, out Value as optional any) as undefined binds to "<builtin>"
+public foreign handler MCListStoreFirstElementOf(in Value as optional any, inout Target as list) as undefined binds to "<builtin>"
 
-public foreign handler MCListFetchLastElementOf(in Target as list, out Value as any) as undefined binds to "<builtin>"
-public foreign handler MCListStoreLastElementOf(in Value as any, inout Target as list) as undefined binds to "<builtin>"
+public foreign handler MCListFetchLastElementOf(in Target as list, out Value as optional any) as undefined binds to "<builtin>"
+public foreign handler MCListStoreLastElementOf(in Value as optional any, inout Target as list) as undefined binds to "<builtin>"
 
 public foreign handler MCListExecDeleteElementOf(in Index as index, inout Target as list) as undefined binds to "<builtin>"
 public foreign handler MCListExecDeleteElementRangeOf(in Start as index, in Finish as index, inout Target as list) as undefined binds to "<builtin>"
diff --git a/libscript/src/module-array.cpp b/libscript/src/module-array.cpp
@@ -83,7 +83,9 @@ extern "C" MC_DLLEXPORT void MCArrayEvalNumberOfElementsIn(MCArrayRef p_target,
 
 extern "C" MC_DLLEXPORT void MCArrayEvalIsAmongTheElementsOf(MCValueRef p_needle, bool p_is_not, MCArrayRef p_target, bool& r_output)
 {
-    r_output = !MCArrayApply(p_target, is_not_among_the_elements_of, p_needle);
+    MCValueRef t_value;
+    t_value = p_needle != nil ? p_needle : kMCNull;
+    r_output = !MCArrayApply(p_target, is_not_among_the_elements_of, t_value);
 }
 
 extern "C" MC_DLLEXPORT void MCArrayEvalIsAmongTheKeysOfCaseless(MCStringRef p_needle, bool p_is_not, MCArrayRef p_target, bool& r_output)
@@ -125,8 +127,11 @@ extern "C" MC_DLLEXPORT void MCArrayStoreElementOfCaseless(MCValueRef p_value, M
     MCAutoArrayRef t_array;
     MCArrayMutableCopy(x_target, &t_array);
     
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    
     if (!create_key_for_array(p_key, x_target, &t_key) ||
-        !MCArrayStoreValue(*t_array, MCArrayIsCaseSensitive(*t_array), *t_key, p_value))
+        !MCArrayStoreValue(*t_array, MCArrayIsCaseSensitive(*t_array), *t_key, t_value))
         return;
     
     MCAutoArrayRef t_new_array;
diff --git a/libscript/src/module-list.cpp b/libscript/src/module-list.cpp
@@ -33,15 +33,18 @@ extern "C" MC_DLLEXPORT void MCListExecPushSingleElementOnto(MCValueRef p_value,
     MCAutoProperListRef t_mutable_list;
     if (!MCProperListMutableCopy(x_target, &t_mutable_list))
         return;
+ 
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
     
     if (p_is_front)
     {
-        if (!MCProperListPushElementOntoFront(*t_mutable_list, p_value))
+        if (!MCProperListPushElementOntoFront(*t_mutable_list, t_value))
             return;
     }
     else
     {
-        if (!MCProperListPushElementOntoBack(*t_mutable_list, p_value))
+        if (!MCProperListPushElementOntoBack(*t_mutable_list, t_value))
             return;
     }
     
@@ -83,8 +86,11 @@ extern "C" MC_DLLEXPORT void MCListEvalNumberOfElementsIn(MCProperListRef p_targ
 
 extern "C" MC_DLLEXPORT void MCListEvalIsAmongTheElementsOf(MCValueRef p_needle, MCProperListRef p_target, bool& r_output)
 {
+    MCValueRef t_value;
+    t_value = p_needle != nil ? p_needle : kMCNull;
+    
     uindex_t t_dummy;
-    r_output = MCProperListFirstIndexOfElement(p_target, p_needle, 0, t_dummy);
+    r_output = MCProperListFirstIndexOfElement(p_target, t_value, 0, t_dummy);
 }
 
 extern "C" MC_DLLEXPORT void MCListEvalContainsElements(MCProperListRef p_target, MCProperListRef p_needle, bool& r_output)
@@ -122,8 +128,11 @@ extern "C" MC_DLLEXPORT void MCListStoreElementOf(MCValueRef p_value, index_t p_
     if (!MCProperListMutableCopy(x_target, &t_mutable_list))
         return;
     
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    
     MCProperListRemoveElements(*t_mutable_list, t_start, t_count);
-    MCProperListInsertElement(*t_mutable_list, p_value, t_start);
+    MCProperListInsertElement(*t_mutable_list, t_value, t_start);
     
     MCAutoProperListRef t_immutable;
     if (!MCProperListCopy(*t_mutable_list, &t_immutable))
@@ -161,8 +170,11 @@ extern "C" MC_DLLEXPORT void MCListStoreElementRangeOf(MCValueRef p_value, index
     if (!MCProperListMutableCopy(x_target, &t_mutable_list))
         return;
     
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    
     MCProperListRemoveElements(*t_mutable_list, t_start, t_count);
-    MCProperListInsertElement(*t_mutable_list, p_value, t_start);
+    MCProperListInsertElement(*t_mutable_list, t_value, t_start);
     
     MCAutoProperListRef t_immutable;
     if (!MCProperListCopy(*t_mutable_list, &t_immutable))
@@ -178,7 +190,9 @@ extern "C" MC_DLLEXPORT void MCListFetchIndexOf(MCProperListRef p_target, index_
 
 extern "C" MC_DLLEXPORT void MCListStoreIndexOf(MCValueRef p_value, MCProperListRef& x_target, index_t p_index)
 {
-    MCListStoreElementOf(p_value, p_index, x_target);
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    MCListStoreElementOf(t_value, p_index, x_target);
 }
 
 extern "C" MC_DLLEXPORT void MCListStoreAfterElementOf(MCValueRef p_value, index_t p_index, MCProperListRef& x_target)
@@ -198,7 +212,10 @@ extern "C" MC_DLLEXPORT void MCListStoreAfterElementOf(MCValueRef p_value, index
     if (!MCProperListMutableCopy(x_target, &t_mutable_list))
         return;
     
-    MCProperListInsertElement(*t_mutable_list, p_value, t_start);
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    
+    MCProperListInsertElement(*t_mutable_list, t_value, t_start);
     
     MCAutoProperListRef t_immutable;
     if (!MCProperListCopy(*t_mutable_list, &t_immutable))
@@ -222,7 +239,10 @@ extern "C" MC_DLLEXPORT void MCListStoreBeforeElementOf(MCValueRef p_value, inde
     if (!MCProperListMutableCopy(x_target, &t_mutable_list))
         return;
     
-    MCProperListInsertElement(*t_mutable_list, p_value, t_start);
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    
+    MCProperListInsertElement(*t_mutable_list, t_value, t_start);
     
     MCAutoProperListRef t_immutable;
     if (!MCProperListCopy(*t_mutable_list, &t_immutable))
@@ -238,7 +258,9 @@ extern "C" MC_DLLEXPORT void MCListFetchFirstElementOf(MCProperListRef p_target,
 
 extern "C" MC_DLLEXPORT void MCListStoreFirstElementOf(MCValueRef p_value, MCProperListRef& x_target)
 {
-    MCListStoreElementOf(p_value, 1, x_target);
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    MCListStoreElementOf(t_value, 1, x_target);
 }
 
 extern "C" MC_DLLEXPORT void MCListFetchLastElementOf(MCProperListRef p_target, MCValueRef& r_output)
@@ -248,7 +270,9 @@ extern "C" MC_DLLEXPORT void MCListFetchLastElementOf(MCProperListRef p_target,
 
 extern "C" MC_DLLEXPORT void MCListStoreLastElementOf(MCValueRef p_value, MCProperListRef& x_target)
 {
-    MCListStoreElementOf(p_value, -1, x_target);
+    MCValueRef t_value;
+    t_value = p_value != nil ? p_value : kMCNull;
+    MCListStoreElementOf(t_value, -1, x_target);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/toolchain/lc-compile/test.mlc b/toolchain/lc-compile/test.mlc
@@ -453,7 +453,13 @@ public handler testArray(inout xResults as list)
 	delete tTest["key"]
 	
 	testLog("Array", "DeleteElement", the number of elements in tTest is 0, xResults)
-
+	
+	variable tArrayWithUndefined as array
+	put the empty array into tArrayWithUndefined
+	put undefined into tArrayWithUndefined["a"]
+	variable tUndefined
+ 	put tArrayWithUndefined["a"] into tUndefined
+	testLog("Array", "UndefinedElement", tUndefined is not defined, xResults)
 end handler
 
 public handler testBitwise(inout xResults as list)
@@ -853,6 +859,13 @@ public handler testList(inout xResults as list)
 	delete the first element of tTest
 	testLog("List", "DeleteFirstElement", tTest[1] is 2, xResults)	
 
+	variable tListWithUndefined as list
+	put the empty list into tListWithUndefined
+	push undefined onto tListWithUndefined
+	variable tUndefined
+ 	put the head of tListWithUndefined into tUndefined
+	testLog("List", "UndefinedElement", tUndefined is not defined, xResults)
+	
 end handler
 
 public handler testSort(inout xResults as list)
