Updates on some methods (of Tab 'Extras')

livecodepanos · livecodepanos · commit a15e87c50fb2 · 2013-09-12T13:41:55.000+01:00
diff --git a/engine/src/block.cpp b/engine/src/block.cpp
@@ -1285,7 +1285,7 @@ void MCBlock::draw(MCDC *dc, int2 x, int2 cx, int2 y, uint2 si, uint2 ei, const
 	{
 		MCRectangle t_box;
 		MCU_set_rect(t_box, x - 1, y - t_ascent, getwidth(dc, cx) + 3, t_ascent + t_descent);
-		dc -> drawlink(MCStringGetCString(getlinktext()), t_box);
+		dc -> drawlink(getlinktext(), t_box);
 	}
 }
 
diff --git a/engine/src/cmds.cpp b/engine/src/cmds.cpp
@@ -708,11 +708,11 @@ Scroll To Selection, Replace..., Replace Again, Comment, Uncomment,
 Set Checkpoint, Step, Step Into, Trace, Go, Trace Delay..., Abort,
 Variable Watcher, Message Watcher
 */
-const char *MCDoMenu::lookup(const MCString &s)
+const char *MCDoMenu::lookup(MCStringRef s)
 {
 	uint2 size = ELEMENTS(domenu_table);
 	while(size--)
-		if (s == domenu_table[size].token)
+		if (MCStringIsEqualToCString(s, domenu_table[size].token, kMCCompareExact));
 			return domenu_table[size].command;
 	return NULL;
 }
diff --git a/engine/src/cmds.h b/engine/src/cmds.h
@@ -119,7 +119,7 @@ class MCDoMenu : public MCStatement
 	{
 		source = NULL;
 	}
-	const char *lookup(const MCString &s);
+	const char *lookup(MCStringRef s);
 	virtual ~MCDoMenu();
 	virtual Parse_stat parse(MCScriptPoint &);
 	virtual Exec_stat exec(MCExecPoint &);
@@ -1441,7 +1441,7 @@ class MCKill : public MCStatement
 		sig = NULL;
 		pname = NULL;
 	}
-	int4 lookup(const MCString &s);
+	int4 lookup(MCStringRef s);
 	virtual ~MCKill();
 	virtual Parse_stat parse(MCScriptPoint &);
 	virtual Exec_stat exec(MCExecPoint &);
diff --git a/engine/src/cmdsf.cpp b/engine/src/cmdsf.cpp
@@ -2643,11 +2643,11 @@ static ST signal_table[] = {
 #endif
                            };
 
-int4 MCKill::lookup(const MCString &s)
+int4 MCKill::lookup(MCStringRef s)
 {
 	uint2 size = ELEMENTS(signal_table);
 	while(size--)
-		if (s == signal_table[size].token)
+		if (MCStringIsEqualToCString(s, signal_table[size].token, kMCCompareExact));
 			return signal_table[size].which;
 	return SIGTERM;
 }
diff --git a/engine/src/context.h b/engine/src/context.h
@@ -173,7 +173,7 @@ class MCContext
 	
 	virtual void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy) = 0;
 
-	virtual void drawlink(const char *link, const MCRectangle& region) = 0;
+	virtual void drawlink(MCStringRef link, const MCRectangle& region) = 0;
 
 	virtual int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false) = 0;
 
diff --git a/engine/src/contextscalewrapper.cpp b/engine/src/contextscalewrapper.cpp
@@ -454,7 +454,7 @@ void MCContextScaleWrapper::drawimage(const MCImageDescriptor& p_image, int2 sx,
 	MCImageFreeBitmap(t_scaled);
 }
 
