Skip to content

Commit 422995d

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into builder-char_as_grapheme
Conflicts: tests/lcb/stdlib/char.lcb
2 parents 6317d54 + db5c670 commit 422995d

32 files changed

Lines changed: 1064 additions & 148 deletions

File tree

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,13 @@
11331133
remoteGlobalIDString = 4DEE29F50FDE41BE0009423C;
11341134
remoteInfo = kernel;
11351135
};
1136+
4D536D8D1AA6142200551A16 /* PBXContainerItemProxy */ = {
1137+
isa = PBXContainerItemProxy;
1138+
containerPortal = C7C148D01A8B5B440048A5AE /* lc-compile.xcodeproj */;
1139+
proxyType = 1;
1140+
remoteGlobalIDString = 4D6F070A19CC36DD00DDC6E0;
1141+
remoteInfo = "lc-compile";
1142+
};
11361143
4D6C797817134897000BCF78 /* PBXContainerItemProxy */ = {
11371144
isa = PBXContainerItemProxy;
11381145
containerPortal = 4D587FCE0B809C3600200116 /* libz.xcodeproj */;
@@ -1357,6 +1364,20 @@
13571364
remoteGlobalIDString = 4DF42A420B048617003F2D95;
13581365
remoteInfo = external;
13591366
};
1367+
5D1353271AA203D400594083 /* PBXContainerItemProxy */ = {
1368+
isa = PBXContainerItemProxy;
1369+
containerPortal = 5D1353231AA203D400594083 /* extensions.xcodeproj */;
1370+
proxyType = 2;
1371+
remoteGlobalIDString = 5D2262B21AA1E72000400628;
1372+
remoteInfo = extensions;
1373+
};
1374+
5D13532D1AA203F400594083 /* PBXContainerItemProxy */ = {
1375+
isa = PBXContainerItemProxy;
1376+
containerPortal = 5D1353231AA203D400594083 /* extensions.xcodeproj */;
1377+
proxyType = 1;
1378+
remoteGlobalIDString = 5D2262B11AA1E72000400628;
1379+
remoteInfo = extensions;
1380+
};
13601381
724459D41A6933AB00D22C2C /* PBXContainerItemProxy */ = {
13611382
isa = PBXContainerItemProxy;
13621383
containerPortal = 7261916C1A260B6C00851787 /* libscript.xcodeproj */;
@@ -2220,6 +2241,7 @@
22202241
4DFFC7DE13DD8A91006233A4 /* syscfdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syscfdate.cpp; path = src/syscfdate.cpp; sourceTree = "<group>"; };
22212242
4DFFC7DF13DD8A91006233A4 /* sysunxnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sysunxnetwork.cpp; path = src/sysunxnetwork.cpp; sourceTree = "<group>"; };
22222243
4DFFC7E613DD8AB9006233A4 /* objectpropsets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = objectpropsets.cpp; path = src/objectpropsets.cpp; sourceTree = "<group>"; };
2244+
5D1353231AA203D400594083 /* extensions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = extensions.xcodeproj; path = ../extensions/extensions.xcodeproj; sourceTree = "<group>"; };
22232245
720E34F519F56FE700EA00ED /* native-layer-ios.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "native-layer-ios.mm"; path = "src/native-layer-ios.mm"; sourceTree = "<group>"; };
22242246
720E34F619F56FE700EA00ED /* native-layer-ios.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "native-layer-ios.h"; path = "src/native-layer-ios.h"; sourceTree = "<group>"; };
22252247
721CAAC018351E1800858545 /* libicui18n.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libicui18n.a; path = ../prebuilt/lib/mac/libicui18n.a; sourceTree = "<group>"; };
@@ -2827,6 +2849,7 @@
28272849
4D587DCC0B8096B000200116 /* Sources */,
28282850
);
28292851
sourceTree = "<group>";
2852+
wrapsLines = 0;
28302853
};
28312854
4D587DA30B80945B00200116 /* Products */ = {
28322855
isa = PBXGroup;
@@ -2892,6 +2915,7 @@
28922915
4D587FAE0B809C0C00200116 /* Projects */ = {
28932916
isa = PBXGroup;
28942917
children = (
2918+
5D1353231AA203D400594083 /* extensions.xcodeproj */,
28952919
C7C148D01A8B5B440048A5AE /* lc-compile.xcodeproj */,
28962920
7261916C1A260B6C00851787 /* libscript.xcodeproj */,
28972921
726191581A26091900851787 /* libffi.xcodeproj */,
@@ -3589,6 +3613,14 @@
35893613
name = System;
35903614
sourceTree = "<group>";
35913615
};
3616+
5D1353241AA203D400594083 /* Products */ = {
3617+
isa = PBXGroup;
3618+
children = (
3619+
5D1353281AA203D400594083 /* libextensions.dylib */,
3620+
);
3621+
name = Products;
3622+
sourceTree = "<group>";
3623+
};
35923624
726191591A26091900851787 /* Products */ = {
35933625
isa = PBXGroup;
35943626
children = (
@@ -4344,6 +4376,7 @@
43444376
buildRules = (
43454377
);
43464378
dependencies = (
4379+
5D13532E1AA203F400594083 /* PBXTargetDependency */,
43474380
4DEE2B2B0FDE42E70009423C /* PBXTargetDependency */,
43484381
4D221ACD171D59F500E7E557 /* PBXTargetDependency */,
43494382
4D1F9C49171C655E0091C6CB /* PBXTargetDependency */,
@@ -4410,6 +4443,7 @@
44104443
4D79B7311A275B0000DD750C /* PBXBuildRule */,
44114444
);
44124445
dependencies = (
4446+
4D536D8E1AA6142200551A16 /* PBXTargetDependency */,
44134447
72D60322184768580022379C /* PBXTargetDependency */,
44144448
4D222014171D730100E7E557 /* PBXTargetDependency */,
44154449
4D8D355B171D4B72009D9D25 /* PBXTargetDependency */,
@@ -4522,6 +4556,10 @@
45224556
productRefGroup = 4D587DA30B80945B00200116 /* Products */;
45234557
projectDirPath = "";
45244558
projectReferences = (
4559+
{
4560+
ProductGroup = 5D1353241AA203D400594083 /* Products */;
4561+
ProjectRef = 5D1353231AA203D400594083 /* extensions.xcodeproj */;
4562+
},
45254563
{
45264564
ProductGroup = C7C148D11A8B5B440048A5AE /* Products */;
45274565
ProjectRef = C7C148D01A8B5B440048A5AE /* lc-compile.xcodeproj */;
@@ -4665,6 +4703,13 @@
46654703
remoteRef = 4DBF58641801CA57009CAB2E /* PBXContainerItemProxy */;
46664704
sourceTree = BUILT_PRODUCTS_DIR;
46674705
};
4706+
5D1353281AA203D400594083 /* libextensions.dylib */ = {
4707+
isa = PBXReferenceProxy;
4708+
fileType = "compiled.mach-o.dylib";
4709+
path = libextensions.dylib;
4710+
remoteRef = 5D1353271AA203D400594083 /* PBXContainerItemProxy */;
4711+
sourceTree = BUILT_PRODUCTS_DIR;
4712+
};
46684713
7261915D1A26091900851787 /* libffi.a */ = {
46694714
isa = PBXReferenceProxy;
46704715
fileType = archive.ar;
@@ -5909,6 +5954,11 @@
59095954
target = 4DEE29F50FDE41BE0009423C /* kernel */;
59105955
targetProxy = 4D2A579B1198634300135143 /* PBXContainerItemProxy */;
59115956
};
5957+
4D536D8E1AA6142200551A16 /* PBXTargetDependency */ = {
5958+
isa = PBXTargetDependency;
5959+
name = "lc-compile";
5960+
targetProxy = 4D536D8D1AA6142200551A16 /* PBXContainerItemProxy */;
5961+
};
59125962
4D79B8FF1A3761BA00DD750C /* PBXTargetDependency */ = {
59135963
isa = PBXTargetDependency;
59145964
name = stdscript;
@@ -6019,6 +6069,11 @@
60196069
name = external;
60206070
targetProxy = 4DEE2BD20FDE4A1E0009423C /* PBXContainerItemProxy */;
60216071
};
6072+
5D13532E1AA203F400594083 /* PBXTargetDependency */ = {
6073+
isa = PBXTargetDependency;
6074+
name = extensions;
6075+
targetProxy = 5D13532D1AA203F400594083 /* PBXContainerItemProxy */;
6076+
};
60226077
724459D51A6933AB00D22C2C /* PBXTargetDependency */ = {
60236078
isa = PBXTargetDependency;
60246079
name = script;

‎engine/src/debug.cpp‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,13 @@ void MCB_prepmessage(MCExecContext &ctxt, MCNameRef mess, uint2 line, uint2 pos,
269269
void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)
270270
{
271271
uint2 i;
272-
273-
if (MCtrace && (MCtraceuntil == MAXUINT2 || MCnexecutioncontexts == MCtraceuntil))
272+
273+
// MW-2015-03-03: [[ Bug 13110 ]] If this is an internal handler as a result of do
274+
// then *don't* debug it.
275+
if (ctxt . GetHandler() -> getname() == MCM_message)
276+
return;
277+
278+
if (MCtrace && (MCtraceuntil == MAXUINT2 || MCnexecutioncontexts == MCtraceuntil))
274279
{
275280
MCtraceuntil = MAXUINT2;
276281
MCB_prepmessage(ctxt, MCM_trace, line, pos, 0);
@@ -286,8 +291,8 @@ void MCB_trace(MCExecContext &ctxt, uint2 line, uint2 pos)
286291
MCParentScriptUse *t_parentscript;
287292
t_parentscript = ctxt . GetParentScript();
288293
if ((t_parentscript == NULL && MCbreakpoints[i].object == ctxt.GetObject()) ||
289-
(t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))
290-
MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
294+
(t_parentscript != NULL && MCbreakpoints[i].object == t_parentscript -> GetParent() -> GetObject()))
295+
MCB_prepmessage(ctxt, MCM_trace_break, line, pos, 0, MCbreakpoints[i].info);
291296
}
292297
}
293298
}

‎engine/src/exec-array.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,11 @@ void MCArraysExecCombineAsSet(MCExecContext& ctxt, MCArrayRef p_array, MCStringR
393393
return;
394394
}
395395
}
396-
397-
MCStringCopy(*t_string, r_string);
396+
397+
if (*t_string == nil)
398+
r_string = MCValueRetain(kMCEmptyString);
399+
else
400+
MCStringCopy(*t_string, r_string);
398401
}
399402

400403
//////////

0 commit comments

Comments
 (0)