Some changes to make map and list things work

runrevali · runrevali · commit 7c3d83177108 · 2014-10-24T14:43:18.000+01:00
diff --git a/libfoundation/include/foundation.h b/libfoundation/include/foundation.h
@@ -1369,6 +1369,7 @@ bool MCNameIsEmpty(MCNameRef name);
 // is *not* the same as MCValueIsEqualTo as it is a comparison up to case (of
 // the name's string) rather than exact.
 bool MCNameIsEqualTo(MCNameRef left, MCNameRef right);
+bool MCNameIsEqualTo(MCNameRef self, MCNameRef p_other_name, bool p_case_sensitive, bool p_form_sensitive);
 
 // The empty name object;
 extern MCNameRef kMCEmptyName;
@@ -2414,6 +2415,8 @@ bool MCProperListRemoveElement(MCProperListRef list, index_t p_start, index_t p_
 bool MCProperListFirstIndexOfElement(MCProperListRef list, MCValueRef p_needle, uindex_t p_after, uindex_t& r_offset);
 bool MCProperListFirstIndexOfList(MCProperListRef list, MCProperListRef p_needle, uindex_t p_after, uindex_t& r_offset);
 
+bool MCProperListIsEqualTo(MCProperListRef list, MCProperListRef p_other);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 enum MCPickleFieldType
diff --git a/libfoundation/src/foundation-array.cpp b/libfoundation/src/foundation-array.cpp
@@ -119,7 +119,7 @@ bool MCArrayCreateMutableWithOptions(MCArrayRef& r_array, bool p_case_sensitive,
     if (p_case_sensitive)
         r_array -> flags |= kMCArrayFlagIsCaseSensitive;
 
-    if (p_case_sensitive)
+    if (p_form_sensitive)
         r_array -> flags |= kMCArrayFlagIsFormSensitive;
     
 	return true;
@@ -847,9 +847,7 @@ static bool __MCArrayFindKeyValueSlot(__MCArray *self, bool p_case_sensitive, MC
 		}
 		else
 		{
-			if ((!p_case_sensitive &&
-				MCNameIsEqualTo(t_entry -> key, p_key)) ||
-				t_entry -> key == p_key)
+            if (MCNameIsEqualTo(t_entry -> key, p_key, p_case_sensitive, MCArrayIsFormSensitive(self)))
 			{
 				r_slot = t_probe;
 				return true;
diff --git a/libfoundation/src/foundation-name.cpp b/libfoundation/src/foundation-name.cpp
@@ -249,6 +249,21 @@ bool MCNameIsEqualTo(MCNameRef self, MCNameRef p_other_name)
 			self -> key == p_other_name -> key;
 }
 
+bool MCNameIsEqualTo(MCNameRef self, MCNameRef p_other_name, bool p_case_sensitive, bool p_form_sensitive)
+{
+    if (self == p_other_name)
+        return true;
+
+    if (p_case_sensitive && p_form_sensitive)
+        return false;
+    else if (!p_case_sensitive && !p_form_sensitive)
+        return self -> key == p_other_name -> key;
+    else if (p_case_sensitive)
+        return MCStringIsEqualTo(self -> string, p_other_name -> string, kMCStringOptionCompareNonliteral);
+    else
+        return MCStringIsEqualTo(self -> string, p_other_name -> string, kMCStringOptionCompareFolded);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void __MCNameDestroy(__MCName *self)
diff --git a/libfoundation/src/foundation-proper-list.cpp b/libfoundation/src/foundation-proper-list.cpp
@@ -498,6 +498,11 @@ bool MCProperListSort(MCProperListRef self, bool p_ascending, MCProperListSortTy
     return false;
 }
 
+bool MCProperListIsEqualTo(MCProperListRef self, MCProperListRef p_other)
+{
+    return __MCProperListIsEqualTo(self, p_other);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void __MCProperListDestroy(__MCProperList *self)
diff --git a/modular/library/src/module-map.cpp b/modular/library/src/module-map.cpp
@@ -23,12 +23,14 @@ static bool create_key_for_array(MCStringRef p_string, MCArrayRef p_target, MCNa
     
     bool t_success;
     t_success = true;
-    
+
+    /*
     if (MCArrayIsFormSensitive(p_target) && !MCStringIsNative(p_string))
     {
         t_success = MCStringCreateWithBytes((const byte_t *)MCStringGetCharPtr(p_string), MCStringGetLength(p_string) * 2, kMCStringEncodingNative, false, &t_key_string);
     }
     else
+     */
         t_key_string = p_string;
     
     
@@ -79,7 +81,7 @@ static bool is_not_among_the_elements_of(void *context, MCArrayRef p_target, MCN
 static bool list_array_keys(void *context, MCArrayRef p_target, MCNameRef p_key, MCValueRef p_value)
 {
     MCProperListRef t_list = (MCProperListRef)context;
-    return MCProperListPushElement(t_list, p_key);
+    return MCProperListPushElement(t_list, MCNameGetString(p_key));
 }
 
 static bool list_array_elements(void *context, MCArrayRef p_target, MCNameRef p_key, MCValueRef p_value)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ bool MCArrayCreateMutableWithOptions(MCArrayRef& r_array, bool p_case_sensitive,`
`119`	`119`	`if (p_case_sensitive)`
`120`	`120`	`r_array -> flags \|= kMCArrayFlagIsCaseSensitive;`
`121`	`121`
`122`		`- if (p_case_sensitive)`
	`122`	`+ if (p_form_sensitive)`
`123`	`123`	`r_array -> flags \|= kMCArrayFlagIsFormSensitive;`
`124`	`124`
`125`	`125`	`return true;`
`@@ -847,9 +847,7 @@ static bool __MCArrayFindKeyValueSlot(__MCArray *self, bool p_case_sensitive, MC`
`847`	`847`	`}`
`848`	`848`	`else`
`849`	`849`	`{`
`850`		`- if ((!p_case_sensitive &&`
`851`		`- MCNameIsEqualTo(t_entry -> key, p_key)) \|\|`
`852`		`- t_entry -> key == p_key)`
	`850`	`+ if (MCNameIsEqualTo(t_entry -> key, p_key, p_case_sensitive, MCArrayIsFormSensitive(self)))`
`853`	`851`	`{`
`854`	`852`	`r_slot = t_probe;`
`855`	`853`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,14 @@ static bool create_key_for_array(MCStringRef p_string, MCArrayRef p_target, MCNa`
`23`	`23`
`24`	`24`	`bool t_success;`
`25`	`25`	`t_success = true;`
`26`		`-`
	`26`	`+`
	`27`	`+ /*`
`27`	`28`	`if (MCArrayIsFormSensitive(p_target) && !MCStringIsNative(p_string))`
`28`	`29`	`{`
`29`	`30`	`t_success = MCStringCreateWithBytes((const byte_t )MCStringGetCharPtr(p_string), MCStringGetLength(p_string) 2, kMCStringEncodingNative, false, &t_key_string);`
`30`	`31`	`}`
`31`	`32`	`else`
	`33`	`+ */`
`32`	`34`	`t_key_string = p_string;`
`33`	`35`
`34`	`36`
`@@ -79,7 +81,7 @@ static bool is_not_among_the_elements_of(void *context, MCArrayRef p_target, MCN`
`79`	`81`	`static bool list_array_keys(void *context, MCArrayRef p_target, MCNameRef p_key, MCValueRef p_value)`
`80`	`82`	`{`
`81`	`83`	`MCProperListRef t_list = (MCProperListRef)context;`
`82`		`- return MCProperListPushElement(t_list, p_key);`
	`84`	`+ return MCProperListPushElement(t_list, MCNameGetString(p_key));`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`static bool list_array_elements(void *context, MCArrayRef p_target, MCNameRef p_key, MCValueRef p_value)`