Skip to content

Commit 2e00be1

Browse files
author
Fraser J. Gordon
committed
Merge branch 'refactor-syntax_unicode' into refactor-syntax_unicode_execcontexts
Conflicts: engine/src/debug.cpp
2 parents 9a620f9 + 2933297 commit 2e00be1

File tree

159 files changed

+4651
-8874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+4651
-8874
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ stacksecurity_encrypted.cpp
1919

2020
# Compiled source #
2121
###################
22+
*.i
23+
*.ii
2224
*.com
2325
*.class
2426
*.dll

‎engine/Makefile.kernel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SOURCES=\
5151
exec-interface-aclip.cpp exec-interface-button.cpp exec-interface-card.cpp exec-interface-control.cpp \
5252
exec-interface-field.cpp exec-interface-graphic.cpp exec-interface-group.cpp exec-interface-image.cpp \
5353
exec-interface-object.cpp exec-interface-player.cpp exec-interface-scrollbar.cpp exec-interface-stack.cpp \
54-
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp \
54+
exec-interface-vclip.cpp exec-legacy.cpp exec-dialog.cpp exec-strings-chunk.cpp \
5555
syntax.cpp \
5656
foundation-legacy.cpp legacy_spec.cpp
5757

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@
274274
768D66C317622FE200F203A3 /* exec-nativecontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C117622FE100F203A3 /* exec-nativecontrol.cpp */; };
275275
768D66C51765E11300F203A3 /* exec-pick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C41765E11300F203A3 /* exec-pick.cpp */; };
276276
768D66C61765E11300F203A3 /* exec-pick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 768D66C41765E11300F203A3 /* exec-pick.cpp */; };
277+
BE02B4FB17FEC652001BAFF0 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE02B4FA17FEC639001BAFF0 /* exec-strings-chunk.cpp */; };
277278
BE096E8B175CD7CF00F92F90 /* libfoundationmobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE096E85175CD79D00F92F90 /* libfoundationmobile.a */; };
278279
BE0A3CD417E1FD2500C2361B /* mblnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE0A3CD317E1FC9E00C2361B /* mblnetwork.cpp */; };
279280
BE4494AE175CDCB900346B49 /* foundation-legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE4494AD175CDCB400346B49 /* foundation-legacy.cpp */; };
@@ -890,6 +891,7 @@
890891
7607CFD5176B232E00ADB512 /* mblandroidmediapick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidmediapick.cpp; path = src/mblandroidmediapick.cpp; sourceTree = "<group>"; };
891892
768D66C117622FE100F203A3 /* exec-nativecontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-nativecontrol.cpp"; path = "src/exec-nativecontrol.cpp"; sourceTree = "<group>"; };
892893
768D66C41765E11300F203A3 /* exec-pick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-pick.cpp"; path = "src/exec-pick.cpp"; sourceTree = "<group>"; };
894+
BE02B4FA17FEC639001BAFF0 /* exec-strings-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-strings-chunk.cpp"; path = "src/exec-strings-chunk.cpp"; sourceTree = "<group>"; };
893895
BE096E7D175CD79D00F92F90 /* libfoundation-mobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libfoundation-mobile.xcodeproj"; path = "../libfoundation/libfoundation-mobile.xcodeproj"; sourceTree = SOURCE_ROOT; };
894896
BE0A3CD317E1FC9E00C2361B /* mblnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblnetwork.cpp; path = src/mblnetwork.cpp; sourceTree = "<group>"; };
895897
BE4494AD175CDCB400346B49 /* foundation-legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "foundation-legacy.cpp"; path = "src/foundation-legacy.cpp"; sourceTree = "<group>"; };
@@ -1408,7 +1410,6 @@
14081410
BE4494B6175CDE4E00346B49 /* Exec */ = {
14091411
isa = PBXGroup;
14101412
children = (
1411-
7607CF7F1769BB9B00ADB512 /* Exec-Interface */,
14121413
BE940439175F74D2003EAB87 /* exec-ad.cpp */,
14131414
BE94042A175F6307003EAB87 /* exec-addressbook.cpp */,
14141415
BE4494B7175CDE7400346B49 /* exec-array.cpp */,
@@ -1442,10 +1443,12 @@
14421443
BE4494D9175CDE7400346B49 /* exec-server.cpp */,
14431444
BE9459481761E219008408DE /* exec-sound.cpp */,
14441445
BE7506EF175E0BD200A339DA /* exec-store.cpp */,
1446+
BE02B4FA17FEC639001BAFF0 /* exec-strings-chunk.cpp */,
14451447
BE4494DA175CDE7400346B49 /* exec-strings.cpp */,
14461448
BE4494DB175CDE7400346B49 /* exec-text.cpp */,
14471449
BE449997175D02AE00346B49 /* exec-textmessaging.cpp */,
14481450
BE4494DC175CDE7400346B49 /* exec.cpp */,
1451+
7607CF7F1769BB9B00ADB512 /* Exec-Interface */,
14491452
);
14501453
name = Exec;
14511454
sourceTree = "<group>";
@@ -2351,6 +2354,7 @@
23512354
7607CF7D1769BB4D00ADB512 /* exec-interface.cpp in Sources */,
23522355
7607CF7E1769BB4D00ADB512 /* exec-interface2.cpp in Sources */,
23532356
BE0A3CD417E1FD2500C2361B /* mblnetwork.cpp in Sources */,
2357+
BE02B4FB17FEC652001BAFF0 /* exec-strings-chunk.cpp in Sources */,
23542358
);
23552359
runOnlyForDeploymentPostprocessing = 0;
23562360
};

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@
559559
4DFFC7E013DD8A91006233A4 /* syscfdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7DE13DD8A91006233A4 /* syscfdate.cpp */; };
560560
4DFFC7E113DD8A91006233A4 /* sysunxnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7DF13DD8A91006233A4 /* sysunxnetwork.cpp */; };
561561
4DFFC7E713DD8AB9006233A4 /* objectpropsets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFC7E613DD8AB9006233A4 /* objectpropsets.cpp */; };
562+
76FA930A17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */; };
563+
76FA930B17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */; };
562564
A71F80540F4F178C003012FD /* Standalone.icns in Resources */ = {isa = PBXBuildFile; fileRef = A71F80530F4F178C003012FD /* Standalone.icns */; };
563565
A71F80550F4F17C1003012FD /* LiveCode.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D5885610B80DEAC00200116 /* LiveCode.icns */; };
564566
A71F80620F4F17F9003012FD /* StandaloneDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = A71F80610F4F17F9003012FD /* StandaloneDoc.icns */; };
@@ -1257,6 +1259,7 @@
12571259
4D8387241678B2F4003BEC7C /* flst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flst.h; path = src/flst.h; sourceTree = "<group>"; };
12581260
4D8387251678B2F4003BEC7C /* image_rep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = image_rep.h; path = src/image_rep.h; sourceTree = "<group>"; };
12591261
4D8387261678B2F4003BEC7C /* imagebitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imagebitmap.h; path = src/imagebitmap.h; sourceTree = "<group>"; };
1262+
4D8395DD17FECEB30002D53E /* dsklnx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dsklnx.cpp; path = src/dsklnx.cpp; sourceTree = "<group>"; };
12601263
4D88B73815F4C66F002CFBD6 /* libgif.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libgif.xcodeproj; path = ../thirdparty/libgif/libgif.xcodeproj; sourceTree = SOURCE_ROOT; };
12611264
4D8B47960BE7B3240046CD2F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
12621265
4D8BEC3F11B9379500DED42A /* osxicon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = osxicon.cpp; path = src/osxicon.cpp; sourceTree = "<group>"; };
@@ -1524,6 +1527,7 @@
15241527
768D66A21762087500F203A3 /* mbliphonesensor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonesensor.mm; path = src/mbliphonesensor.mm; sourceTree = "<group>"; };
15251528
768D66A31762087500F203A3 /* mbliphonestore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonestore.mm; path = src/mbliphonestore.mm; sourceTree = "<group>"; };
15261529
768D66A41762087500F203A3 /* mbliphonetextmessaging.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonetextmessaging.mm; path = src/mbliphonetextmessaging.mm; sourceTree = "<group>"; };
1530+
76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-strings-chunk.cpp"; path = "src/exec-strings-chunk.cpp"; sourceTree = "<group>"; };
15271531
A04643DB0BAAA63A0030A830 /* w32ans.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = w32ans.cpp; path = src/w32ans.cpp; sourceTree = "<group>"; };
15281532
A04643DC0BAAA63A0030A830 /* w32context.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = w32context.cpp; path = src/w32context.cpp; sourceTree = "<group>"; };
15291533
A04643DD0BAAA63A0030A830 /* w32context.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = w32context.h; path = src/w32context.h; sourceTree = "<group>"; };
@@ -2343,6 +2347,7 @@
23432347
4DE3B0EE15888AA1008EB6B5 /* Exec */ = {
23442348
isa = PBXGroup;
23452349
children = (
2350+
76FA930917FC72FB003DB770 /* exec-strings-chunk.cpp */,
23462351
768D665F1762076000F203A3 /* exec-ad.cpp */,
23472352
768D66601762076000F203A3 /* exec-addressbook.cpp */,
23482353
768D66611762076000F203A3 /* exec-idletimer.cpp */,
@@ -2384,6 +2389,7 @@
23842389
4DE7ED0B13B33B4E002634F5 /* Desktop */ = {
23852390
isa = PBXGroup;
23862391
children = (
2392+
4D8395DD17FECEB30002D53E /* dsklnx.cpp */,
23872393
BEFE81D317B2B32800C9D14F /* dskmac.cpp */,
23882394
4D05B90C13E06AAB001CD82A /* dsklnxmain.cpp */,
23892395
4D05B90D13E06AAB001CD82A /* dskmain.cpp */,
@@ -3753,6 +3759,7 @@
37533759
BEFE81D417B2B32800C9D14F /* dskmac.cpp in Sources */,
37543760
BEFD23CD17B5233800B9310D /* sysspec.cpp in Sources */,
37553761
1D17A9C317BE673E0024CCA8 /* osxans.mm in Sources */,
3762+
76FA930A17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */,
37563763
);
37573764
runOnlyForDeploymentPostprocessing = 0;
37583765
};
@@ -3801,6 +3808,7 @@
38013808
4D02A3CA17A6CBE1009D8AF4 /* syntax.cpp in Sources */,
38023809
4D02A3CF17A6CC14009D8AF4 /* foundation-legacy.cpp in Sources */,
38033810
4D02A3E417A6CE55009D8AF4 /* legacy_spec.cpp in Sources */,
3811+
76FA930B17FC7301003DB770 /* exec-strings-chunk.cpp in Sources */,
38043812
);
38053813
runOnlyForDeploymentPostprocessing = 0;
38063814
};

