Browse Source

Empty BehaviorBody.

Herbert Vojčík 7 years ago
parent
commit
0eadcfeb56
6 changed files with 143 additions and 173 deletions
  1. 82 113
      src/Kernel-Classes.js
  2. 18 23
      src/Kernel-Classes.st
  3. 0 24
      src/Platform-ImportExport.js
  4. 0 6
      src/Platform-ImportExport.st
  5. 37 1
      src/SUnit.js
  6. 6 6
      src/SUnit.st

+ 82 - 113
src/Kernel-Classes.js

@@ -10,117 +10,6 @@ $core.addClass("BehaviorBody", $globals.Object, [], "Kernel-Classes");
 //>>excludeStart("ide", pragmas.excludeIdeData);
 $globals.BehaviorBody.comment="I am the superclass of all behaviors.\x0a\x0aMy instances hold the method dictionary.\x0a\x0aI also provides methods for compiling methods and examining the method dictionary.";
 //>>excludeEnd("ide");
-$core.addMethod(
-$core.method({
-selector: "definition",
-protocol: "accessing",
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._subclassResponsibility();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"definition",{},$globals.BehaviorBody)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "definition\x0a\x09self subclassResponsibility",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["subclassResponsibility"]
-}),
-$globals.BehaviorBody);
-
-$core.addMethod(
-$core.method({
-selector: "printOn:",
-protocol: "printing",
-fn: function (aStream){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1,$receiver;
-$1=self._name();
-if(($receiver = $1) == null || $receiver.isNil){
-(
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = true,
-//>>excludeEnd("ctx");
-($globals.BehaviorBody.superclass||$boot.nilAsClass).fn.prototype._printOn_.apply($recv(self), [aStream]));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.supercall = false;
-//>>excludeEnd("ctx");;
-} else {
-var name;
-name=$receiver;
-$recv(aStream)._nextPutAll_(name);
-}
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"printOn:",{aStream:aStream},$globals.BehaviorBody)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aStream"],
-source: "printOn: aStream\x0a\x09self name\x0a\x09\x09ifNil: [ super printOn: aStream ]\x0a\x09\x09ifNotNil: [ :name | aStream nextPutAll: name ]",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["ifNil:ifNotNil:", "name", "printOn:", "nextPutAll:"]
-}),
-$globals.BehaviorBody);
-
-$core.addMethod(
-$core.method({
-selector: "theMetaClass",
-protocol: "accessing",
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._subclassResponsibility();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"theMetaClass",{},$globals.BehaviorBody)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "theMetaClass\x0a\x09self subclassResponsibility",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["subclassResponsibility"]
-}),
-$globals.BehaviorBody);
-
-$core.addMethod(
-$core.method({
-selector: "theNonMetaClass",
-protocol: "accessing",
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._subclassResponsibility();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"theNonMetaClass",{},$globals.BehaviorBody)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "theNonMetaClass\x0a\x09self subclassResponsibility",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["subclassResponsibility"]
-}),
-$globals.BehaviorBody);
-
 
 
 $core.addClass("Behavior", $globals.BehaviorBody, [], "Kernel-Classes");
@@ -2764,6 +2653,63 @@ messageSends: []
 }),
 $globals.TBehaviorDefaults);
 
+$core.addMethod(
+$core.method({
+selector: "name",
+protocol: "accessing",
+fn: function (){
+var self=this;
+return nil;
+
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "name\x0a\x09^ nil",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: []
+}),
+$globals.TBehaviorDefaults);
+
+$core.addMethod(
+$core.method({
+selector: "printOn:",
+protocol: "printing",
+fn: function (aStream){
+var self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+var $1,$receiver;
+$1=self._name();
+if(($receiver = $1) == null || $receiver.isNil){
+(
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.supercall = true,
+//>>excludeEnd("ctx");
+($globals.TBehaviorDefaults.superclass||$boot.nilAsClass).fn.prototype._printOn_.apply($recv(self), [aStream]));
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+$ctx1.supercall = false;
+//>>excludeEnd("ctx");;
+} else {
+var name;
+name=$receiver;
+$recv(aStream)._nextPutAll_(name);
+}
+return self;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"printOn:",{aStream:aStream},$globals.TBehaviorDefaults)});
+//>>excludeEnd("ctx");
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: ["aStream"],
+source: "printOn: aStream\x0a\x09self name\x0a\x09\x09ifNil: [ super printOn: aStream ]\x0a\x09\x09ifNotNil: [ :name | aStream nextPutAll: name ]",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: ["ifNil:ifNotNil:", "name", "printOn:", "nextPutAll:"]
+}),
+$globals.TBehaviorDefaults);
+
 $core.addMethod(
 $core.method({
 selector: "superclass",
@@ -3726,6 +3672,29 @@ messageSends: ["ifNil:ifNotNil:", "package", "name"]
 }),
 $globals.TMasterBehavior);
 
