Skip to content

Commit 0726e53

Browse files
mpwmpw
committed
misc minor fixes, iOS version working again, exceptions in blocks get surfaced again
1 parent 5244981 commit 0726e53

File tree

12 files changed

+109
-83
lines changed

12 files changed

+109
-83
lines changed

‎Classes/MPWBlockContext.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ +(void)initialize
109109
returnVal = [[[self block] statements] evaluateIn:aContext];
110110
}
111111
} @catch (NSException * exception) {
112-
#if 1
112+
#if 0
113113
id trace = [[[exception callStackSymbols] mutableCopy] autorelease];
114114
if (trace) {
115115
[exception setCombinedStackTrace:trace];
@@ -119,7 +119,7 @@ +(void)initialize
119119
[c addException:exception];
120120
NSLog(@"added exception to %@",c);
121121
#else
122-
@throw newException;
122+
@throw exception;
123123
#endif
124124
}
125125
[returnVal retain];

‎Classes/MPWBoxerUnboxer+MPWBoxingAdditions.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#import "MPWBoxerUnboxer+MPWBoxingAdditions.h"
1010
#import <MPWFoundation/MPWInterval.h>
11+
@import MPWFoundation.PhoneGeometry;
1112

1213

1314
@implementation MPWBoxerUnboxer (MPWBoxingAdditions)

‎Classes/MPWMessageExpression.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ -(NSString*)messageNameForCompletion
6464
retval = [aContext sendMessage:selector to:receiver withArguments:args];
6565
} @catch (id exception) {
6666
exception=[self handleOffsetsInException:exception];
67-
NSLog(@"exception sending message: %@ offset: %@",exception,[exception userInfo]);
67+
NSLog(@"exception sending message '%s': %@ offset: %@",selector,exception,[exception userInfo]);
6868
@throw exception;
6969
}
7070
return retval;

‎ObjectiveSmalltalk.xcodeproj/project.pbxproj

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1F00D791258A2331007C1F68 /* stapp.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F00D790258A2331007C1F68 /* stapp.png */; };
1011
1F084A1516DCE6A200ED2517 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F084A1316DCE6A200ED2517 /* InfoPlist.strings */; };
1112
1F084A1916DCE6A200ED2517 /* ObjSTNative.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F084A1816DCE6A200ED2517 /* ObjSTNative.m */; };
1213
1F084A2016DCE6E600ED2517 /* MPWCodeGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F084A1E16DCE6E600ED2517 /* MPWCodeGenerator.h */; };
@@ -56,6 +57,7 @@
5657
1F2EB8042111D1670086D540 /* MPWFilterDefinition.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F2EB8012111D1670086D540 /* MPWFilterDefinition.h */; settings = {ATTRIBUTES = (Public, ); }; };
5758
1F2EB8052111D1670086D540 /* MPWFilterDefinition.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F2EB8022111D1670086D540 /* MPWFilterDefinition.m */; };
5859
1F2EB8062111D1670086D540 /* MPWFilterDefinition.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F2EB8022111D1670086D540 /* MPWFilterDefinition.m */; };
60+
1F2F6377258A246E00AA7157 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1F2F6376258A246E00AA7157 /* Images.xcassets */; };
5961
1F2F8DBB192C691900A5D1B5 /* MPWMethodDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F2F8DB9192C691900A5D1B5 /* MPWMethodDescriptor.h */; };
6062
1F2F8DBC192C691900A5D1B5 /* MPWMethodDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F2F8DBA192C691900A5D1B5 /* MPWMethodDescriptor.m */; };
6163
1F321C67213334F3001BE6CC /* MPWPropertyPathGetter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F321C65213334F3001BE6CC /* MPWPropertyPathGetter.h */; };
@@ -643,6 +645,7 @@
643645
/* End PBXCopyFilesBuildPhase section */
644646

