Revert "asJavaScriptConstructorInstantiate:"

This reverts commit 545d079f

lang/API-CHANGES.txt

@@ -7,8 +7,6 @@
   + beJavaScriptSubclassOf:
   + javaScriptConstructor
   + javaScriptConstructor:
-+ BlockClosure >>
-  + asJavaScriptConstructorInstantiate:
 + amber/boot api >>
   + detachClass(klass)
 

lang/src/Kernel-Methods.js

@@ -56,30 +56,6 @@ return self;
 }; }),
 $globals.BlockClosure);
 
-$core.addMethod(
-$core.method({
-selector: "asJavaScriptConstructorInstantiate:",
-protocol: "accessing",
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: ["aPrototypee"],
-source: "asJavaScriptConstructorInstantiate: aPrototypee\x0a\x09prototype := aPrototypee prototype",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["prototype"]
-}, function ($methodClass){ return function (aPrototypee){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-$self.prototype=$recv(aPrototypee)._prototype();
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"asJavaScriptConstructorInstantiate:",{aPrototypee:aPrototypee})});
-//>>excludeEnd("ctx");
-}; }),
-$globals.BlockClosure);
-
 $core.addMethod(
 $core.method({
 selector: "compiledSource",

lang/src/Kernel-Methods.st

@@ -28,10 +28,6 @@ I am is directly mapped to JavaScript Function.
 
 !BlockClosure methodsFor: 'accessing'!
 
-asJavaScriptConstructorInstantiate: aPrototypee
-	prototype := aPrototypee prototype
-!
-
 compiledSource
 	<inlineJS: 'return self.toString()'>
 !

lang/src/Kernel-Tests.js

@@ -323,33 +323,6 @@ $globals.AnnouncerTest);
 
 
 $core.addClass("BlockClosureTest", $globals.TestCase, [], "Kernel-Tests");
-$core.addMethod(
-$core.method({
-selector: "jsConstructorWithArgs",
-protocol: "fixture",
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "jsConstructorWithArgs\x0a\x09<inlineJS: '\x0a\x09\x09function Foo(foo,bar){this.foo=foo||3;this.bar=bar||5;}\x0a\x09\x09return Foo;\x0a\x09'>",
-referencedClasses: [],
-//>>excludeEnd("ide");
-pragmas: [["inlineJS:", ["\x0a\x09\x09function Foo(foo,bar){this.foo=foo||3;this.bar=bar||5;}\x0a\x09\x09return Foo;\x0a\x09"]]],
-messageSends: []
-}, function ($methodClass){ return function (){
-var self=this,$self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-
-		function Foo(foo,bar){this.foo=foo||3;this.bar=bar||5;}
-		return Foo;
-	;
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"jsConstructorWithArgs",{})});
-//>>excludeEnd("ctx");
-}; }),
-$globals.BlockClosureTest);
-
 $core.addMethod(
 $core.method({
 selector: "localReturnOnDoCatch",
@@ -416,108 +389,6 @@ catch(e) {if(e===$early)return e[0]; throw e}
 }; }),
 $globals.BlockClosureTest);
 