-void MCContextScaleWrapper::drawlink(const char *link, const MCRectangle& region)
+void MCContextScaleWrapper::drawlink(MCStringRef link, const MCRectangle& region)
 {
 	// This is a no-op as links are irrelevant to rasterized portions. The print
 	// system will iterate through any links and render them directly.
diff --git a/engine/src/contextscalewrapper.h b/engine/src/contextscalewrapper.h
@@ -100,7 +100,7 @@ class MCContextScaleWrapper: public MCContext
 											 const char *fontname, uint2 fontsize, uint2 fontstyle, MCFontStruct *font, const MCRectangle& trect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 
diff --git a/engine/src/exec.cpp b/engine/src/exec.cpp
@@ -170,25 +170,6 @@ bool FormatUnsignedInteger(uinteger_t p_integer, MCStringRef& r_output)
 	return MCStringFormat(r_output, "%d", p_integer);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-bool MCExecContext::EncodeStringAsUTF8(MCStringRef self, char*& r_utf8_string)
-{
-	MCExecPoint ep;
-	ep . setsvalue(MCStringGetOldString(self));
-	ep . nativetoutf8();
-	r_utf8_string = ep . getsvalue() . clone();
-	return true;
-}
-
-bool MCExecContext::EncodeUnicodeStringAsUTF8(MCStringRef self, char*& r_utf8_string)
-{
-	MCExecPoint ep;
-	ep . setsvalue(MCStringGetOldString(self));
-	ep . utf16toutf8();
-	r_utf8_string = ep . getsvalue() . clone();
-	return true;
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/exec.h b/engine/src/exec.h
@@ -638,11 +638,7 @@ class MCExecContext
 	bool FormatLegacyRectangle(MCRectangle value, MCStringRef& r_value);
 	bool FormatLegacyColor(MCColor value, MCStringRef& r_value);
 
-	//////////
 	
-	bool EncodeStringAsUTF8(MCStringRef string, char*& r_cstring);
-	bool EncodeUnicodeStringAsUTF8(MCStringRef string, char*& r_cstring);
-
 	//////////
 
 	// This method evaluates the given expression returning the result in 'result'.
diff --git a/engine/src/express.cpp b/engine/src/express.cpp
@@ -605,7 +605,7 @@ void MCExpression::compile_out(MCSyntaxFactoryRef ctxt)
 
 #ifdef _MOBILE
 extern bool MCIsPlatformMessage(MCNameRef handler_name);
-extern Exec_stat MCHandlePlatformMessage(const MCString& p_message, MCParameter *p_parameters);
+extern Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters);
 #endif 
 
 MCFuncref::MCFuncref(MCNameRef inname)
@@ -712,7 +712,7 @@ Exec_stat MCFuncref::eval(MCExecPoint &ep)
 #ifdef _MOBILE
     if (platform_message)
     {
-        return MCHandlePlatformMessage(MCNameGetOldString(name), params);
+        return MCHandlePlatformMessage(MCNameGetString(name), params);
     }
 #endif
 	// MW-2008-12-17: [[ Bug 7463 ]] Make sure we use the object from the execpoint, rather
diff --git a/engine/src/keywords.cpp b/engine/src/keywords.cpp
@@ -1594,7 +1594,11 @@ Exec_stat MCThrowKeyword::exec(MCExecPoint &ep)
 		MCeerror->add
 		(EE_THROW_BADERROR, line, pos);
 	else
-		MCeerror->copysvalue(ep.getsvalue(), True);
+    {
+        MCAutoStringRef t_value;
+        ep . copyasstringref(&t_value);
+		MCeerror->copysvalue(*t_value, True);
+    }
 	return ES_ERROR;
 }
 
@@ -1827,7 +1831,9 @@ Exec_stat MCTry::exec(MCExecPoint &ep)
 			if (state == TS_CATCH)
 			{
 				errorvar->evalvar(ep)->eval(ep);
-				MCeerror->copysvalue(ep.getsvalue(), False);
+                MCAutoStringRef t_value;
+                ep . copyasstringref(&t_value);
+				MCeerror->copysvalue(*t_value, False);
 				MCeerror->add(EE_TRY_BADSTATEMENT, line, pos);
 				stat = ES_ERROR;
 			}
diff --git a/engine/src/lnxcontext.cpp b/engine/src/lnxcontext.cpp
@@ -1926,7 +1926,7 @@ void MCX11Context::drawtheme(MCThemeDrawType p_type, MCThemeDrawInfo* p_info)
 		MCscreen->destroyimage(t_argb_image);
 }
 
-void MCX11Context::drawlink(const char *link, const MCRectangle& region)
+void MCX11Context::drawlink(MCStringRef link, const MCRectangle& region)
 {
 }
 
