minor tweaks to get warnings back down to 0 ; rename MPWMessagePortDescriptor -> ST

mpw · mpw · commit fe401c67bb1c · 2021-02-20T16:02:48.000+01:00
diff --git a/Classes/MPWClassMethodStore.h b/Classes/MPWClassMethodStore.h
@@ -26,5 +26,6 @@
 -(NSDictionary*)externalMethodDict;
 -(MPWMethodCallBack*)addMethodString:(NSString*)methodScript withHeaderString:(NSString*)headerString;
 -(void)installMethodString:(NSString*)methodScript withHeaderString:(NSString*)headerString;
+-(void)installClassMethod:aMethod;
 
 @end
diff --git a/Classes/MPWConnectToDefault.m b/Classes/MPWConnectToDefault.m
@@ -7,7 +7,7 @@
 //
 
 #import "MPWConnectToDefault.h"
-#import "MPWMessagePortDescriptor.h"
+#import "STMessagePortDescriptor.h"
 #import <MPWFoundation/MPWStreamSource.h>
 #import "MPWScheme.h"
 
@@ -68,7 +68,7 @@ @implementation NSObject(connecting)
 
 -defaultInputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:nil sends:NO] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:nil sends:NO] autorelease];
 }
 
 -defaultOutputPort
@@ -96,12 +96,12 @@ @implementation MPWWriteStream(connecting)
 
 -defaultOutputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];
 }
 
 -defaultInputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(Streaming) sends:NO] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(Streaming) sends:NO] autorelease];
 }
 
 +defaultComponentInstance
@@ -116,7 +116,7 @@ @implementation MPWStreamSource(connecting)
 
 -defaultOutputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];
 }
 
 
@@ -133,7 +133,7 @@ @implementation MPWFileBinding(connecting)
 
 //-defaultInputPort
 //{
-//    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"sink" protocol:@protocol(Streaming) sends:NO] autorelease];
+//    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"sink" protocol:@protocol(Streaming) sends:NO] autorelease];
 //}
 //
 
diff --git a/Classes/MPWLiteralDictionaryExpression.m b/Classes/MPWLiteralDictionaryExpression.m
@@ -84,7 +84,7 @@ -(id)evaluateIn:(id)aContext
     MPWLiteralDictionaryExpression *template = [templates at:self.literalClassName];
     if ( template ) {
         factory=[template factoryForContext:aContext];
-        baseDictionary=[template dictionaryForLiteralInContext:aContext class:[NSMutableDictionary class]];
+        baseDictionary=(NSMutableDictionary*)[template dictionaryForLiteralInContext:aContext class:[NSMutableDictionary class]];
     }
     if ( self.literalClassName && !factory ) {
         [NSException raise:@"classnotfound" format:@"Class '%@ not found in literal object expression",self.literalClassName];
diff --git a/Classes/MPWScheme.m b/Classes/MPWScheme.m
@@ -12,7 +12,7 @@
 #import <MPWFoundation/MPWFoundation.h>
 #import <MPWFoundation/NSNil.h>
 #import "MPWEvaluator.h"
-#import "MPWMessagePortDescriptor.h"
+#import "STMessagePortDescriptor.h"
 
 @implementation MPWAbstractStore(SchemeCompatibility)
 
@@ -100,7 +100,7 @@ -(MPWScheme*)cachedBy:cacheScheme
 
 -defaultInputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(MPWStorage) sends:NO] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(MPWStorage) sends:NO] autorelease];
 }
 
 @end
@@ -109,7 +109,7 @@ @implementation MPWMappingStore(ports)
 
 -defaultOutputPort
 {
-    return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"source" protocol:@protocol(MPWStorage) sends:YES] autorelease];
+    return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"source" protocol:@protocol(MPWStorage) sends:YES] autorelease];
 }
 
 
diff --git a/Classes/ObjectiveSmalltalk.h b/Classes/ObjectiveSmalltalk.h
@@ -33,7 +33,7 @@
 #import <ObjectiveSmalltalk/MPWFrameworkScheme.h>
 #import <ObjectiveSmalltalk/MPWGlobalVariableStore.h>
 #import <ObjectiveSmalltalk/MPWGetAccessor.h>
-#import <ObjectiveSmalltalk/MPWMessagePortDescriptor.h>
+#import <ObjectiveSmalltalk/STMessagePortDescriptor.h>
 #import <ObjectiveSmalltalk/MPWMethodCallBack.h>
 #import <ObjectiveSmalltalk/MPWMethodHeader.h>
 #import <ObjectiveSmalltalk/MPWMethodMirror.h>
