Update DivideAtChar to use exact comparison where possible; update any string comparisons with empty to use MCStringIsEmpty

runrevali · runrevali · commit f8d3a5c57a02 · 2014-04-07T13:59:29.000+01:00
diff --git a/engine/src/bitmapeffect.cpp b/engine/src/bitmapeffect.cpp
@@ -710,7 +710,7 @@ bool MCBitmapEffectsGetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
     
     // If 'p_index' is the empty name, this is a whole array op.
     bool t_is_array;
-    t_is_array = MCNameIsEqualTo(p_index, kMCEmptyName, kMCCompareCaseless);
+    t_is_array = MCNameIsEmpty(p_index);
     
 	// Now fetch the bitmap effect we are processing - note that if this is
 	// NULL it means it isn't set. In this case we still carry on since we
@@ -952,7 +952,7 @@ bool MCBitmapEffectsSetProperty(MCExecContext& ctxt, MCBitmapEffectsRef& self, M
     
     // If 'p_index' is the empty name, this is a whole array op.
     bool t_is_array;
-    t_is_array = MCNameIsEqualTo(p_index, kMCEmptyName, kMCCompareCaseless);
+    t_is_array = MCNameIsEmpty(p_index);
 
     if (t_is_array && p_value . type == kMCExecValueTypeValueRef && MCValueIsEmpty(p_value . valueref_value))
     {
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -2878,6 +2878,10 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)
 							t_delimiter++;
 							MCStringCopySubstring(*t_position_data, MCRangeMake(t_delimiter, MCStringGetLength(*t_position_data) - t_delimiter), &t_alignment);
 						}
+                        // AL-2014-04-07: [[ Bug 12138 ]] 'drawer ... at <position>' codepath resulted in t_position uninitialised
+                        else
+                            t_position = *t_position_data;
+                        
 						if (MCStringIsEqualToCString(*t_position, "right", kMCCompareCaseless))
 							t_pos = WP_PARENTRIGHT;
 						else if (MCStringIsEqualToCString(*t_position, "left", kMCCompareCaseless))
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -527,7 +527,7 @@ void MCB_parsebreaks(MCExecContext& ctxt, MCStringRef p_input)
 			MCAutoStringRef t_info;
 
 			if (t_success)