‎engine/kernel.vcproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,6 +1446,24 @@
14461446
<File
14471447
RelativePath=".\src\dskw32.cpp"
14481448
>
1449+
<FileConfiguration
1450+
Name="Debug|Win32"
1451+
>
1452+
<Tool
1453+
Name="VCCLCompilerTool"
1454+
PrecompiledHeaderThrough="w32prefix.h"
1455+
PrecompiledHeaderFile="$(IntDir)\w32$(TargetName).pch"
1456+
/>
1457+
</FileConfiguration>
1458+
<FileConfiguration
1459+
Name="Release|Win32"
1460+
>
1461+
<Tool
1462+
Name="VCCLCompilerTool"
1463+
PrecompiledHeaderThrough="w32prefix.h"
1464+
PrecompiledHeaderFile="$(IntDir)\w32$(TargetName).pch"
1465+
/>
1466+
</FileConfiguration>
14491467
</File>
14501468
<File
14511469
RelativePath=".\src\dskw32main.cpp"
@@ -6508,6 +6526,10 @@
65086526
RelativePath=".\src\exec-store.cpp"
65096527
>
65106528
</File>
6529+
<File
6530+
RelativePath=".\src\exec-strings-chunk.cpp"
6531+
>
6532+
</File>
65116533
<File
65126534
RelativePath=".\src\exec-strings.cpp"
65136535
>

