Skip to content
This repository was archived by the owner on Jul 3, 2025. It is now read-only.

Commit a90df2d

Browse files
livecodepanoslivecodepanos
committed
Updates after feedback #1 
1 parent 1e30ea1 commit a90df2d

13 files changed

Lines changed: 35 additions & 41 deletions

‎engine/src/cmds.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ const char *MCDoMenu::lookup(MCStringRef s)
712712
{
713713
uint2 size = ELEMENTS(domenu_table);
714714
while(size--)
715-
if (MCStringIsEqualToCString(s, domenu_table[size].token, kMCCompareExact));
715+
if (MCStringIsEqualToCString(s, domenu_table[size].token, kMCCompareCaseless));
716716
return domenu_table[size].command;
717717
return NULL;
718718
}

‎engine/src/cmdsf.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2647,7 +2647,7 @@ int4 MCKill::lookup(MCStringRef s)
26472647
{
26482648
uint2 size = ELEMENTS(signal_table);
26492649
while(size--)
2650-
if (MCStringIsEqualToCString(s, signal_table[size].token, kMCCompareExact));
2650+
if (MCStringIsEqualToCString(s, signal_table[size].token, kMCCompareCaseless));
26512651
return signal_table[size].which;
26522652
return SIGTERM;
26532653
}

‎engine/src/exec-interface-object.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2451,9 +2451,9 @@ void MCObject::GetTextFont(MCExecContext& ctxt, MCStringRef& r_font)
24512451
return;
24522452

24532453
uint2 fontsize, fontstyle;
2454-
MCAutoStringRef fontname;
2455-
getfontattsnew(&fontname, fontsize, fontstyle);
2456-
r_font = MCValueRetain(*fontname);
2454+
MCNameRef fontname;
2455+
getfontattsnew(fontname, fontsize, fontstyle);
2456+
r_font = MCNameGetString(fontname);
24572457

24582458

24592459
}
@@ -2532,9 +2532,9 @@ void MCObject::GetEffectiveTextFont(MCExecContext& ctxt, MCStringRef& r_font)
25322532
}
25332533

25342534
uint2 fontsize, fontstyle;
2535-
MCAutoStringRef fontname;
2536-
getfontattsnew(&fontname, fontsize, fontstyle);
2537-
r_font = MCValueRetain(*fontname);
2535+
MCNameRef fontname;
2536+
getfontattsnew(fontname, fontsize, fontstyle);
2537+
r_font = MCNameGetString(fontname);
25382538

25392539
}
25402540

@@ -2544,8 +2544,8 @@ void MCObject::GetTextSize(MCExecContext& ctxt, uinteger_t*& r_size)
25442544
return;
25452545

25462546
uint2 fontsize, fontstyle;
2547-
MCAutoStringRef fontname;
2548-
getfontattsnew(&fontname, fontsize, fontstyle);
2547+
MCNameRef fontname;
2548+
getfontattsnew(fontname, fontsize, fontstyle);
25492549
uinteger_t size;
25502550
size = (uinteger_t)fontsize;
25512551
*r_size = size;
@@ -2598,8 +2598,8 @@ void MCObject::GetEffectiveTextSize(MCExecContext& ctxt, uinteger_t& r_size)
25982598
else
25992599
{
26002600
uint2 fontsize, fontstyle;
2601-
MCAutoStringRef fontname;
2602-
getfontattsnew(&fontname, fontsize, fontstyle);
2601+
MCNameRef fontname;
2602+
getfontattsnew(fontname, fontsize, fontstyle);
26032603
r_size = (uinteger_t)fontsize;
26042604
}
26052605
}
@@ -2613,8 +2613,8 @@ void MCObject::GetTextStyle(MCExecContext& ctxt, MCInterfaceTextStyle& r_style)
26132613
}
26142614

26152615
uint2 fontsize, fontstyle;
2616-
MCAutoStringRef fontname;
2617-
getfontattsnew(&fontname, fontsize, fontstyle);
2616+
MCNameRef fontname;
2617+
getfontattsnew(fontname, fontsize, fontstyle);
26182618
r_style . style = fontstyle;
26192619
}
26202620

@@ -2663,8 +2663,8 @@ void MCObject::GetEffectiveTextStyle(MCExecContext& ctxt, MCInterfaceTextStyle&
26632663
else
26642664
{
26652665
uint2 fontsize, fontstyle;
2666-
MCAutoStringRef fontname;
2667-
getfontattsnew(&fontname, fontsize, fontstyle);
2666+
MCNameRef fontname;
2667+
getfontattsnew(fontname, fontsize, fontstyle);
26682668
r_style . style = fontstyle;
26692669
}
26702670
}

‎engine/src/express.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ void MCExpression::compile_out(MCSyntaxFactoryRef ctxt)
605605

606606
#ifdef _MOBILE
607607
extern bool MCIsPlatformMessage(MCNameRef handler_name);
608-
extern Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters);
608+
extern Exec_stat MCHandlePlatformMessage(MCNameRef p_message, MCParameter *p_parameters);
609609
#endif
610610

