Merge pull request #276 from herby/ensure-semantic-fix

`[3] ensure: [4]` should return 3, not 4

js/Kernel-Methods.deploy.js

@@ -30,7 +30,7 @@ smalltalk.method({
 selector: "ensure:",
 fn: function (aBlock){
 var self=this;
-try{self()}finally{return aBlock._value()};
+try{return self()}finally{aBlock._value()};
 ;
 return self}
 }),

js/Kernel-Methods.js

@@ -42,11 +42,11 @@ selector: "ensure:",
 category: 'evaluating',
 fn: function (aBlock){
 var self=this;
-try{self()}finally{return aBlock._value()};
+try{return self()}finally{aBlock._value()};
 ;
 return self},
 args: ["aBlock"],
-source: "ensure: aBlock\x0a\x09<try{self()}finally{return aBlock._value()}>",
+source: "ensure: aBlock\x0a\x09<try{return self()}finally{aBlock._value()}>",
 messageSends: [],
 referencedClasses: []
 }),

js/Kernel-Tests.deploy.js

@@ -19,10 +19,10 @@ smalltalk.method({
 selector: "testEnsure",
 fn: function (){
 var self=this;
-smalltalk.send(self,"_assert_",[smalltalk.send((function(){
-return smalltalk.send((smalltalk.Error || Error),"_new",[]);
+smalltalk.send(self,"_assert_equals_",[(3),smalltalk.send((function(){
+return (3);
 }),"_ensure_",[(function(){
-return true;
+return (4);
 })])]);
 return self}
 }),

js/Kernel-Tests.js

@@ -25,16 +25,16 @@ selector: "testEnsure",
 category: 'tests',
 fn: function (){
 var self=this;
-smalltalk.send(self,"_assert_",[smalltalk.send((function(){
-return smalltalk.send((smalltalk.Error || Error),"_new",[]);
+smalltalk.send(self,"_assert_equals_",[(3),smalltalk.send((function(){
+return (3);
 }),"_ensure_",[(function(){
-return true;
+return (4);
 })])]);
 return self},
 args: [],
-source: "testEnsure\x0a\x09self assert: ([Error new] ensure: [true])",
-messageSends: ["assert:", "ensure:", "new"],
-referencedClasses: ["Error"]
+source: "testEnsure\x0a\x09self assert: 3 equals: ([3] ensure: [4])",
+messageSends: ["assert:equals:", "ensure:"],
+referencedClasses: []
 }),
 smalltalk.BlockClosureTest);
 

st/Kernel-Methods.st

@@ -56,7 +56,7 @@ applyTo: anObject arguments: aCollection
 !
 
 ensure: aBlock
-	<try{self()}finally{return aBlock._value()}>
+	<try{return self()}finally{aBlock._value()}>
 !
 
 new

st/Kernel-Tests.st

@@ -10,7 +10,7 @@ testCompiledSource
 !
 
 testEnsure
-	self assert: ([Error new] ensure: [true])
+	self assert: 3 equals: ([3] ensure: [4])
 !
 
 testEnsureRaises