+$core.addMethod(
+$core.method({
+selector: "classTag",
+protocol: "accessing",
+fn: function (){
+var self=this;
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+return $core.withContext(function($ctx1) {
+//>>excludeEnd("ctx");
+return self._subclassResponsibility();
+//>>excludeStart("ctx", pragmas.excludeDebugContexts);
+}, function($ctx1) {$ctx1.fill(self,"classTag",{},$globals.TMasterBehavior)});
+//>>excludeEnd("ctx");
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "classTag\x0a\x09\x22Every master behavior should define a class tag.\x22\x0a\x09^ self subclassResponsibility",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: ["subclassResponsibility"]
+}),
+$globals.TMasterBehavior);
+
 $core.addMethod(
 $core.method({
 selector: "comment",
@@ -3794,7 +3763,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return self.className || null;
+return self.className;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"name",{},$globals.TMasterBehavior)});
@@ -3802,7 +3771,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "name\x0a\x09<inlineJS: 'return self.className || null'>",
+source: "name\x0a\x09<inlineJS: 'return self.className'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []

+ 18 - 23
src/Kernel-Classes.st

@@ -9,28 +9,6 @@ My instances hold the method dictionary.
 
 I also provides methods for compiling methods and examining the method dictionary.!
 
-!BehaviorBody methodsFor: 'accessing'!
-
-definition
-	self subclassResponsibility
-!
-
-theMetaClass
-	self subclassResponsibility
-!
-
-theNonMetaClass
-	self subclassResponsibility
-! !
-
-!BehaviorBody methodsFor: 'printing'!
-
-printOn: aStream
-	self name
-		ifNil: [ super printOn: aStream ]
-		ifNotNil: [ :name | aStream nextPutAll: name ]
-! !
-
 BehaviorBody subclass: #Behavior
 	instanceVariableNames: ''
 	package: 'Kernel-Classes'!
@@ -715,6 +693,10 @@ allInstanceVariableNames
 	^ #()
 !
 
+name
+	^ nil
+!
+
 superclass
 	"Default for non-classes; to be able to send #superclass to any class / trait."
 	^ nil
@@ -731,6 +713,14 @@ allSubclassesDo: aBlock
 	"Default for non-classes; to be able to send #allSubclassesDo: to any class / trait."
 ! !
 
+!TBehaviorDefaults methodsFor: 'printing'!
+
+printOn: aStream
+	self name
+		ifNil: [ super printOn: aStream ]
+		ifNotNil: [ :name | aStream nextPutAll: name ]
+! !
+
 Trait named: #TBehaviorProvider
 	package: 'Kernel-Classes'!
 !TBehaviorProvider commentStamp!
@@ -945,6 +935,11 @@ category
 	^ self package ifNil: [ 'Unclassified' ] ifNotNil: [ self package name ]
 !
 
+classTag
+	"Every master behavior should define a class tag."
+	^ self subclassResponsibility
+!
+
 comment
 	^ (self basicAt: 'comment') ifNil: [ '' ]
 !
@@ -958,7 +953,7 @@ comment: aString
 !
 
 name
-	<inlineJS: 'return self.className || null'>
+	<inlineJS: 'return self.className'>
 !
 
 package

+ 0 - 24
src/Platform-ImportExport.js

@@ -4318,30 +4318,6 @@ messageSends: ["methodsFor:"]
 }),
 $globals.TBehaviorProvider);
 
-$core.addMethod(
-$core.method({
-selector: "exportBehaviorDefinitionTo:using:",
-protocol: "*Platform-ImportExport",
-fn: function (aStream,anExporter){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._subclassResponsibility();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"exportBehaviorDefinitionTo:using:",{aStream:aStream,anExporter:anExporter},$globals.BehaviorBody)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aStream", "anExporter"],
-source: "exportBehaviorDefinitionTo: aStream using: anExporter\x0a\x09self subclassResponsibility",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["subclassResponsibility"]
-}),
-$globals.BehaviorBody);
-
 $core.addMethod(
 $core.method({
 selector: "commentStamp",

+ 0 - 6
src/Platform-ImportExport.st

@@ -1120,12 +1120,6 @@ namespace: aString
 		yourself
 ! !
 
-!BehaviorBody methodsFor: '*Platform-ImportExport'!
-
-exportBehaviorDefinitionTo: aStream using: anExporter
-	self subclassResponsibility
-! !
-
 !Class methodsFor: '*Platform-ImportExport'!
 
 exportBehaviorDefinitionTo: aStream using: anExporter

+ 37 - 1
src/SUnit.js

@@ -1783,7 +1783,7 @@ referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
 }),
-$globals.BehaviorBody);
+$globals.TBehaviorDefaults);
 
 $core.addMethod(
 $core.method({
@@ -1816,4 +1816,40 @@ messageSends: ["anySatisfy:", "classes", "isTestClass"]
 }),
 $globals.Package);
 
+$core.addMethod(
+$core.method({
+selector: "isTestClass",
+protocol: "*SUnit",
+fn: function (){
+var self=this;
+return false;
+
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "isTestClass\x0a\x09^ false",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: []
+}),
+$globals.TBehaviorDefaults);
+
+$core.addMethod(
+$core.method({
+selector: "isTestClass",
+protocol: "*SUnit",
+fn: function (){
+var self=this;
+return false;
+
+},
+//>>excludeStart("ide", pragmas.excludeIdeData);
+args: [],
+source: "isTestClass\x0a\x09^ false",
+referencedClasses: [],
+//>>excludeEnd("ide");
+messageSends: []
+}),
+$globals.TBehaviorDefaults);
+
 });

+ 6 - 6
src/SUnit.st

@@ -446,15 +446,15 @@ on: aCollection
 	^ super new suite: aCollection
 ! !
 
-!BehaviorBody methodsFor: '*SUnit'!
-
-isTestClass
-	^ false
-! !
-
 !Package methodsFor: '*SUnit'!
 
 isTestPackage
 	^ self classes anySatisfy: [ :each | each isTestClass ]
 ! !
 
+!TBehaviorDefaults methodsFor: '*SUnit'!
+
+isTestClass
+	^ false
+! !
+