diff --git a/Classes/STBundle.m b/Classes/STBundle.m
@@ -51,7 +51,7 @@ -(NSString*)path
 
 -(id <MPWHierarchicalStorage>)storeForSubDir:(NSString*)subdir
 {
-    return [[[self binding] referenceByAppendingReference:[subdir asReference]] asScheme];
+    return [[[self binding] referenceByAppendingReference:subdir] asScheme];
 }
 
 -(id <MPWHierarchicalStorage>)resources
@@ -62,7 +62,7 @@ -(NSString*)path
 -(id <MPWReferencing>)resourceRef
 {
     NSString *path=[[self path] stringByAppendingPathComponent:@"Resources"];
-    return [path asReference];
+    return path;
 }
 
 -(MPWWriteBackCache*)createResources
@@ -81,7 +81,7 @@ -(MPWWriteBackCache*)createResources
 
 -(NSArray<NSString*>*)sourceNames
 {
-    return (NSArray<NSString*>*)[[[[[[self sourceDir] childrenOfReference:[@"." asReference]] collect] path] collect] lastPathComponent];
+    return (NSArray<NSString*>*)[[[[[[self sourceDir] childrenOfReference:@"."] collect] path] collect] lastPathComponent];
 }
 
 -(NSDictionary*)readInfo
diff --git a/Classes/STMessagePortDescriptor.h b/Classes/STMessagePortDescriptor.h
@@ -1,5 +1,5 @@
 //
-//  MPWMessagePortDescriptor.h
+//  STMessagePortDescriptor.h
 //  MPWTalk
 //
 //  Created by Marcel Weiher on 8/8/12.
@@ -10,7 +10,7 @@
 
 @class MPWPropertyBinding;
 
-@interface MPWMessagePortDescriptor : NSObject
+@interface STMessagePortDescriptor : NSObject
 {
     MPWPropertyBinding    *target;
     BOOL                isSettable;
@@ -24,6 +24,6 @@ boolAccessor_h(sendsMessages, setSendsMessages)
 boolAccessor_h(isSettable, setIsSettable)
 
 -(BOOL)receivesMessages;
--(BOOL)connect:(MPWMessagePortDescriptor*)other;
+-(BOOL)connect:(STMessagePortDescriptor*)other;
 
 @end
diff --git a/Classes/STMessagePortDescriptor.m b/Classes/STMessagePortDescriptor.m
@@ -1,16 +1,16 @@
 //
-//  MPWMessagePortDescriptor.m
+//  STMessagePortDescriptor.m
 //  MPWTalk
 //
 //  Created by Marcel Weiher on 8/8/12.
 //
 //
 
-#import "MPWMessagePortDescriptor.h"
+#import "STMessagePortDescriptor.h"
 #import <MPWFoundation/MPWFoundation.h>
 //#import <objc/Protocol.h>
 
-@implementation MPWMessagePortDescriptor
+@implementation STMessagePortDescriptor
 
 objectAccessor(MPWPropertyBinding, target, setTarget)
 boolAccessor(sendsMessages, setSendsMessages)
@@ -38,7 +38,7 @@ -(BOOL)receivesMessages
 }
 
 
--(BOOL)isCompatible:(MPWMessagePortDescriptor*)other
+-(BOOL)isCompatible:(STMessagePortDescriptor*)other
 {
 //    NSLog(@"isCompatible self: %@",self);
 //    NSLog(@"other: %@",other);
@@ -56,7 +56,7 @@ -(BOOL)isCompatible:(MPWMessagePortDescriptor*)other
     [[self messageProtocol] isEqual:[other messageProtocol]];
 }
 
