Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 02cd0da

Browse files
author
runrevali
committed
[[ Faster ]] Use case sensitive search for specific chars
1 parent 4c413d2 commit 02cd0da

File tree

12 files changed

+27
-27
lines changed

12 files changed

+27
-27
lines changed

‎engine/src/cmdss.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2872,7 +2872,7 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)
28722872

28732873
MCStringCopy(*t_position_data, &t_position);
28742874
}
2875-
else if (MCStringFirstIndexOfChar(*t_position_data, ',', 0, kMCCompareCaseless, t_delimiter))
2875+
else if (MCStringFirstIndexOfChar(*t_position_data, ',', 0, kMCCompareExact, t_delimiter))
28762876
{
28772877
MCStringCopySubstring(*t_position_data, MCRangeMake(0, t_delimiter), &t_position);
28782878
t_delimiter++;

‎engine/src/debug.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ void MCB_parsebreaks(MCExecContext& ctxt, MCStringRef p_input)
447447
{
448448
uindex_t t_length;
449449
MCAutoStringRef t_break;
450-
t_found = MCStringFirstIndexOfChar(p_input, '\n', t_last_offset, kMCCompareCaseless, t_return_offset);
450+
t_found = MCStringFirstIndexOfChar(p_input, '\n', t_last_offset, kMCCompareExact, t_return_offset);
451451

452452
if (!t_found) //last line
453453
t_length = t_input_length - t_last_offset;
@@ -618,7 +618,7 @@ void MCB_parsewatches(MCExecContext& ctxt, MCStringRef p_input)
618618
{
619619
uindex_t t_length;
620620
MCAutoStringRef t_watch;
621-
t_found = MCStringFirstIndexOfChar(p_input, '\n', t_last_offset, kMCCompareCaseless, t_return_offset);
621+
t_found = MCStringFirstIndexOfChar(p_input, '\n', t_last_offset, kMCCompareExact, t_return_offset);
622622

623623
if (!t_found) //last line
624624
t_length = t_input_length - t_last_offset;
@@ -631,19 +631,19 @@ void MCB_parsewatches(MCExecContext& ctxt, MCStringRef p_input)
631631
MCAutoStringRef t_obj_tail;
632632

633633
if (t_success)
634-
t_success = MCStringDivideAtChar(*t_watch, ',', kMCCompareCaseless, &t_obj, &t_obj_tail);
634+
t_success = MCStringDivideAtChar(*t_watch, ',', kMCCompareExact, &t_obj, &t_obj_tail);
635635

636636
MCAutoStringRef t_express;
637637
MCAutoStringRef t_express_tail;
638638

639639
if (t_success)
640-
t_success = MCStringDivideAtChar(*t_obj_tail, ',', kMCCompareCaseless, &t_express, &t_express_tail);
640+
t_success = MCStringDivideAtChar(*t_obj_tail, ',', kMCCompareExact, &t_express, &t_express_tail);
641641

642642
MCAutoStringRef t_vname;
643643
MCAutoStringRef t_hname;
644644

645645
if (t_success)
646-
t_success = MCStringDivideAtChar(*t_express_tail, ',', kMCCompareCaseless, &t_vname, &t_hname);
646+
t_success = MCStringDivideAtChar(*t_express_tail, ',', kMCCompareExact, &t_vname, &t_hname);
647647

648648
MCObjectPtr t_object;
649649

‎engine/src/dispatch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ IO_stat MCDispatch::loadfile(MCStringRef p_name, MCStack *&sptr)
823823
{
824824
MCAutoStringRef t_leaf_name;
825825
uindex_t t_leaf_index;
826-
if (MCStringLastIndexOfChar(p_name, PATH_SEPARATOR, UINDEX_MAX, kMCStringOptionCompareCaseless, t_leaf_index))
826+
if (MCStringLastIndexOfChar(p_name, PATH_SEPARATOR, UINDEX_MAX, kMCStringOptionCompareExact, t_leaf_index))
827827
/* UNCHECKED */ MCStringCopySubstring(p_name, MCRangeMake(t_leaf_index + 1, MCStringGetLength(p_name) - (t_leaf_index + 1)), &t_leaf_name);
828828
else
829829
t_leaf_name = p_name;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static void MCInterfaceFlaggedRangesParse(MCExecContext& ctxt, MCStringRef p_inp
129129
MCAutoStringRef t_uintx2_string;
130130
MCInterfaceFlaggedRange t_range;
131131

132-
if (!MCStringFirstIndexOfChar(p_input, '\n', t_old_offset, kMCCompareCaseless, t_new_offset))
132+
if (!MCStringFirstIndexOfChar(p_input, '\n', t_old_offset, kMCCompareExact, t_new_offset))
133133
t_new_offset = t_length;
134134

135135
if (t_new_offset <= t_old_offset)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ static void MCInterfaceTextStyleParse(MCExecContext& ctxt, MCStringRef p_input,
611611
{
612612
MCAutoStringRef t_text_style;
613613

614-
if (!MCStringFirstIndexOfChar(p_input, ',', t_old_offset, kMCCompareCaseless, t_new_offset))
614+
if (!MCStringFirstIndexOfChar(p_input, ',', t_old_offset, kMCCompareExact, t_new_offset))
615615
t_new_offset = t_length;
616616

617617
while (MCStringGetNativeCharAtIndex(p_input, t_old_offset) == ' ')
@@ -2045,7 +2045,7 @@ void MCObject::SetColors(MCExecContext& ctxt, MCStringRef p_input)
20452045
for (uint2 index = DI_FORE; index <= DI_FOCUS; index++)
20462046
{
20472047
MCAutoStringRef t_color_string;
2048-
if (!MCStringFirstIndexOfChar(p_input, '\n', t_old_offset, kMCCompareCaseless, t_new_offset))
2048+
if (!MCStringFirstIndexOfChar(p_input, '\n', t_old_offset, kMCCompareExact, t_new_offset))
20492049
t_new_offset = t_length;
20502050

20512051
if (t_new_offset > t_old_offset)
@@ -2397,7 +2397,7 @@ void MCObject::SetPatterns(MCExecContext& ctxt, MCStringRef patterns)
23972397
{
23982398
MCAutoStringRef t_pattern;
23992399
uint4 t_id;
2400-
if (!MCStringFirstIndexOfChar(patterns, '\n', t_old_offset, kMCCompareCaseless, t_new_offset))
2400+
if (!MCStringFirstIndexOfChar(patterns, '\n', t_old_offset, kMCCompareExact, t_new_offset))
24012401
t_new_offset = t_length;
24022402

24032403
if (t_new_offset > t_old_offset)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ void MCStack::SetSubstacks(MCExecContext& ctxt, MCStringRef p_substacks)
11491149
MCAutoStringRef t_name_string;
11501150
MCNewAutoNameRef t_name;
11511151

1152-
if (!MCStringFirstIndexOfChar(p_substacks, '\n', t_old_offset, kMCCompareCaseless, t_new_offset))
1152+
if (!MCStringFirstIndexOfChar(p_substacks, '\n', t_old_offset, kMCCompareExact, t_new_offset))
11531153
t_new_offset = t_length;
11541154

11551155
t_success = MCStringCopySubstring(p_substacks, MCRangeMake(t_old_offset, t_new_offset - t_old_offset), &t_name_string);

‎engine/src/exec.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ static bool MCPropertyParseUIntList(MCStringRef p_input, char_t p_delimiter, uin
15671567
MCAutoStringRef t_uint_string;
15681568
uinteger_t t_d;
15691569

1570-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
1570+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
15711571
t_new_offset = t_length;
15721572

15731573
if (t_new_offset <= t_old_offset)
@@ -1618,7 +1618,7 @@ static bool MCPropertyParseDoubleList(MCStringRef p_input, char_t p_delimiter, u
16181618
MCAutoStringRef t_double_string;
16191619
double t_d;
16201620

1621-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
1621+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
16221622
t_new_offset = t_length;
16231623

16241624
if (t_new_offset <= t_old_offset)
@@ -1668,7 +1668,7 @@ static bool MCPropertyParseStringList(MCStringRef p_input, char_t p_delimiter, u
16681668
{
16691669
MCStringRef t_string;
16701670

1671-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
1671+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
16721672
t_new_offset = t_length;
16731673

16741674
if (t_new_offset <= t_old_offset)
@@ -1716,7 +1716,7 @@ static bool MCPropertyParsePointList(MCStringRef p_input, char_t p_delimiter, ui
17161716
MCAutoStringRef t_point_string;
17171717
MCPoint t_point;
17181718

1719-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
1719+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
17201720
t_new_offset = t_length;
17211721

17221722
if (t_new_offset < t_old_offset)

‎engine/src/fieldstyledtext.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ void MCField::parsestyledtextblockarray(MCArrayRef p_block_value, MCParagraph*&
778778
uindex_t t_text_end_index;
779779
t_text_initial_start_index = t_start_index;
780780

781-
if (MCStringFirstIndexOfChar(*t_temp, '\n', t_start_index, kMCStringOptionCompareCaseless, t_text_end_index))
781+
if (MCStringFirstIndexOfChar(*t_temp, '\n', t_start_index, kMCStringOptionCompareExact, t_text_end_index))
782782
{
783783
// MW-2012-05-17: [[ Bug ]] Make sure we reduce the remaining text length since
784784
// we are advancing ptr - otherwise we get random chars at the end of paragraph

‎engine/src/lnxflst.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ MCFontStruct *MCNewFontlist::getfont(MCNameRef p_family, uint2& p_size, uint2 p_
156156
uindex_t t_offset;
157157
MCAutoStringRef t_family_name;
158158
MCStringRef t_family_string = MCNameGetString(p_family);
159-
if (MCStringFirstIndexOfChar(t_family_string, ',', 0, kMCStringOptionCompareCaseless, t_offset))
159+
if (MCStringFirstIndexOfChar(t_family_string, ',', 0, kMCStringOptionCompareExact, t_offset))
160160
{
161161
MCStringCopySubstring(t_family_string, MCRangeMake(0, t_offset), &t_family_name);
162162
t_family_string = *t_family_name;

‎engine/src/objectprops.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,7 @@ static bool MCPropertyParseUIntList(MCStringRef p_input, char_t p_delimiter, uin
22852285
MCAutoStringRef t_uint_string;
22862286
uinteger_t t_d;
22872287

2288-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
2288+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
22892289
t_new_offset = t_length;
22902290

22912291
if (t_new_offset <= t_old_offset)
@@ -2334,7 +2334,7 @@ static bool MCPropertyParseStringList(MCStringRef p_input, char_t p_delimiter, u
23342334
{
23352335
MCStringRef t_string;
23362336

2337-
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareCaseless, t_new_offset))
2337+
if (!MCStringFirstIndexOfChar(p_input, p_delimiter, t_old_offset, kMCCompareExact, t_new_offset))
23382338
t_new_offset = t_length;
23392339

23402340
if (t_new_offset <= t_old_offset)

0 commit comments

Comments
 (0)