Browse Source

Smalltalk deprecations removed.

Herbert Vojčík 9 years ago
parent
commit
2c3d8c54f5

+ 0 - 51
src/Kernel-Announcements.js

@@ -46,57 +46,6 @@ messageSends: []
 }),
 }),
 $globals.AnnouncementSubscription);
 $globals.AnnouncementSubscription);
 
 
-$core.addMethod(
-$core.method({
-selector: "block",
-protocol: 'accessing',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=self._valuable();
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"block",{},$globals.AnnouncementSubscription)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "block\x0a\x09\x22Use #valuable instead\x22\x0a\x09\x0a\x09self deprecatedAPI.\x0a\x09^ self valuable",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "valuable"]
-}),
-$globals.AnnouncementSubscription);
-
-$core.addMethod(
-$core.method({
-selector: "block:",
-protocol: 'accessing',
-fn: function (aValuable){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._deprecatedAPI();
-self._valuable_(aValuable);
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"block:",{aValuable:aValuable},$globals.AnnouncementSubscription)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aValuable"],
-source: "block: aValuable\x0a\x09\x22Use #valuable instead\x22\x0a\x09\x0a\x09self deprecatedAPI.\x0a\x09self valuable: aValuable",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "valuable:"]
-}),
-$globals.AnnouncementSubscription);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "deliver:",
 selector: "deliver:",

+ 0 - 14
src/Kernel-Announcements.st

@@ -16,20 +16,6 @@ announcementClass: aClass
 	announcementClass := aClass
 	announcementClass := aClass
 !
 !
 
 
-block
-	"Use #valuable instead"
-	
-	self deprecatedAPI.
-	^ self valuable
-!
-
-block: aValuable
-	"Use #valuable instead"
-	
-	self deprecatedAPI.
-	self valuable: aValuable
-!
-
 receiver
 receiver
 	^ self valuable receiver
 	^ self valuable receiver
 !
 !

+ 0 - 52
src/Kernel-Collections.js

@@ -781,32 +781,6 @@ messageSends: ["writeStream", "new", "class", "do:", "nextPut:", "value:", "cont
 }),
 }),
 $globals.Collection);
 $globals.Collection);
 
 
-$core.addMethod(
-$core.method({
-selector: "contains:",
-protocol: 'testing',
-fn: function (aBlock){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=self._anySatisfy_(aBlock);
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"contains:",{aBlock:aBlock},$globals.Collection)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aBlock"],
-source: "contains: aBlock\x0a\x09self deprecatedAPI.\x0a\x0a\x09^ self anySatisfy: aBlock",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "anySatisfy:"]
-}),
-$globals.Collection);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "copyWith:",
 selector: "copyWith:",
@@ -6306,32 +6280,6 @@ messageSends: ["fromString:"]
 }),
 }),
 $globals.String);
 $globals.String);
 
 
-$core.addMethod(
-$core.method({
-selector: "asSelector",
-protocol: 'converting',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI_("Use #asJavaScriptMethodName");
-$1=self._asJavaScriptMethodName();
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"asSelector",{},$globals.String)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "asSelector\x0a\x09self deprecatedAPI: 'Use #asJavaScriptMethodName'.\x0a\x09^ self asJavaScriptMethodName",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI:", "asJavaScriptMethodName"]
-}),
-$globals.String);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "asString",
 selector: "asString",

+ 0 - 11
src/Kernel-Collections.st

@@ -352,12 +352,6 @@ putOn: aStream
 
 
 !Collection methodsFor: 'testing'!
 !Collection methodsFor: 'testing'!
 
 
-contains: aBlock
-	self deprecatedAPI.
-
-	^ self anySatisfy: aBlock
-!
-
 ifEmpty: aBlock
 ifEmpty: aBlock
 	"Evaluate the given block with the receiver as argument, answering its value if the receiver is empty, otherwise answer the receiver. 
 	"Evaluate the given block with the receiver as argument, answering its value if the receiver is empty, otherwise answer the receiver. 
 	Note that the fact that this method returns its argument in case the receiver is not empty allows one to write expressions like the following ones: 
 	Note that the fact that this method returns its argument in case the receiver is not empty allows one to write expressions like the following ones: 
@@ -1529,11 +1523,6 @@ asRegexp
 	^ RegularExpression fromString: self
 	^ RegularExpression fromString: self
 !
 !
 
 
-asSelector
-	self deprecatedAPI: 'Use #asJavaScriptMethodName'.
-	^ self asJavaScriptMethodName
-!
-
 asString
 asString
 	^ self
 	^ self
 !
 !

+ 0 - 183
src/Kernel-Infrastructure.js

@@ -4193,84 +4193,6 @@ messageSends: ["ifTrue:ifFalse:", "and:", "isSmalltalkObject:", "isKindOf:", "on
 }),
 }),
 $globals.SmalltalkImage);
 $globals.SmalltalkImage);
 
 