645647
/* Begin PBXFileReference section */
648+
1F00D790258A2331007C1F68 /* stapp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = stapp.png; sourceTree = "<group>"; };
646649
1F04A53121D253F300E19C3F /* GNUmakefile */ = {isa = PBXFileReference; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; };
647650
1F04A53221D25A1800E19C3F /* testobjectivesmalltalk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = testobjectivesmalltalk.m; path = TestObjectiveSmalltalk/testobjectivesmalltalk.m; sourceTree = "<group>"; };
648651
1F04A53421D25AEB00E19C3F /* makeheaderdir */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = makeheaderdir; sourceTree = "<group>"; };
@@ -710,6 +713,7 @@
710713
1F2EB8012111D1670086D540 /* MPWFilterDefinition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPWFilterDefinition.h; sourceTree = "<group>"; };
711714
1F2EB8022111D1670086D540 /* MPWFilterDefinition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPWFilterDefinition.m; sourceTree = "<group>"; };
712715
1F2F5B3921EF9CA300AB0858 /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; };
716+
1F2F6376258A246E00AA7157 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
713717
1F2F8DB9192C691900A5D1B5 /* MPWMethodDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPWMethodDescriptor.h; sourceTree = "<group>"; };
714718
1F2F8DBA192C691900A5D1B5 /* MPWMethodDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPWMethodDescriptor.m; sourceTree = "<group>"; };
715719
1F2F8DC6192E28AA00A5D1B5 /* MPWShellPrinter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MPWShellPrinter.h; path = ../MPWShellPrinter.h; sourceTree = "<group>"; };
@@ -1340,6 +1344,7 @@
13401344
1F2D95CF2250FCC500D025D8 /* Smalltalk */ = {
13411345
isa = PBXGroup;
13421346
children = (
1347+
1F00D790258A2331007C1F68 /* stapp.png */,
13431348
1FA79D56237B56830044D489 /* stapp.icns */,
13441349
1F2D95D02250FCC500D025D8 /* STAppDelegate.h */,
13451350
1F2D95D12250FCC500D025D8 /* STAppDelegate.m */,
@@ -1353,6 +1358,7 @@
13531358
1F2D95E12250FCC800D025D8 /* Smalltalk.entitlements */,
13541359
1F2D95F22251198D00D025D8 /* STDocument.st */,
13551360
1FEE11D92386EAF20042B149 /* NSApplication.st */,
1361+
1F2F6376258A246E00AA7157 /* Images.xcassets */,
13561362
);
13571363
path = Smalltalk;
13581364
sourceTree = "<group>";
@@ -2433,6 +2439,7 @@
24332439
1F7E059C144B3E22008F349D /* Frameworks */,
24342440
1F7E059D144B3E22008F349D /* Headers */,
24352441
1F7E059E144B3E22008F349D /* Resources */,
2442+
1F34C2002585591D008FF5DC /* Test */,
24362443
);
24372444
buildRules = (
24382445
);
@@ -2693,8 +2700,10 @@
26932700
isa = PBXResourcesBuildPhase;
26942701
buildActionMask = 2147483647;
26952702
files = (
2703+
1F00D791258A2331007C1F68 /* stapp.png in Resources */,
26962704
1F73288A2344B0D300379386 /* STImage.icns in Resources */,
26972705
1F2D95D82250FCC500D025D8 /* Document.xib in Resources */,
2706+
1F2F6377258A246E00AA7157 /* Images.xcassets in Resources */,
26982707
1FA79D57237B56830044D489 /* stapp.icns in Resources */,
26992708
1F2D95DD2250FCC800D025D8 /* MainMenu.xib in Resources */,
27002709
);
@@ -2856,7 +2865,25 @@
28562865
);
28572866
runOnlyForDeploymentPostprocessing = 0;
28582867
shellPath = /bin/sh;
2859-
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\n\nif [ -f ${tester} ] ; then\n$tester -a ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
2868+
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\ncodesign -s - $framework/`basename $framework .framework`\n\nif [ -f ${tester} ] ; then\n$tester -a ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
2869+
};
2870+
1F34C2002585591D008FF5DC /* Test */ = {
2871+
isa = PBXShellScriptBuildPhase;
2872+
buildActionMask = 2147483647;
2873+
files = (
2874+
);
2875+
inputFileListPaths = (
2876+
);
2877+
inputPaths = (
2878+
);
2879+
name = Test;
2880+
outputFileListPaths = (
2881+
);
2882+
outputPaths = (
2883+
);
2884+
runOnlyForDeploymentPostprocessing = 0;
2885+
shellPath = /bin/sh;
2886+
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\ncodesign -s - $framework/`basename $framework .framework`\n\nif [ -f ${tester} ] ; then\n$tester ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
28602887
};
28612888
1F43485C1E216D2A002750C3 /* Test */ = {
28622889
isa = PBXShellScriptBuildPhase;
@@ -2884,7 +2911,7 @@
28842911
);
28852912
runOnlyForDeploymentPostprocessing = 0;
28862913
shellPath = /bin/sh;
2887-
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\n\nif [ -f ${tester} ] ; then\n$tester ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
2914+
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\ncodesign -s - $framework/`basename $framework .framework`\n\nif [ -f ${tester} ] ; then\n$tester ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
28882915
};
28892916
1F6810381E117B54006CE0D1 /* Run Tests */ = {
28902917
isa = PBXShellScriptBuildPhase;
@@ -2930,7 +2957,7 @@
29302957
);
29312958
runOnlyForDeploymentPostprocessing = 0;
29322959
shellPath = /bin/sh;
2933-
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\n\nif [ -f ${tester} ] ; then\n$tester ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
2960+
shellScript = "#!/bin/sh\ntester=/usr/local/bin/testlogger\nframework=${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME}\ncodesign -s - $framework/`basename $framework .framework`\n\nif [ -f ${tester} ] ; then\n$tester ${framework}\nelse\necho \"projectfile:0:1: warning: $tester or $framework not found, tests not run\"\nfi\n";
29342961
};
29352962
1FE63E1821061CDF0066B335 /* Run Tests */ = {
29362963
isa = PBXShellScriptBuildPhase;
@@ -3612,6 +3639,7 @@
36123639
isa = XCBuildConfiguration;
36133640
buildSettings = {
36143641
ALWAYS_SEARCH_USER_PATHS = NO;
3642+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
36153643
CLANG_ANALYZER_NONNULL = YES;
36163644
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
36173645
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -3652,6 +3680,7 @@
36523680
isa = XCBuildConfiguration;
36533681
buildSettings = {
36543682
ALWAYS_SEARCH_USER_PATHS = NO;
3683+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
36553684
CLANG_ANALYZER_NONNULL = YES;
36563685
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
36573686
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -4411,7 +4440,7 @@
44114440
INFOPLIST_FILE = "MethodServer/MethodServer-Info.plist";
44124441
INSTALL_PATH = "@rpath/";
44134442
MACOSX_DEPLOYMENT_TARGET = 10.11;
4414-
ONLY_ACTIVE_ARCH = NO;
4443+
ONLY_ACTIVE_ARCH = YES;
44154444
PRODUCT_BUNDLE_IDENTIFIER = "com.metaobject.${PRODUCT_NAME:rfc1034identifier}";
44164445
PRODUCT_NAME = "$(TARGET_NAME)";
44174446
SDKROOT = macosx;
@@ -4451,7 +4480,7 @@
44514480
INFOPLIST_FILE = "MethodServer/MethodServer-Info.plist";
44524481
INSTALL_PATH = "@rpath/";
44534482
MACOSX_DEPLOYMENT_TARGET = 10.11;
4454-
ONLY_ACTIVE_ARCH = NO;
4483+
ONLY_ACTIVE_ARCH = YES;
44554484
PRODUCT_BUNDLE_IDENTIFIER = "com.metaobject.${PRODUCT_NAME:rfc1034identifier}";
44564485
PRODUCT_NAME = "$(TARGET_NAME)";
44574486
SDKROOT = macosx;
@@ -4602,6 +4631,7 @@
46024631
CLANG_WARN_SUSPICIOUS_MOVE = YES;
46034632
CLANG_WARN_UNREACHABLE_CODE = YES;
46044633
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
4634+
CODE_SIGN_IDENTITY = "-";
46054635
ENABLE_STRICT_OBJC_MSGSEND = YES;
46064636
ENABLE_TESTABILITY = YES;
46074637
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
@@ -4640,6 +4670,7 @@
46404670
CLANG_WARN_SUSPICIOUS_MOVE = YES;
46414671
CLANG_WARN_UNREACHABLE_CODE = YES;
46424672
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
4673+
CODE_SIGN_IDENTITY = "-";
46434674
ENABLE_STRICT_OBJC_MSGSEND = YES;
46444675
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
46454676
GCC_NO_COMMON_BLOCKS = YES;

‎Schemes/MPWTreeNode.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ -(void)renderOn:aRenderer
140140
}
141141
}
142142

143+
-asReference
144+
{
145+
return [MPWGenericReference referenceWithPath:[self path]];
146+
}
147+
143148
-fileSystemPath
144149
{
145150
return [[self content] fileSystemPathForBasePath:[self path]]; // external ...

‎Smalltalk/Images.xcassets/AppIcon.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "stapp.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎Smalltalk/Images.xcassets/AppIcon.imageset/stapp.png

274 KB
Loading

‎Smalltalk/Images.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎Smalltalk/Info.plist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
</array>
3030
<key>CFBundleExecutable</key>
3131
<string>$(EXECUTABLE_NAME)</string>
32-
<key>CFBundleIconFile</key>
33-
<string>stapp.icns</string>
32+
<key>CFBundleIconFiles</key>
33+
<array>
34+
<string>stapp.png</string>
35+
</array>
3436
<key>CFBundleIdentifier</key>
3537
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
3638
<key>CFBundleInfoDictionaryVersion</key>

‎Smalltalk/stapp.png

274 KB
Loading

0 commit comments

Comments
 (0)