-$core.addMethod(
-$core.method({
-selector: "testAsJavaScriptConstructorInstantiateAmberClass",
-protocol: "tests",
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "testAsJavaScriptConstructorInstantiateAmberClass\x0a\x09| instance block |\x0a\x09block := self jsConstructorWithArgs.\x0a\x09block asJavaScriptConstructorInstantiate: ObjectMock.\x0a\x0a\x09instance := block newValue: 4.\x0a\x09self assert: instance class == ObjectMock.\x0a\x09self assert: instance foo equals: 4.\x0a\x09self assert: (instance basicAt: #bar) equals: 5.\x0a\x09self shouldnt: [ instance foo: 9 ] raise: Error.\x0a\x09self assert: instance foo equals: 9",
-referencedClasses: ["ObjectMock", "Error"],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["jsConstructorWithArgs", "asJavaScriptConstructorInstantiate:", "newValue:", "assert:", "==", "class", "assert:equals:", "foo", "basicAt:", "shouldnt:raise:", "foo:"]
-}, function ($methodClass){ return function (){
-var self=this,$self=this;
-var instance,block;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-block=$self._jsConstructorWithArgs();
-$recv(block)._asJavaScriptConstructorInstantiate_($globals.ObjectMock);
-instance=$recv(block)._newValue_((4));
-$self._assert_($recv($recv(instance)._class()).__eq_eq($globals.ObjectMock));
-$1=$recv(instance)._foo();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["foo"]=1;
-//>>excludeEnd("ctx");
-$self._assert_equals_($1,(4));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["assert:equals:"]=1;
-//>>excludeEnd("ctx");
-$self._assert_equals_($recv(instance)._basicAt_("bar"),(5));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["assert:equals:"]=2;
-//>>excludeEnd("ctx");
-$self._shouldnt_raise_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv(instance)._foo_((9));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}),$globals.Error);
-$self._assert_equals_($recv(instance)._foo(),(9));
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testAsJavaScriptConstructorInstantiateAmberClass",{instance:instance,block:block})});
-//>>excludeEnd("ctx");
-}; }),
-$globals.BlockClosureTest);
-
-$core.addMethod(
-$core.method({
-selector: "testAsJavaScriptConstructorInstantiateJsClass",
-protocol: "tests",
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "testAsJavaScriptConstructorInstantiateJsClass\x0a\x09| instance block |\x0a\x09block := self jsConstructorWithArgs.\x0a\x09block asJavaScriptConstructorInstantiate: ObjectMock javaScriptConstructor.\x0a\x0a\x09instance := block newValue: 4.\x0a\x09self assert: instance class == ObjectMock.\x0a\x09self assert: instance foo equals: 4.\x0a\x09self assert: (instance basicAt: #bar) equals: 5.\x0a\x09self shouldnt: [ instance foo: 9 ] raise: Error.\x0a\x09self assert: instance foo equals: 9",
-referencedClasses: ["ObjectMock", "Error"],
-//>>excludeEnd("ide");
-pragmas: [],
-messageSends: ["jsConstructorWithArgs", "asJavaScriptConstructorInstantiate:", "javaScriptConstructor", "newValue:", "assert:", "==", "class", "assert:equals:", "foo", "basicAt:", "shouldnt:raise:", "foo:"]
-}, function ($methodClass){ return function (){
-var self=this,$self=this;
-var instance,block;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-block=$self._jsConstructorWithArgs();
-$recv(block)._asJavaScriptConstructorInstantiate_($recv($globals.ObjectMock)._javaScriptConstructor());
-instance=$recv(block)._newValue_((4));
-$self._assert_($recv($recv(instance)._class()).__eq_eq($globals.ObjectMock));
-$1=$recv(instance)._foo();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["foo"]=1;
-//>>excludeEnd("ctx");
-$self._assert_equals_($1,(4));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["assert:equals:"]=1;
-//>>excludeEnd("ctx");
-$self._assert_equals_($recv(instance)._basicAt_("bar"),(5));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["assert:equals:"]=2;
-//>>excludeEnd("ctx");
-$self._shouldnt_raise_((function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-return $recv(instance)._foo_((9));
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
-//>>excludeEnd("ctx");
-}),$globals.Error);
-$self._assert_equals_($recv(instance)._foo(),(9));
-return self;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"testAsJavaScriptConstructorInstantiateJsClass",{instance:instance,block:block})});
-//>>excludeEnd("ctx");
-}; }),
-$globals.BlockClosureTest);
-
 $core.addMethod(
 $core.method({
 selector: "testCanClearInterval",

lang/src/Kernel-Tests.st

@@ -92,13 +92,6 @@ TestCase subclass: #BlockClosureTest
 
 !BlockClosureTest methodsFor: 'fixture'!
 
-jsConstructorWithArgs
-	<inlineJS: '
-		function Foo(foo,bar){this.foo=foo||3;this.bar=bar||5;}
-		return Foo;
-	'>
-!
-
 localReturnOnDoCatch
     [ ^ 2 ] on: Error do: [].
     ^ 3
@@ -111,32 +104,6 @@ localReturnOnDoMiss
 
 !BlockClosureTest methodsFor: 'tests'!
 
-testAsJavaScriptConstructorInstantiateAmberClass
-	| instance block |
-	block := self jsConstructorWithArgs.
-	block asJavaScriptConstructorInstantiate: ObjectMock.
-
-	instance := block newValue: 4.
-	self assert: instance class == ObjectMock.
-	self assert: instance foo equals: 4.
-	self assert: (instance basicAt: #bar) equals: 5.
-	self shouldnt: [ instance foo: 9 ] raise: Error.
-	self assert: instance foo equals: 9
-!
-
-testAsJavaScriptConstructorInstantiateJsClass
-	| instance block |
-	block := self jsConstructorWithArgs.
-	block asJavaScriptConstructorInstantiate: ObjectMock javaScriptConstructor.
-
-	instance := block newValue: 4.
-	self assert: instance class == ObjectMock.
-	self assert: instance foo equals: 4.
-	self assert: (instance basicAt: #bar) equals: 5.
-	self shouldnt: [ instance foo: 9 ] raise: Error.
-	self assert: instance foo equals: 9
-!
-
 testCanClearInterval
 	self shouldnt: [ ([ Error new signal ] valueWithInterval: 0) clearInterval ] raise: Error
 !