-$core.addMethod(
-$core.method({
-selector: "at:",
-protocol: 'accessing',
-fn: function (aString){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=$recv(self._globals())._at_(aString);
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"at:",{aString:aString},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aString"],
-source: "at: aString\x0a\x09self deprecatedAPI.\x0a\x09^ self globals at: aString",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "at:", "globals"]
-}),
-$globals.SmalltalkImage);
-
-$core.addMethod(
-$core.method({
-selector: "at:ifAbsent:",
-protocol: 'accessing',
-fn: function (aKey,aBlock){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=$recv(self._globals())._at_ifAbsent_(aKey,aBlock);
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"at:ifAbsent:",{aKey:aKey,aBlock:aBlock},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aKey", "aBlock"],
-source: "at: aKey ifAbsent: aBlock\x0a\x09self deprecatedAPI.\x0a\x09^ self globals at: aKey ifAbsent: aBlock",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "at:ifAbsent:", "globals"]
-}),
-$globals.SmalltalkImage);
-
-$core.addMethod(
-$core.method({
-selector: "at:put:",
-protocol: 'accessing',
-fn: function (aString,anObject){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=$recv(self._globals())._at_put_(aString,anObject);
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"at:put:",{aString:aString,anObject:anObject},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aString", "anObject"],
-source: "at: aString put: anObject\x0a\x09self deprecatedAPI.\x0a\x09^ self globals at: aString put: anObject",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "at:put:", "globals"]
-}),
-$globals.SmalltalkImage);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "basicCreatePackage:",
 selector: "basicCreatePackage:",
@@ -4403,60 +4325,6 @@ messageSends: ["basicCreatePackage:", "package:", "new", "yourself", "announce:"
 }),
 }),
 $globals.SmalltalkImage);
 $globals.SmalltalkImage);
 
 
-$core.addMethod(
-$core.method({
-selector: "createPackage:properties:",
-protocol: 'private',
-fn: function (packageName,aDict){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1,$2;
-self._deprecatedAPI();
-$1=$recv(aDict)._isEmpty();
-if(!$core.assert($1)){
-self._error_("createPackage:properties: called with nonempty properties");
-};
-$2=self._createPackage_(packageName);
-return $2;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"createPackage:properties:",{packageName:packageName,aDict:aDict},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["packageName", "aDict"],
-source: "createPackage: packageName properties: aDict\x0a\x09\x22Needed to import .st files: they begin with this call.\x22\x0a\x09self deprecatedAPI.\x0a\x09\x0a\x09aDict isEmpty ifFalse: [ self error: 'createPackage:properties: called with nonempty properties' ].\x0a\x09^ self createPackage: packageName",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "ifFalse:", "isEmpty", "error:", "createPackage:"]
-}),
-$globals.SmalltalkImage);
-
-$core.addMethod(
-$core.method({
-selector: "current",
-protocol: 'accessing',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-self._deprecatedAPI();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"current",{},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "current\x0a\x09\x22Backward compatibility for Smalltalk current ...\x22\x0a\x09self deprecatedAPI.\x0a\x09^ self",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI"]
-}),
-$globals.SmalltalkImage);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "defaultAmdNamespace",
 selector: "defaultAmdNamespace",
@@ -5086,32 +4954,6 @@ messageSends: []
 }),
 }),
 $globals.SmalltalkImage);
 $globals.SmalltalkImage);
 
 
-$core.addMethod(
-$core.method({
-selector: "vm",
-protocol: 'accessing',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI_("Use #core");
-$1=self._core();
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"vm",{},$globals.SmalltalkImage)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "vm\x0a\x09self deprecatedAPI: 'Use #core'.\x0a\x09^self core",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI:", "core"]
-}),
-$globals.SmalltalkImage);
-
 
 
 $globals.SmalltalkImage.klass.iVarNames = ['current'];
 $globals.SmalltalkImage.klass.iVarNames = ['current'];
 $core.addMethod(
 $core.addMethod(
@@ -5252,31 +5094,6 @@ messageSends: []
 }),
 }),
 $globals.String);
 $globals.String);
 
 
-$core.addMethod(
-$core.method({
-selector: "asJavaScriptSelector",
-protocol: '*Kernel-Infrastructure',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-$1=self._asJavaScriptPropertyName();
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"asJavaScriptSelector",{},$globals.String)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "asJavaScriptSelector\x0a\x09\x22Cannot add next line as it breaks commit:\x0a\x09self deprecatedAPI: 'Use #asJavaScriptPropertyName'.\x22\x0a\x09^ self asJavaScriptPropertyName",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["asJavaScriptPropertyName"]
-}),
-$globals.String);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "asSetting",
 selector: "asSetting",

+ 0 - 40
src/Kernel-Infrastructure.st

@@ -1126,31 +1126,10 @@ It requires the `Compiler` package and the `support/parser.js` parser file in or
 
 
 !SmalltalkImage methodsFor: 'accessing'!
 !SmalltalkImage methodsFor: 'accessing'!
 
 
