Skip to content

Commit 590bb63

Browse files
cwakamocwakamo
authored
Merge pull request #28 from cwakamo/improved-logger-4.2
[4.2] Bring the new PlaygroundLogger implementation into swift-4.2-branch
2 parents 6dfb66f + f2e299a commit 590bb63

File tree

171 files changed

+10223
-2494
lines changed

Some content is hidden

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

171 files changed

+10223
-2494
lines changed

‎Experimental/PlaygroundRuntime/PlaygroundRuntime.xcodeproj/project.pbxproj

Lines changed: 342 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,342 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 48;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
5EB7829A1FAE6CD700ADE84E /* PlaygroundTransformRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EB782991FAE6CD700ADE84E /* PlaygroundTransformRuntime.swift */; };
11+
5EEA48FA1FAFD9920020682B /* PCMacroRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EEA48F91FAFD9920020682B /* PCMacroRuntime.swift */; };
12+
/* End PBXBuildFile section */
13+
14+
/* Begin PBXFileReference section */
15+
5EB7828B1FAE6B6F00ADE84E /* PlaygroundRuntime.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PlaygroundRuntime.framework; sourceTree = BUILT_PRODUCTS_DIR; };
16+
5EB7828F1FAE6B6F00ADE84E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
17+
5EB782991FAE6CD700ADE84E /* PlaygroundTransformRuntime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaygroundTransformRuntime.swift; sourceTree = "<group>"; };
18+
5EEA48F91FAFD9920020682B /* PCMacroRuntime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PCMacroRuntime.swift; sourceTree = "<group>"; };
19+
/* End PBXFileReference section */
20+
21+
/* Begin PBXFrameworksBuildPhase section */
22+
5EB782871FAE6B6F00ADE84E /* Frameworks */ = {
23+
isa = PBXFrameworksBuildPhase;
24+
buildActionMask = 2147483647;
25+
files = (
26+
);
27+
runOnlyForDeploymentPostprocessing = 0;
28+
};
29+
/* End PBXFrameworksBuildPhase section */
30+
31+
/* Begin PBXGroup section */
32+
5EB782811FAE6B6F00ADE84E = {
33+
isa = PBXGroup;
34+
children = (
35+
5EB7828D1FAE6B6F00ADE84E /* PlaygroundRuntime */,
36+
5EB7828C1FAE6B6F00ADE84E /* Products */,
37+
);
38+
sourceTree = "<group>";
39+
};
40+
5EB7828C1FAE6B6F00ADE84E /* Products */ = {
41+
isa = PBXGroup;
42+
children = (
43+
5EB7828B1FAE6B6F00ADE84E /* PlaygroundRuntime.framework */,
44+
);
45+
name = Products;
46+
sourceTree = "<group>";
47+
};
48+
5EB7828D1FAE6B6F00ADE84E /* PlaygroundRuntime */ = {
49+
isa = PBXGroup;
50+
children = (
51+
5EB782991FAE6CD700ADE84E /* PlaygroundTransformRuntime.swift */,
52+
5EEA48F91FAFD9920020682B /* PCMacroRuntime.swift */,
53+
5EB7829F1FAE777900ADE84E /* Supporting Files */,
54+
);
55+
path = PlaygroundRuntime;
56+
sourceTree = "<group>";
57+
};
58+
5EB7829F1FAE777900ADE84E /* Supporting Files */ = {
59+
isa = PBXGroup;
60+
children = (
61+
5EB7828F1FAE6B6F00ADE84E /* Info.plist */,
62+
);
63+
name = "Supporting Files";
64+
sourceTree = "<group>";
65+
};
66+
/* End PBXGroup section */
67+
68+
/* Begin PBXHeadersBuildPhase section */
69+
5EB782881FAE6B6F00ADE84E /* Headers */ = {
70+
isa = PBXHeadersBuildPhase;
71+
buildActionMask = 2147483647;
72+
files = (
73+
);
74+
runOnlyForDeploymentPostprocessing = 0;
75+
};
76+
/* End PBXHeadersBuildPhase section */
77+
78+
/* Begin PBXNativeTarget section */
79+
5EB7828A1FAE6B6F00ADE84E /* PlaygroundRuntime */ = {
80+
isa = PBXNativeTarget;
81+
buildConfigurationList = 5EB782931FAE6B6F00ADE84E /* Build configuration list for PBXNativeTarget "PlaygroundRuntime" */;
82+
buildPhases = (
83+
5EB782861FAE6B6F00ADE84E /* Sources */,
84+
5EB782871FAE6B6F00ADE84E /* Frameworks */,
85+
5EB782881FAE6B6F00ADE84E /* Headers */,
86+
5EB782891FAE6B6F00ADE84E /* Resources */,
87+
);
88+
buildRules = (
89+
);
90+
dependencies = (
91+
);
92+
name = PlaygroundRuntime;
93+
productName = PlaygroundRuntime;
94+
productReference = 5EB7828B1FAE6B6F00ADE84E /* PlaygroundRuntime.framework */;
95+
productType = "com.apple.product-type.framework";
96+
};
97+
/* End PBXNativeTarget section */
98+
99+
/* Begin PBXProject section */
100+
5EB782821FAE6B6F00ADE84E /* Project object */ = {
101+
isa = PBXProject;
102+
attributes = {
103+
LastSwiftUpdateCheck = 0910;
104+
LastUpgradeCheck = 0910;
105+
ORGANIZATIONNAME = "Apple Inc. and the Swift project authors";
106+
TargetAttributes = {
107+
5EB7828A1FAE6B6F00ADE84E = {
108+
CreatedOnToolsVersion = 9.1;
109+
LastSwiftMigration = 0910;
110+
ProvisioningStyle = Automatic;
111+
};
112+
};
113+
};
114+
buildConfigurationList = 5EB782851FAE6B6F00ADE84E /* Build configuration list for PBXProject "PlaygroundRuntime" */;
115+
compatibilityVersion = "Xcode 8.0";
116+
developmentRegion = en;
117+
hasScannedForEncodings = 0;
118+
knownRegions = (
119+
en,
120+
);
121+
mainGroup = 5EB782811FAE6B6F00ADE84E;
122+
productRefGroup = 5EB7828C1FAE6B6F00ADE84E /* Products */;
123+
projectDirPath = "";
124+
projectRoot = "";
125+
targets = (
126+
5EB7828A1FAE6B6F00ADE84E /* PlaygroundRuntime */,
127+
);
128+
};
129+
/* End PBXProject section */
130+
131+
/* Begin PBXResourcesBuildPhase section */
132+
5EB782891FAE6B6F00ADE84E /* Resources */ = {
133+
isa = PBXResourcesBuildPhase;
134+
buildActionMask = 2147483647;
135+
files = (
136+
);
137+
runOnlyForDeploymentPostprocessing = 0;
138+
};
139+
/* End PBXResourcesBuildPhase section */
140+
141+
/* Begin PBXSourcesBuildPhase section */
142+
5EB782861FAE6B6F00ADE84E /* Sources */ = {
143+
isa = PBXSourcesBuildPhase;
144+
buildActionMask = 2147483647;
145+
files = (
146+
5EEA48FA1FAFD9920020682B /* PCMacroRuntime.swift in Sources */,
147+
5EB7829A1FAE6CD700ADE84E /* PlaygroundTransformRuntime.swift in Sources */,
148+
);
149+
runOnlyForDeploymentPostprocessing = 0;
150+
};
151+
/* End PBXSourcesBuildPhase section */
152+
153+
/* Begin XCBuildConfiguration section */
154+
5EB782911FAE6B6F00ADE84E /* Debug */ = {
155+
isa = XCBuildConfiguration;
156+
buildSettings = {
157+
ALWAYS_SEARCH_USER_PATHS = NO;
158+
CLANG_ANALYZER_NONNULL = YES;
159+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
160+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
161+
CLANG_CXX_LIBRARY = "libc++";
162+
CLANG_ENABLE_MODULES = YES;
163+
CLANG_ENABLE_OBJC_ARC = YES;
164+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
165+
CLANG_WARN_BOOL_CONVERSION = YES;
166+
CLANG_WARN_COMMA = YES;
167+
CLANG_WARN_CONSTANT_CONVERSION = YES;
168+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
169+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
170+
CLANG_WARN_EMPTY_BODY = YES;
171+
CLANG_WARN_ENUM_CONVERSION = YES;
172+
CLANG_WARN_INFINITE_RECURSION = YES;
173+
CLANG_WARN_INT_CONVERSION = YES;
174+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
175+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
176+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
177+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
178+
CLANG_WARN_STRICT_PROTOTYPES = YES;
179+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
180+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
181+
CLANG_WARN_UNREACHABLE_CODE = YES;
182+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
183+
CODE_SIGN_IDENTITY = "iPhone Developer";
184+
COPY_PHASE_STRIP = NO;
185+
CURRENT_PROJECT_VERSION = 1;
186+
DEBUG_INFORMATION_FORMAT = dwarf;
187+
ENABLE_STRICT_OBJC_MSGSEND = YES;
188+
ENABLE_TESTABILITY = YES;
189+
GCC_C_LANGUAGE_STANDARD = gnu11;
190+
GCC_DYNAMIC_NO_PIC = NO;
191+
GCC_NO_COMMON_BLOCKS = YES;
192+
GCC_OPTIMIZATION_LEVEL = 0;
193+
GCC_PREPROCESSOR_DEFINITIONS = (
194+
"DEBUG=1",
195+
"$(inherited)",
196+
);
197+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
198+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
199+
GCC_WARN_UNDECLARED_SELECTOR = YES;
200+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
201+
GCC_WARN_UNUSED_FUNCTION = YES;
202+
GCC_WARN_UNUSED_VARIABLE = YES;
203+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
204+
MACOSX_DEPLOYMENT_TARGET = 10.12;
205+
MTL_ENABLE_DEBUG_INFO = YES;
206+
ONLY_ACTIVE_ARCH = YES;
207+
SDKROOT = macosx;
208+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
209+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
210+
TVOS_DEPLOYMENT_TARGET = 10.0;
211+
VERSIONING_SYSTEM = "apple-generic";
212+
VERSION_INFO_PREFIX = "";
213+
};
214+
name = Debug;
215+
};
216+
5EB782921FAE6B6F00ADE84E /* Release */ = {
217+
isa = XCBuildConfiguration;
218+
buildSettings = {
219+
ALWAYS_SEARCH_USER_PATHS = NO;
220+
CLANG_ANALYZER_NONNULL = YES;
221+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
222+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
223+
CLANG_CXX_LIBRARY = "libc++";
224+
CLANG_ENABLE_MODULES = YES;
225+
CLANG_ENABLE_OBJC_ARC = YES;
226+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
227+
CLANG_WARN_BOOL_CONVERSION = YES;
228+
CLANG_WARN_COMMA = YES;
229+
CLANG_WARN_CONSTANT_CONVERSION = YES;
230+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
231+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
232+
CLANG_WARN_EMPTY_BODY = YES;
233+
CLANG_WARN_ENUM_CONVERSION = YES;
234+
CLANG_WARN_INFINITE_RECURSION = YES;
235+
CLANG_WARN_INT_CONVERSION = YES;
236+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
237+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
238+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
239+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
240+
CLANG_WARN_STRICT_PROTOTYPES = YES;
241+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
242+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
243+
CLANG_WARN_UNREACHABLE_CODE = YES;
244+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
245+
CODE_SIGN_IDENTITY = "iPhone Developer";
246+
COPY_PHASE_STRIP = NO;
247+
CURRENT_PROJECT_VERSION = 1;
248+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
249+
ENABLE_NS_ASSERTIONS = NO;
250+
ENABLE_STRICT_OBJC_MSGSEND = YES;
251+
GCC_C_LANGUAGE_STANDARD = gnu11;
252+
GCC_NO_COMMON_BLOCKS = YES;
253+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
254+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
255+
GCC_WARN_UNDECLARED_SELECTOR = YES;
256+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
257+
GCC_WARN_UNUSED_FUNCTION = YES;
258+
GCC_WARN_UNUSED_VARIABLE = YES;
259+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
260+
MACOSX_DEPLOYMENT_TARGET = 10.12;
261+
MTL_ENABLE_DEBUG_INFO = NO;
262+
SDKROOT = macosx;
263+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
264+
TVOS_DEPLOYMENT_TARGET = 10.0;
265+
VALIDATE_PRODUCT = YES;
266+
VERSIONING_SYSTEM = "apple-generic";
267+
VERSION_INFO_PREFIX = "";
268+
};
269+
name = Release;
270+
};
271+
5EB782941FAE6B6F00ADE84E /* Debug */ = {
272+
isa = XCBuildConfiguration;
273+
buildSettings = {
274+
CLANG_ENABLE_MODULES = YES;
275+
CODE_SIGN_IDENTITY = "";
276+
CODE_SIGN_STYLE = Automatic;
277+
DEFINES_MODULE = NO;
278+
DYLIB_COMPATIBILITY_VERSION = 1;
279+
DYLIB_CURRENT_VERSION = 1;
280+
DYLIB_INSTALL_NAME_BASE = "@rpath";
281+
INFOPLIST_FILE = PlaygroundRuntime/Info.plist;
282+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
283+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
284+
OTHER_SWIFT_FLAGS = "-Xfrontend -debugger-support";
285+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.PlaygroundRuntime;
286+
PRODUCT_NAME = "$(TARGET_NAME)";
287+
SKIP_INSTALL = YES;
288+
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
289+
SWIFT_INSTALL_OBJC_HEADER = NO;
290+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
291+
SWIFT_VERSION = 4.0;
292+
};
293+
name = Debug;
294+
};
295+
5EB782951FAE6B6F00ADE84E /* Release */ = {
296+
isa = XCBuildConfiguration;
297+
buildSettings = {
298+
CLANG_ENABLE_MODULES = YES;
299+
CODE_SIGN_IDENTITY = "";
300+
CODE_SIGN_STYLE = Automatic;
301+
DEFINES_MODULE = NO;
302+
DYLIB_COMPATIBILITY_VERSION = 1;
303+
DYLIB_CURRENT_VERSION = 1;
304+
DYLIB_INSTALL_NAME_BASE = "@rpath";
305+
INFOPLIST_FILE = PlaygroundRuntime/Info.plist;
306+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
307+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
308+
OTHER_SWIFT_FLAGS = "-Xfrontend -debugger-support";
309+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.PlaygroundRuntime;
310+
PRODUCT_NAME = "$(TARGET_NAME)";
311+
SKIP_INSTALL = YES;
312+
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
313+
SWIFT_INSTALL_OBJC_HEADER = NO;
314+
SWIFT_VERSION = 4.0;
315+
};
316+
name = Release;
317+
};
318+
/* End XCBuildConfiguration section */
319+
320+
/* Begin XCConfigurationList section */
321+
5EB782851FAE6B6F00ADE84E /* Build configuration list for PBXProject "PlaygroundRuntime" */ = {
322+
isa = XCConfigurationList;
323+
buildConfigurations = (
324+
5EB782911FAE6B6F00ADE84E /* Debug */,
325+
5EB782921FAE6B6F00ADE84E /* Release */,
326+
);
327+
defaultConfigurationIsVisible = 0;
328+
defaultConfigurationName = Release;
329+
};
330+
5EB782931FAE6B6F00ADE84E /* Build configuration list for PBXNativeTarget "PlaygroundRuntime" */ = {
331+
isa = XCConfigurationList;
332+
buildConfigurations = (
333+
5EB782941FAE6B6F00ADE84E /* Debug */,
334+
5EB782951FAE6B6F00ADE84E /* Release */,
335+
);
336+
defaultConfigurationIsVisible = 0;
337+
defaultConfigurationName = Release;
338+
};
339+
/* End XCConfigurationList section */
340+
};
341+
rootObject = 5EB782821FAE6B6F00ADE84E /* Project object */;
342+
}

‎Experimental/PlaygroundRuntime/PlaygroundRuntime.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Experimental/PlaygroundRuntime/PlaygroundRuntime/Info.plist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
<key>NSPrincipalClass</key>
22+
<string></string>
23+
</dict>
24+
</plist>

‎Experimental/PlaygroundRuntime/PlaygroundRuntime/PCMacroRuntime.swift

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//===--- PCMacroRuntime.swift ---------------------------------------------===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) 2017 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
7+
//
8+
// See http://swift.org/LICENSE.txt for license information
9+
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
fileprivate func unsetPCFunction(_: Int, _: Int, _: Int, _: Int) {
14+
fatalError("PC macro runtime uninitialized")
15+
}
16+
17+
public var __builtin_pc_before: @convention(thin) (Int, Int, Int, Int) -> Void = unsetPCFunction
18+
public var __builtin_pc_after: @convention(thin) (Int, Int, Int, Int) -> Void = unsetPCFunction

0 commit comments

Comments
 (0)