--(BOOL)connect:(MPWMessagePortDescriptor*)other
+-(BOOL)connect:(STMessagePortDescriptor*)other
 {
     id connectionTarget=nil,source=nil;
 //    NSLog(@"connect: %@ to %@",self,other);
@@ -89,7 +89,7 @@ -(NSString *)description{
 
 
 
-@implementation MPWMessagePortDescriptor(testing)
+@implementation STMessagePortDescriptor(testing)
 
 +_createInputPortDescriptorForStream:(MPWWriteStream*)s1
 {
@@ -111,14 +111,14 @@ +(void)testConnectMPWFilter
     MPWFilter *s1=[MPWFilter stream];
     MPWFilter *s2=[MPWFilter stream];
   
-    MPWMessagePortDescriptor *input=[self _createInputPortDescriptorForStream:s2];
+    STMessagePortDescriptor *input=[self _createInputPortDescriptorForStream:s2];
 
     EXPECTFALSE([input sendsMessages], @"input port sends messages");
     EXPECTFALSE([input isSettable], @"input port is settable");
     EXPECTTRUE([input receivesMessages], @"input port receives messages");
     IDEXPECT([[input target] value], s2, @"input target");
     
-    MPWMessagePortDescriptor *output=[self _createOutputPortDescriptorForStream:s1];
+    STMessagePortDescriptor *output=[self _createOutputPortDescriptorForStream:s1];
 
     
     EXPECTTRUE([output sendsMessages], @"output port sends messages");
@@ -139,8 +139,8 @@ +(void)testCannotConnectTwoInputs
     MPWFilter *s1=[MPWFilter stream];
     MPWFilter *s2=[MPWFilter stream];
     
-    MPWMessagePortDescriptor *input1=[self _createInputPortDescriptorForStream:s1];
-    MPWMessagePortDescriptor *input2=[self _createInputPortDescriptorForStream:s2];
+    STMessagePortDescriptor *input1=[self _createInputPortDescriptorForStream:s1];
+    STMessagePortDescriptor *input2=[self _createInputPortDescriptorForStream:s2];
     EXPECTFALSE([input1 connect:input2], @"connect two input ports");
 }
 
@@ -150,8 +150,8 @@ +(void)testCannotConnectIncompatibleProtocols
     MPWFilter *s1=[MPWFilter stream];
     MPWFilter *s2=[MPWFilter stream];
     
-    MPWMessagePortDescriptor *input1=[self _createInputPortDescriptorForStream:s1];
-    MPWMessagePortDescriptor *output=[self _createOutputPortDescriptorForStreamWithIncompatibleProtool:s2];
+    STMessagePortDescriptor *input1=[self _createInputPortDescriptorForStream:s1];
+    STMessagePortDescriptor *output=[self _createOutputPortDescriptorForStreamWithIncompatibleProtool:s2];
     EXPECTFALSE([input1 connect:output], @"connect incompatible protocols");
 }
 
diff --git a/GNUmakefile b/GNUmakefile
@@ -70,7 +70,7 @@ libObjectiveSmalltalk_OBJC_FILES = \
     Classes/MPWBlockContext.m \
     Classes/MPWAbstractInterpretedMethod.m \
     Classes/MPWClassMethodStore.m \
-    Classes/MPWMessagePortDescriptor.m \
+    Classes/STMessagePortDescriptor.m \
     Classes/MPWMethodCallBack.m \
     Classes/MPWResource.m \
     Classes/STCompiler.m \
diff --git a/ObjectiveSmalltalk.xcodeproj/project.pbxproj b/ObjectiveSmalltalk.xcodeproj/project.pbxproj
diff --git a/SqliteScheme/MPWSqliteScheme.m b/SqliteScheme/MPWSqliteScheme.m
diff --git a/TestObjectiveSmalltalk/ClassesToTest.plist b/TestObjectiveSmalltalk/ClassesToTest.plist
diff --git a/Tests/MPWStTests.m b/Tests/MPWStTests.m

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`//`
`8`	`8`
`9`	`9`	`#import "MPWConnectToDefault.h"`
`10`		`-#import "MPWMessagePortDescriptor.h"`
	`10`	`+#import "STMessagePortDescriptor.h"`
`11`	`11`	`#import <MPWFoundation/MPWStreamSource.h>`
`12`	`12`	`#import "MPWScheme.h"`
`13`	`13`
`@@ -68,7 +68,7 @@ @implementation NSObject(connecting)`
`68`	`68`
`69`	`69`	`-defaultInputPort`
`70`	`70`	`{`
`71`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:nil sends:NO] autorelease];`
	`71`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:nil sends:NO] autorelease];`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`-defaultOutputPort`