-at: aString
-	self deprecatedAPI.
-	^ self globals at: aString
-!
-
-at: aKey ifAbsent: aBlock
-	self deprecatedAPI.
-	^ self globals at: aKey ifAbsent: aBlock
-!
-
-at: aString put: anObject
-	self deprecatedAPI.
-	^ self globals at: aString put: anObject
-!
-
 core
 core
 	<return $core>
 	<return $core>
 !
 !
 
 
-current
-	"Backward compatibility for Smalltalk current ..."
-	self deprecatedAPI.
-	^ self
-!
-
 globals
 globals
 	<return $globals>
 	<return $globals>
 !
 !
@@ -1191,11 +1170,6 @@ version
 	"Answer the version string of Amber"
 	"Answer the version string of Amber"
 	
 	
 	^ '0.14.0-pre'
 	^ '0.14.0-pre'
-!
-
-vm
-	self deprecatedAPI: 'Use #core'.
-	^self core
 ! !
 ! !
 
 
 !SmalltalkImage methodsFor: 'accessing amd'!
 !SmalltalkImage methodsFor: 'accessing amd'!
@@ -1325,14 +1299,6 @@ basicParse: aString
 	^ SmalltalkParser parse: aString
 	^ SmalltalkParser parse: aString
 !
 !
 
 
-createPackage: packageName properties: aDict
-	"Needed to import .st files: they begin with this call."
-	self deprecatedAPI.
-	
-	aDict isEmpty ifFalse: [ self error: 'createPackage:properties: called with nonempty properties' ].
-	^ self createPackage: packageName
-!
-
 deleteClass: aClass
 deleteClass: aClass
 	"Deletes a class by deleting its binding only. Use #removeClass instead"
 	"Deletes a class by deleting its binding only. Use #removeClass instead"
 	
 	
@@ -1390,12 +1356,6 @@ asJavaScriptPropertyName
 <return $core.st2prop(self)>
 <return $core.st2prop(self)>
 !
 !
 
 
-asJavaScriptSelector
-	"Cannot add next line as it breaks commit:
-	self deprecatedAPI: 'Use #asJavaScriptPropertyName'."
-	^ self asJavaScriptPropertyName
-!
-
 asSetting
 asSetting
 	"Answer aSetting dedicated to locally store a value using this string as key.
 	"Answer aSetting dedicated to locally store a value using this string as key.
 	Nil will be the default value."
 	Nil will be the default value."

+ 0 - 26
src/Kernel-Methods.js

@@ -2718,32 +2718,6 @@ messageSends: []
 }),
 }),
 $globals.MethodContext);
 $globals.MethodContext);
 
 
-$core.addMethod(
-$core.method({
-selector: "temps",
-protocol: 'accessing',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=self._locals();
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"temps",{},$globals.MethodContext)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "temps\x0a\x09self deprecatedAPI.\x0a\x09\x0a\x09^ self locals",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "locals"]
-}),
-$globals.MethodContext);
-
 
 
 
 
 $core.addClass('NativeFunction', $globals.Object, [], 'Kernel-Methods');
 $core.addClass('NativeFunction', $globals.Object, [], 'Kernel-Methods');

+ 0 - 6
src/Kernel-Methods.st

@@ -650,12 +650,6 @@ sendIndexes
 
 
 supercall
 supercall
 	<return self.supercall == true>
 	<return self.supercall == true>
-!
-
-temps
-	self deprecatedAPI.
-	
-	^ self locals
 ! !
 ! !
 
 
 !MethodContext methodsFor: 'converting'!
 !MethodContext methodsFor: 'converting'!

+ 0 - 26
src/Kernel-Objects.js

@@ -1618,32 +1618,6 @@ messageSends: []
 }),
 }),
 $globals.Object);
 $globals.Object);
 
 
-$core.addMethod(
-$core.method({
-selector: "try:catch:",
-protocol: 'error handling',
-fn: function (aBlock,anotherBlock){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-self._deprecatedAPI();
-$1=$recv(aBlock)._tryCatch_(anotherBlock);
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"try:catch:",{aBlock:aBlock,anotherBlock:anotherBlock},$globals.Object)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aBlock", "anotherBlock"],
-source: "try: aBlock catch: anotherBlock\x0a\x09self deprecatedAPI.\x0a\x09\x0a\x09^ aBlock tryCatch: anotherBlock",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: ["deprecatedAPI", "tryCatch:"]
-}),
-$globals.Object);
-
 $core.addMethod(
 $core.addMethod(
 $core.method({
 $core.method({
 selector: "value",
 selector: "value",

+ 0 - 6
src/Kernel-Objects.st

@@ -283,12 +283,6 @@ subclassResponsibility
 
 
 throw: anObject
 throw: anObject
 	< throw anObject >
 	< throw anObject >
-!
-
-try: aBlock catch: anotherBlock
-	self deprecatedAPI.
-	
-	^ aBlock tryCatch: anotherBlock
 ! !
 ! !
 
 
 !Object methodsFor: 'inspecting'!
 !Object methodsFor: 'inspecting'!