-				t_success = MCStringDivideAtChar(*t_tail, ',', kMCCompareCaseless, &t_line_string, &t_info);
+				t_success = MCStringDivideAtChar(*t_tail, ',', kMCCompareExact, &t_line_string, &t_info);
 			
 			int32_t t_line;
 
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -469,7 +469,7 @@ Boolean MCDispatch::openenv(MCStringRef sname, MCStringRef env,
 	{
 		MCAutoStringRef t_env_path;
 		MCStringRef t_next_rest_of_env;
-		/* UNCHECKED */ MCStringDivideAtChar(t_rest_of_env, ENV_SEPARATOR, kMCStringOptionCompareCaseless, &t_env_path, t_next_rest_of_env);
+		/* UNCHECKED */ MCStringDivideAtChar(t_rest_of_env, ENV_SEPARATOR, kMCStringOptionCompareExact, &t_env_path, t_next_rest_of_env);
 		if (attempt_to_loadfile(stream, outpath, "%@/%@", *t_env_path, sname))
 			t_found = true;
 
diff --git a/engine/src/exec-interface-object.cpp b/engine/src/exec-interface-object.cpp
@@ -3976,7 +3976,7 @@ void MCObject::GetCustomPropertiesElement(MCExecContext& ctxt, MCNameRef p_index
 void MCObject::SetCustomKeysElement(MCExecContext& ctxt, MCNameRef p_index, MCStringRef p_string)
 {
     MCObjectPropertySet *t_propset;
-    if (MCStringIsEqualTo(p_string, kMCEmptyString, kMCCompareCaseless))
+    if (MCStringIsEmpty(p_string))
     {
         if (findpropset(p_index, true, t_propset))
             t_propset -> clear();
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -2387,7 +2387,7 @@ void MCInterfaceExecSelectTextOfButton(MCExecContext& ctxt, Preposition_type p_t
 	if (t_success)
 	{
 		uindex_t t_lines;
-		t_lines = MCStringCountChar(*t_text, MCRangeMake(0, p_target . mark . start), '\n', kMCStringOptionCompareCaseless);
+		t_lines = MCStringCountChar(*t_text, MCRangeMake(0, p_target . mark . start), '\n', kMCStringOptionCompareExact);
 		
 		static_cast<MCButton *>(p_target . object) -> setmenuhistory(t_lines + 1);
 	}
diff --git a/engine/src/exec-network.cpp b/engine/src/exec-network.cpp
@@ -697,7 +697,7 @@ void MCNetworkSetFtpProxy(MCExecContext& ctxt, MCStringRef p_value)
 {
 	
 	MCAutoStringRef t_host, t_port;
-	/* UNCHECKED */ MCStringDivideAtChar(p_value, ':', kMCCompareCaseless, &t_host, &t_port);
+	/* UNCHECKED */ MCStringDivideAtChar(p_value, ':', kMCCompareExact, &t_host, &t_port);
 	if (*t_port != nil)
 		/* UNCHECKED */ MCStringToUInt16(*t_port, MCftpproxyport);
 	else
diff --git a/engine/src/exec-printing.cpp b/engine/src/exec-printing.cpp
@@ -144,7 +144,7 @@ static void MCPrintingPrintDeviceOutputParse(MCExecContext& ctxt, MCStringRef p_
 	}
 	
 	MCAutoStringRef t_head, t_tail;
-	if (MCStringDivideAtChar(p_input, ':', kMCCompareCaseless, &t_head, &t_tail))
+	if (MCStringDivideAtChar(p_input, ':', kMCCompareExact, &t_head, &t_tail))
 	{
 		if (MCStringIsEqualToCString(*t_head, "file", kMCCompareCaseless))
 		{
@@ -213,7 +213,7 @@ struct MCPrintingPrinterPageRange
 static void MCPrintingPrinterPageRangeParse(MCExecContext& ctxt, MCStringRef p_input, MCPrintingPrinterPageRange& r_output)
 {
 	if (MCStringIsEqualToCString(p_input, "all", kMCCompareCaseless) ||
-		MCStringIsEqualToCString(p_input, "", kMCCompareCaseless))
+		MCStringIsEmpty(p_input))
 	{
 		r_output . count = PRINTER_PAGE_RANGE_ALL;
 		r_output . ranges = nil;
diff --git a/engine/src/mblandroidbrowser.cpp b/engine/src/mblandroidbrowser.cpp
@@ -560,7 +560,7 @@ JNIEXPORT void JNICALL Java_com_runrev_android_nativecontrol_BrowserControl_doJS
     char *t_tag = nil;
     MCJavaStringToNative(MCJavaGetThreadEnv(), tag, t_tag);
 	
-    if (t_tag == nil || MCStringIsEqualTo(MCAndroidBrowserControl::s_js_tag, kMCEmptyString, kMCCompareExact) || !MCStringIsEqualToCString(MCAndroidBrowserControl::s_js_tag, t_tag, kMCCompareExact))
+    if (t_tag == nil || MCStringIsEmpty(MCAndroidBrowserControl::s_js_tag) || !MCStringIsEqualToCString(MCAndroidBrowserControl::s_js_tag, t_tag, kMCCompareExact))
         t_match = false;
     
     if (t_match)
diff --git a/engine/src/mbliphonemail.mm b/engine/src/mbliphonemail.mm
@@ -148,7 +148,7 @@ static void iphone_send_email_prewait(void *p_context)
 	
 	NSArray *t_recipients;
 	t_recipients = nil;
-	if (ctxt -> to_addresses != nil && !MCStringIsEqualTo(ctxt -> to_addresses, kMCEmptyString, kMCCompareCaseless))
+	if (ctxt -> to_addresses != nil && !MCStringIsEmpty(ctxt -> to_addresses))
 		t_recipients = [[NSString stringWithMCStringRef: ctxt -> to_addresses] componentsSeparatedByString: @","];
 	
 	NSArray *t_ccs;
@@ -502,17 +502,17 @@ static void compose_mail_prewait(void *p_context)
 	
 	NSArray *t_ns_to;
 	t_ns_to = nil;
-	if (ctxt -> to != nil && !MCStringIsEqualTo(ctxt -> to, kMCEmptyString, kMCCompareCaseless))
+	if (ctxt -> to != nil && !MCStringIsEmpty(ctxt -> to))
 		t_ns_to = mcstringref_to_nsarray(ctxt -> to, t_separator_set);
 	
 	NSArray *t_ns_cc;
 	t_ns_cc = nil;
-	if (ctxt -> cc != nil && !MCStringIsEqualTo(ctxt -> cc, kMCEmptyString, kMCCompareCaseless))
+	if (ctxt -> cc != nil && !MCStringIsEmpty(ctxt -> cc))
 		t_ns_cc = mcstringref_to_nsarray(ctxt -> cc, t_separator_set);
 
 	NSArray *t_ns_bcc;
 	t_ns_bcc = nil;
-	if (ctxt -> bcc != nil && !MCStringIsEqualTo(ctxt -> bcc, kMCEmptyString, kMCCompareCaseless))
+	if (ctxt -> bcc != nil && !MCStringIsEmpty(ctxt -> bcc))
 		t_ns_bcc = mcstringref_to_nsarray(ctxt -> bcc, t_separator_set);	
 
 	[ ctxt -> dialog setSubject: t_ns_subject ];
diff --git a/engine/src/mbliphonesound.mm b/engine/src/mbliphonesound.mm
@@ -513,7 +513,7 @@ bool MCSystemPlaySoundOnChannel(MCStringRef p_channel, MCStringRef p_file, MCSou
 		t_channel -> current_player . player != nil)
 	{	
 		// If no file is given, cancel the next sound.
-		if (p_file == nil || MCStringIsEqualToCString(p_file, MCnullstring, kMCCompareCaseless))
+		if (p_file == nil || MCStringIsEmpty(p_file))
 			return true;
 		
 		if (new_player_for_channel(t_channel, p_file, false, p_object, t_channel -> next_player))
@@ -536,7 +536,7 @@ bool MCSystemPlaySoundOnChannel(MCStringRef p_channel, MCStringRef p_file, MCSou
 		delete_player_on_channel(t_channel, t_channel -> current_player);
 	
 	// If no file is given, cancel the current sound.
-	if (p_file == nil || MCStringIsEqualToCString(p_file, MCnullstring, kMCCompareCaseless))
+	if (p_file == nil || MCStringIsEmpty(p_file))
 		return true;
 	
 	if (new_player_for_channel(t_channel, p_file, p_type == kMCSoundChannelPlayLooping, p_object, t_channel -> current_player))
diff --git a/engine/src/objectprops.cpp b/engine/src/objectprops.cpp
@@ -433,7 +433,7 @@ Exec_stat MCObject::sendgetprop(MCExecContext& ctxt, MCNameRef p_set_name, MCNam
 	//
 	MCNameRef t_getprop_name;
 	MCNameRef t_param_name;
-	if (MCNameIsEqualTo(p_set_name, kMCEmptyName, kMCCompareCaseless))
+	if (MCNameIsEmpty(p_set_name))
 		t_getprop_name = p_prop_name, t_param_name = kMCEmptyName;
 	else
 		t_getprop_name = p_set_name, t_param_name = p_prop_name;
@@ -1536,7 +1536,7 @@ Exec_stat MCObject::sendsetprop(MCExecContext& ctxt, MCNameRef p_set_name, MCNam
 	// otherwise we send a 'setProp <setname>[<propname>] <value>'.
 	MCNameRef t_setprop_name;
 	MCNameRef t_param_name;
-	if (MCNameIsEqualTo(p_set_name, kMCEmptyName, kMCCompareCaseless))
+	if (MCNameIsEmpty(p_set_name))
 		t_setprop_name = p_prop_name, t_param_name = kMCEmptyName;
 	else
 		t_setprop_name = p_set_name, t_param_name = p_prop_name;
diff --git a/engine/src/objectpropsets.cpp b/engine/src/objectpropsets.cpp
@@ -253,7 +253,7 @@ bool MCObject::findpropset(MCNameRef p_name, bool p_empty_is_default, MCObjectPr
 {
 	MCObjectPropertySet *t_set;
 	t_set = props;
-	if (!p_empty_is_default || !MCNameIsEqualTo(p_name, kMCEmptyName, kMCCompareCaseless))
+	if (!p_empty_is_default || !MCNameIsEmpty(p_name))
 		while(t_set != nil && !t_set -> hasname(p_name))
 			t_set = t_set -> getnext();
 
@@ -274,7 +274,7 @@ bool MCObject::ensurepropset(MCNameRef p_name, bool p_empty_is_default, MCObject
 
 	MCObjectPropertySet *t_set;
 	t_set = props;
-	if (!p_empty_is_default || !MCNameIsEqualTo(p_name, kMCEmptyName, kMCCompareCaseless))
+	if (!p_empty_is_default || !MCNameIsEmpty(p_name))
 		while(t_set != nil && !t_set -> hasname(p_name))
 			t_set = t_set -> getnext();
 

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ Boolean MCDispatch::openenv(MCStringRef sname, MCStringRef env,`
`469`	`469`	`{`
`470`	`470`	`MCAutoStringRef t_env_path;`
`471`	`471`	`MCStringRef t_next_rest_of_env;`
`472`		`- /* UNCHECKED */ MCStringDivideAtChar(t_rest_of_env, ENV_SEPARATOR, kMCStringOptionCompareCaseless, &t_env_path, t_next_rest_of_env);`
	`472`	`+ /* UNCHECKED */ MCStringDivideAtChar(t_rest_of_env, ENV_SEPARATOR, kMCStringOptionCompareExact, &t_env_path, t_next_rest_of_env);`
`473`	`473`	`if (attempt_to_loadfile(stream, outpath, "%@/%@", *t_env_path, sname))`
`474`	`474`	`t_found = true;`
`475`	`475`
Original file line number	Diff line number	Diff line change
`@@ -3976,7 +3976,7 @@ void MCObject::GetCustomPropertiesElement(MCExecContext& ctxt, MCNameRef p_index`
`3976`	`3976`	`void MCObject::SetCustomKeysElement(MCExecContext& ctxt, MCNameRef p_index, MCStringRef p_string)`
`3977`	`3977`	`{`
`3978`	`3978`	`MCObjectPropertySet *t_propset;`
`3979`		`- if (MCStringIsEqualTo(p_string, kMCEmptyString, kMCCompareCaseless))`
	`3979`	`+ if (MCStringIsEmpty(p_string))`
`3980`	`3980`	`{`
`3981`	`3981`	`if (findpropset(p_index, true, t_propset))`
`3982`	`3982`	`t_propset -> clear();`
Original file line number	Diff line number	Diff line change
`@@ -2387,7 +2387,7 @@ void MCInterfaceExecSelectTextOfButton(MCExecContext& ctxt, Preposition_type p_t`
`2387`	`2387`	`if (t_success)`
`2388`	`2388`	`{`
`2389`	`2389`	`uindex_t t_lines;`
`2390`		`- t_lines = MCStringCountChar(*t_text, MCRangeMake(0, p_target . mark . start), '\n', kMCStringOptionCompareCaseless);`
	`2390`	`+ t_lines = MCStringCountChar(*t_text, MCRangeMake(0, p_target . mark . start), '\n', kMCStringOptionCompareExact);`
`2391`	`2391`
`2392`	`2392`	`static_cast<MCButton *>(p_target . object) -> setmenuhistory(t_lines + 1);`
`2393`	`2393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ void MCNetworkSetFtpProxy(MCExecContext& ctxt, MCStringRef p_value)`
`697`	`697`	`{`
`698`	`698`
`699`	`699`	`MCAutoStringRef t_host, t_port;`
`700`		`- /* UNCHECKED */ MCStringDivideAtChar(p_value, ':', kMCCompareCaseless, &t_host, &t_port);`
	`700`	`+ /* UNCHECKED */ MCStringDivideAtChar(p_value, ':', kMCCompareExact, &t_host, &t_port);`
`701`	`701`	`if (*t_port != nil)`
`702`	`702`	`/* UNCHECKED / MCStringToUInt16(t_port, MCftpproxyport);`
`703`	`703`	`else`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ static void MCPrintingPrintDeviceOutputParse(MCExecContext& ctxt, MCStringRef p_`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`MCAutoStringRef t_head, t_tail;`
`147`		`- if (MCStringDivideAtChar(p_input, ':', kMCCompareCaseless, &t_head, &t_tail))`
	`147`	`+ if (MCStringDivideAtChar(p_input, ':', kMCCompareExact, &t_head, &t_tail))`
`148`	`148`	`{`
`149`	`149`	`if (MCStringIsEqualToCString(*t_head, "file", kMCCompareCaseless))`
`150`	`150`	`{`
`@@ -213,7 +213,7 @@ struct MCPrintingPrinterPageRange`
`213`	`213`	`static void MCPrintingPrinterPageRangeParse(MCExecContext& ctxt, MCStringRef p_input, MCPrintingPrinterPageRange& r_output)`
`214`	`214`	`{`
`215`	`215`	`if (MCStringIsEqualToCString(p_input, "all", kMCCompareCaseless) \|\|`
`216`		`- MCStringIsEqualToCString(p_input, "", kMCCompareCaseless))`
	`216`	`+ MCStringIsEmpty(p_input))`
`217`	`217`	`{`
`218`	`218`	`r_output . count = PRINTER_PAGE_RANGE_ALL;`
`219`	`219`	`r_output . ranges = nil;`