`@@ -96,12 +96,12 @@ @implementation MPWWriteStream(connecting)`
`96`	`96`
`97`	`97`	`-defaultOutputPort`
`98`	`98`	`{`
`99`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];`
	`99`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`-defaultInputPort`
`103`	`103`	`{`
`104`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(Streaming) sends:NO] autorelease];`
	`104`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(Streaming) sends:NO] autorelease];`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`+defaultComponentInstance`
`@@ -116,7 +116,7 @@ @implementation MPWStreamSource(connecting)`
`116`	`116`
`117`	`117`	`-defaultOutputPort`
`118`	`118`	`{`
`119`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];`
	`119`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"target" protocol:@protocol(Streaming) sends:YES] autorelease];`
`120`	`120`	`}`
`121`	`121`
`122`	`122`
`@@ -133,7 +133,7 @@ @implementation MPWFileBinding(connecting)`
`133`	`133`
`134`	`134`	`//-defaultInputPort`
`135`	`135`	`//{`
`136`		`-// return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"sink" protocol:@protocol(Streaming) sends:NO] autorelease];`
	`136`	`+// return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"sink" protocol:@protocol(Streaming) sends:NO] autorelease];`
`137`	`137`	`//}`
`138`	`138`	`//`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ -(id)evaluateIn:(id)aContext`
`84`	`84`	`MPWLiteralDictionaryExpression *template = [templates at:self.literalClassName];`
`85`	`85`	`if ( template ) {`
`86`	`86`	`factory=[template factoryForContext:aContext];`
`87`		`- baseDictionary=[template dictionaryForLiteralInContext:aContext class:[NSMutableDictionary class]];`
	`87`	`+ baseDictionary=(NSMutableDictionary*)[template dictionaryForLiteralInContext:aContext class:[NSMutableDictionary class]];`
`88`	`88`	`}`
`89`	`89`	`if ( self.literalClassName && !factory ) {`
`90`	`90`	`[NSException raise:@"classnotfound" format:@"Class '%@ not found in literal object expression",self.literalClassName];`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#import <MPWFoundation/MPWFoundation.h>`
`13`	`13`	`#import <MPWFoundation/NSNil.h>`
`14`	`14`	`#import "MPWEvaluator.h"`
`15`		`-#import "MPWMessagePortDescriptor.h"`
	`15`	`+#import "STMessagePortDescriptor.h"`
`16`	`16`
`17`	`17`	`@implementation MPWAbstractStore(SchemeCompatibility)`
`18`	`18`
`@@ -100,7 +100,7 @@ -(MPWScheme*)cachedBy:cacheScheme`
`100`	`100`
`101`	`101`	`-defaultInputPort`
`102`	`102`	`{`
`103`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(MPWStorage) sends:NO] autorelease];`
	`103`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:nil protocol:@protocol(MPWStorage) sends:NO] autorelease];`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@end`
`@@ -109,7 +109,7 @@ @implementation MPWMappingStore(ports)`
`109`	`109`
`110`	`110`	`-defaultOutputPort`
`111`	`111`	`{`
`112`		`- return [[[MPWMessagePortDescriptor alloc] initWithTarget:self key:@"source" protocol:@protocol(MPWStorage) sends:YES] autorelease];`
	`112`	`+ return [[[STMessagePortDescriptor alloc] initWithTarget:self key:@"source" protocol:@protocol(MPWStorage) sends:YES] autorelease];`
`113`	`113`	`}`
`114`	`114`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ -(NSString*)path`
`51`	`51`
`52`	`52`	`-(id <MPWHierarchicalStorage>)storeForSubDir:(NSString*)subdir`
`53`	`53`	`{`
`54`		`- return [[[self binding] referenceByAppendingReference:[subdir asReference]] asScheme];`
	`54`	`+ return [[[self binding] referenceByAppendingReference:subdir] asScheme];`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`-(id <MPWHierarchicalStorage>)resources`
`@@ -62,7 +62,7 @@ -(NSString*)path`
`62`	`62`	`-(id <MPWReferencing>)resourceRef`
`63`	`63`	`{`
`64`	`64`	`NSString *path=[[self path] stringByAppendingPathComponent:@"Resources"];`
`65`		`- return [path asReference];`
	`65`	`+ return path;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`-(MPWWriteBackCache*)createResources`
`@@ -81,7 +81,7 @@ -(MPWWriteBackCache*)createResources`
`81`	`81`
`82`	`82`	`-(NSArray<NSString>)sourceNames`
`83`	`83`	`{`
`84`		`- return (NSArray<NSString>)[[[[[[self sourceDir] childrenOfReference:[@"." asReference]] collect] path] collect] lastPathComponent];`
	`84`	`+ return (NSArray<NSString>)[[[[[[self sourceDir] childrenOfReference:@"."] collect] path] collect] lastPathComponent];`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`-(NSDictionary*)readInfo`