diff --git a/engine/src/lnxcontext.h b/engine/src/lnxcontext.h
@@ -131,7 +131,7 @@ class MCX11Context : public MCContext
 		const char *fontname, uint2 fontsize, uint2 fontstyle, MCFontStruct *font, const MCRectangle& trect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 	
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false); 
 	
diff --git a/engine/src/mblandroidcontext.cpp b/engine/src/mblandroidcontext.cpp
@@ -702,7 +702,7 @@ void MCAndroidContext::drawimage(const MCImageDescriptor& p_image, int2 sx, int2
 	MCMemoryDeallocate(t_argb_pixels);
 }
 
-void MCAndroidContext::drawlink(const char *link, const MCRectangle& region)
+void MCAndroidContext::drawlink(MCStringRef link, const MCRectangle& region)
 {
 	// This is a no-op as links are irrelevant to rasterized portions. The print
 	// system will iterate through any links and render them directly.
diff --git a/engine/src/mblandroidcontext.h b/engine/src/mblandroidcontext.h
@@ -92,7 +92,7 @@ class MCAndroidContext : public MCContext
 											 const char *fontname, uint2 fontsize, uint2 fontstyle, MCFontStruct *font, const MCRectangle& trect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 	
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 
diff --git a/engine/src/mblhandlers.cpp b/engine/src/mblhandlers.cpp
@@ -6718,10 +6718,10 @@ static void invoke_platform(void *p_context)
 
 extern void MCIPhoneCallOnMainFiber(void (*)(void *), void *);
 
-Exec_stat MCHandlePlatformMessage(const MCString& p_message, MCParameter *p_parameters)
+Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters)
 {
 	for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
-		if (p_message == s_platform_messages[i] . message)
+		if (MCStringIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
 		{
 			// MW-2012-07-31: [[ Fibers ]] If the method doesn't need script / wait, then
 			//   jump to the main fiber for it.
@@ -6743,11 +6743,11 @@ Exec_stat MCHandlePlatformMessage(const MCString& p_message, MCParameter *p_para
 	return ES_NOT_HANDLED;
 }
 #else // Android
-Exec_stat MCHandlePlatformMessage(const MCString& p_message, MCParameter *p_parameters)
+Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters)
 {
 	for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
     {
-		if (p_message == s_platform_messages[i] . message)
+		if (MCStringIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
 			return s_platform_messages[i] . handler(s_platform_messages[i] . context, p_parameters);
     }
 	
diff --git a/engine/src/mbliphonecontext.cpp b/engine/src/mbliphonecontext.cpp
@@ -636,7 +636,7 @@ void MCIPhoneContext::drawimage(const MCImageDescriptor& p_image, int2 sx, int2
 	free(t_pixel_ptr);
 }
 
-void MCIPhoneContext::drawlink(const char *link, const MCRectangle& region)
+void MCIPhoneContext::drawlink(MCStringRef link, const MCRectangle& region)
 {
 	// This is a no-op as links are irrelevant to rasterized portions. The print
 	// system will iterate through any links and render them directly.
diff --git a/engine/src/mbliphonecontext.h b/engine/src/mbliphonecontext.h
@@ -91,7 +91,7 @@ class MCIPhoneContext: public MCContext
 											 const char *fontname, uint2 fontsize, uint2 fontstyle, MCFontStruct *font, const MCRectangle& trect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 	
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 	
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 
diff --git a/engine/src/mcerror.cpp b/engine/src/mcerror.cpp
@@ -112,10 +112,10 @@ const MCString &MCError::getsvalue()
 	return svalue;
 }
 
-void MCError::copysvalue(const MCString &s, Boolean t)
+void MCError::copysvalue(MCStringRef s, Boolean t)
 {
 	delete buffer;
-	buffer = s.clone();
+	buffer = strdup(MCStringGetCString(s));
 	thrown = t;
 	if (thrown)
 		svalue.set(buffer, strlen(buffer));
diff --git a/engine/src/mcerror.h b/engine/src/mcerror.h
@@ -51,7 +51,7 @@ class MCError
 	void add(uint2 id, uint2 line, uint2 pos, MCValueRef);
 	void append(MCError& string);
 	const MCString &getsvalue();
-	void copysvalue(const MCString &s, Boolean t);
+	void copysvalue(MCStringRef s, Boolean t);
 	bool copyasstringref(MCStringRef &r_string);
 	void clear();
 	Boolean isempty()
diff --git a/engine/src/metacontext.cpp b/engine/src/metacontext.cpp
@@ -509,16 +509,16 @@ void MCMetaContext::drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy
 	setclip(t_old_clip);
 }
 
-void MCMetaContext::drawlink(const char *p_link, const MCRectangle& p_region)
+void MCMetaContext::drawlink(MCStringRef p_link, const MCRectangle& p_region)
 {
 	MCMark *t_mark;
 	t_mark = new_mark(MARK_TYPE_LINK, false, false);
 	if (t_mark != NULL)
 	{
 		t_mark -> link . region = p_region;
-		t_mark -> link . text = new_array<char>(strlen(p_link) + 1);
+		t_mark -> link . text = new_array<char>(MCStringGetLength(p_link) + 1);
 		if (t_mark -> link . text != NULL)
-			strcpy(t_mark -> link . text, p_link);
+			strcpy(t_mark -> link . text, MCStringGetCString(p_link));
 	}
 }
 
diff --git a/engine/src/metacontext.h b/engine/src/metacontext.h
@@ -184,7 +184,7 @@ class MCMetaContext: public MCContext
 	void drawpict(uint1 *data, uint4 length, bool embed, const MCRectangle& drect, const MCRectangle& crect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 
diff --git a/engine/src/osxcontext.cpp b/engine/src/osxcontext.cpp
@@ -1511,7 +1511,7 @@ void MCQuickDrawContext::drawimage(const MCImageDescriptor& p_image, int2 sx, in
 	free(t_pixel_ptr);
 }
 
-void MCQuickDrawContext::drawlink(const char *p_name, const MCRectangle& p_area)
+void MCQuickDrawContext::drawlink(MCStringRef p_name, const MCRectangle& p_area)
 {
 }
 
diff --git a/engine/src/osxcontext.h b/engine/src/osxcontext.h
@@ -135,7 +135,7 @@ class MCQuickDrawContext: public MCContext
 	void drawpict(uint1 *data, uint4 length, bool embed, const MCRectangle& drect, const MCRectangle& crect);
 	void drawimage(const MCImageDescriptor& p_image, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 
diff --git a/engine/src/statemnt.cpp b/engine/src/statemnt.cpp
@@ -352,7 +352,7 @@ void MCStatement::compile(MCSyntaxFactoryRef ctxt)
 
 #ifdef _MOBILE
 extern bool MCIsPlatformMessage(MCNameRef handler_name);
-extern Exec_stat MCHandlePlatformMessage(const MCString& p_message, MCParameter *p_parameters);
+extern Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters);
 #endif
 
 MCComref::MCComref(MCNameRef n)
@@ -430,7 +430,7 @@ Exec_stat MCComref::exec(MCExecPoint &ep)
 #ifdef _MOBILE
     if (platform_message)
     {
-        return MCHandlePlatformMessage(MCNameGetOldString(name), params);
+        return MCHandlePlatformMessage(MCNameGetString(name), params);
     }
 #endif
     
diff --git a/engine/src/w32context.cpp b/engine/src/w32context.cpp
@@ -1782,7 +1782,7 @@ void MCGDIContext::drawtheme(MCThemeDrawType p_type, MCThemeDrawInfo* p_info_ptr
 	}
 }
 
-void MCGDIContext::drawlink(const char *p_link, const MCRectangle& p_region)
+void MCGDIContext::drawlink(MCSTringRef p_link, const MCRectangle& p_region)
 {
 }
 
diff --git a/engine/src/w32context.h b/engine/src/w32context.h
@@ -156,7 +156,7 @@ class MCGDIContext: public MCContext
 
 	void drawimage(const MCImageDescriptor& info, int2 sx, int2 sy, uint2 sw, uint2 sh, int2 dx, int2 dy);
 
-	void drawlink(const char *link, const MCRectangle& region);
+	void drawlink(MCStringRef link, const MCRectangle& region);
 
 	int4 textwidth(MCFontStruct *f, const char *s, uint2 l, bool p_unicode_override = false);
 

Original file line number	Diff line number	Diff line change
`@@ -1285,7 +1285,7 @@ void MCBlock::draw(MCDC *dc, int2 x, int2 cx, int2 y, uint2 si, uint2 ei, const`
`1285`	`1285`	`{`
`1286`	`1286`	`MCRectangle t_box;`
`1287`	`1287`	`MCU_set_rect(t_box, x - 1, y - t_ascent, getwidth(dc, cx) + 3, t_ascent + t_descent);`
`1288`		`- dc -> drawlink(MCStringGetCString(getlinktext()), t_box);`
	`1288`	`+ dc -> drawlink(getlinktext(), t_box);`
`1289`	`1289`	`}`
`1290`	`1290`	`}`
`1291`	`1291`
Original file line number	Diff line number	Diff line change
`@@ -708,11 +708,11 @@ Scroll To Selection, Replace..., Replace Again, Comment, Uncomment,`
`708`	`708`	`Set Checkpoint, Step, Step Into, Trace, Go, Trace Delay..., Abort,`
`709`	`709`	`Variable Watcher, Message Watcher`
`710`	`710`	`*/`
`711`		`-const char *MCDoMenu::lookup(const MCString &s)`
	`711`	`+const char *MCDoMenu::lookup(MCStringRef s)`
`712`	`712`	`{`
`713`	`713`	`uint2 size = ELEMENTS(domenu_table);`
`714`	`714`	`while(size--)`
`715`		`- if (s == domenu_table[size].token)`
	`715`	`+ if (MCStringIsEqualToCString(s, domenu_table[size].token, kMCCompareExact));`
`716`	`716`	`return domenu_table[size].command;`
`717`	`717`	`return NULL;`
`718`	`718`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class MCDoMenu : public MCStatement`
`119`	`119`	`{`
`120`	`120`	`source = NULL;`
`121`	`121`	`}`
`122`		`- const char *lookup(const MCString &s);`
	`122`	`+ const char *lookup(MCStringRef s);`
`123`	`123`	`virtual ~MCDoMenu();`
`124`	`124`	`virtual Parse_stat parse(MCScriptPoint &);`
`125`	`125`	`virtual Exec_stat exec(MCExecPoint &);`
`@@ -1441,7 +1441,7 @@ class MCKill : public MCStatement`
`1441`	`1441`	`sig = NULL;`
`1442`	`1442`	`pname = NULL;`
`1443`	`1443`	`}`
`1444`		`- int4 lookup(const MCString &s);`
	`1444`	`+ int4 lookup(MCStringRef s);`
`1445`	`1445`	`virtual ~MCKill();`
`1446`	`1446`	`virtual Parse_stat parse(MCScriptPoint &);`
`1447`	`1447`	`virtual Exec_stat exec(MCExecPoint &);`
Original file line number	Diff line number	Diff line change
`@@ -2643,11 +2643,11 @@ static ST signal_table[] = {`
`2643`	`2643`	`#endif`
`2644`	`2644`	`};`
`2645`	`2645`
`2646`		`-int4 MCKill::lookup(const MCString &s)`
	`2646`	`+int4 MCKill::lookup(MCStringRef s)`
`2647`	`2647`	`{`
`2648`	`2648`	`uint2 size = ELEMENTS(signal_table);`
`2649`	`2649`	`while(size--)`
`2650`		`- if (s == signal_table[size].token)`
	`2650`	`+ if (MCStringIsEqualToCString(s, signal_table[size].token, kMCCompareExact));`
`2651`	`2651`	`return signal_table[size].which;`
`2652`	`2652`	`return SIGTERM;`
`2653`	`2653`	`}`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ void MCContextScaleWrapper::drawimage(const MCImageDescriptor& p_image, int2 sx,`
`454`	`454`	`MCImageFreeBitmap(t_scaled);`
`455`	`455`	`}`
`456`	`456`
`457`		`-void MCContextScaleWrapper::drawlink(const char *link, const MCRectangle& region)`
	`457`	`+void MCContextScaleWrapper::drawlink(MCStringRef link, const MCRectangle& region)`
`458`	`458`	`{`
`459`	`459`	`// This is a no-op as links are irrelevant to rasterized portions. The print`
`460`	`460`	`// system will iterate through any links and render them directly.`