611611
MCFuncref::MCFuncref(MCNameRef inname)
@@ -712,7 +712,7 @@ Exec_stat MCFuncref::eval(MCExecPoint &ep)
712712
#ifdef _MOBILE
713713
if (platform_message)
714714
{
715-
return MCHandlePlatformMessage(MCNameGetString(name), params);
715+
return MCHandlePlatformMessage(name, params);
716716
}
717717
#endif
718718
// MW-2008-12-17: [[ Bug 7463 ]] Make sure we use the object from the execpoint, rather

‎engine/src/keywords.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ Exec_stat MCThrowKeyword::exec(MCExecPoint &ep)
15971597
{
15981598
MCAutoStringRef t_value;
15991599
ep . copyasstringref(&t_value);
1600-
MCeerror->copysvalue(*t_value, True);
1600+
MCeerror->copystringref(*t_value, True);
16011601
}
16021602
return ES_ERROR;
16031603
}
@@ -1833,7 +1833,7 @@ Exec_stat MCTry::exec(MCExecPoint &ep)
18331833
errorvar->evalvar(ep)->eval(ep);
18341834
MCAutoStringRef t_value;
18351835
ep . copyasstringref(&t_value);
1836-
MCeerror->copysvalue(*t_value, False);
1836+
MCeerror->copystringref(*t_value, False);
18371837
MCeerror->add(EE_TRY_BADSTATEMENT, line, pos);
18381838
stat = ES_ERROR;
18391839
}

‎engine/src/mblhandlers.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6718,10 +6718,10 @@ static void invoke_platform(void *p_context)
67186718

67196719
extern void MCIPhoneCallOnMainFiber(void (*)(void *), void *);
67206720

6721-
Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters)
6721+
Exec_stat MCHandlePlatformMessage(MCNameRef p_message, MCParameter *p_parameters)
67226722
{
67236723
for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
6724-
if (MCStringIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
6724+
if (MCNameIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
67256725
{
67266726
// MW-2012-07-31: [[ Fibers ]] If the method doesn't need script / wait, then
67276727
// jump to the main fiber for it.
@@ -6743,11 +6743,11 @@ Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_paramete
67436743
return ES_NOT_HANDLED;
67446744
}
67456745
#else // Android
6746-
Exec_stat MCHandlePlatformMessage(MCStringRef p_message, MCParameter *p_parameters)
6746+
Exec_stat MCHandlePlatformMessage(MCNameRef p_message, MCParameter *p_parameters)
67476747
{
67486748
for(uint32_t i = 0; s_platform_messages[i] . message != nil; i++)
67496749
{
6750-
if (MCStringIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
6750+
if (MCNameIsEqualToCString(p_message, s_platform_messages[i] . message, kMCCompareExact))
67516751
return s_platform_messages[i] . handler(s_platform_messages[i] . context, p_parameters);
67526752
}
67536753

‎engine/src/mcerror.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const MCString &MCError::getsvalue()
112112
return svalue;
113113
}
114114

115-
void MCError::copysvalue(MCStringRef s, Boolean t)
115+
void MCError::copystringref(MCStringRef s, Boolean t)
116116
{
117117
delete buffer;
118118
buffer = strdup(MCStringGetCString(s));

‎engine/src/mcerror.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MCError
5151
void add(uint2 id, uint2 line, uint2 pos, MCValueRef);
5252
void append(MCError& string);
5353
const MCString &getsvalue();
54-
void copysvalue(MCStringRef s, Boolean t);
54+
void copystringref(MCStringRef s, Boolean t);
5555
bool copyasstringref(MCStringRef &r_string);
5656
void clear();
5757
Boolean isempty()

‎engine/src/object.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,12 +1813,6 @@ void MCObject::getfontattsnew(MCNameRef& fname, uint2 &size, uint2 &style)
18131813
style = m_font_attrs -> style;
18141814
}
18151815

1816-
void MCObject::getfontattsnew(MCStringRef & fname, uint2 &size, uint2 &style)
1817-
{
1818-
MCNameRef t_fname_name;
1819-
getfontattsnew(t_fname_name, size, style);
1820-
fname = MCNameGetString(t_fname_name);
1821-
}
18221816

18231817
MCNameRef MCObject::gettextfont(void)
18241818
{

‎engine/src/object.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ class MCObject : public MCDLlist
558558
// MW-2012-02-17: [[ LogFonts ]] Fetch the (effective) font attrs for the
559559
// object.
560560
void getfontattsnew(MCNameRef& fname, uint2& fsize, uint2& fstyle);
561-
void getfontattsnew(MCStringRef& fname, uint2& fsize, uint2& fstyle);
561+
//void getfontattsnew(MCStringRef& fname, uint2& fsize, uint2& fstyle);
562562

563563
// MW-2012-02-16: [[ LogFonts ]] Return the (effective) textFont setting.
564564
MCNameRef gettextfont(void);

0 commit comments

Comments
 (0)