‎engine/src/bitmapeffect.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -700,11 +700,11 @@ Exec_stat MCBitmapEffectSetProperty(MCBitmapEffect *self, MCBitmapEffectProperty
700700
case kMCBitmapEffectPropertyBlendMode:
701701
{
702702
MCBitmapEffectBlendMode t_new_mode;
703-
if (MCStringIsEqualToCString(*t_data, "normal", kMCCompareExact))
703+
if (MCStringIsEqualToCString(*t_data, "normal", kMCCompareCaseless))
704704
t_new_mode = kMCBitmapEffectBlendModeNormal;
705-
else if (MCStringIsEqualToCString(*t_data, "multiply", kMCCompareExact))
705+
else if (MCStringIsEqualToCString(*t_data, "multiply", kMCCompareCaseless))
706706
t_new_mode = kMCBitmapEffectBlendModeMultiply;
707-
else if (MCStringIsEqualToCString(*t_data, "colordodge", kMCCompareExact))
707+
else if (MCStringIsEqualToCString(*t_data, "colordodge", kMCCompareCaseless))
708708
t_new_mode = kMCBitmapEffectBlendModeColorDodge;
709709
else
710710
{
@@ -735,13 +735,13 @@ Exec_stat MCBitmapEffectSetProperty(MCBitmapEffect *self, MCBitmapEffectProperty
735735
case kMCBitmapEffectPropertyFilter:
736736
{
737737
MCBitmapEffectFilter t_new_filter;
738-
if (MCStringIsEqualToCString(*t_data, "gaussian", kMCCompareExact))
738+
if (MCStringIsEqualToCString(*t_data, "gaussian", kMCCompareCaseless))
739739
t_new_filter = kMCBitmapEffectFilterFastGaussian;
740-
else if (MCStringIsEqualToCString(*t_data, "box1pass", kMCCompareExact))
740+
else if (MCStringIsEqualToCString(*t_data, "box1pass", kMCCompareCaseless))
741741
t_new_filter = kMCBitmapEffectFilterOnePassBox;
742-
else if (MCStringIsEqualToCString(*t_data, "box2pass", kMCCompareExact))
742+
else if (MCStringIsEqualToCString(*t_data, "box2pass", kMCCompareCaseless))
743743
t_new_filter = kMCBitmapEffectFilterTwoPassBox;
744-
else if (MCStringIsEqualToCString(*t_data, "box3pass", kMCCompareExact))
744+
else if (MCStringIsEqualToCString(*t_data, "box3pass", kMCCompareCaseless))
745745
t_new_filter = kMCBitmapEffectFilterThreePassBox;
746746
else
747747
{

‎engine/src/block.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ void MCBlock::draw(MCDC *dc, int2 x, int2 cx, int2 y, uint2 si, uint2 ei, const
12851285
{
12861286
MCRectangle t_box;
12871287
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);
12891289
}
12901290
}
12911291

0 commit comments

Comments
 (0)