Renames Environment >> evaluateString:on: to #evaluate:for:

src/Helios-Debugger.js

@@ -827,12 +827,12 @@ fn: function (aString){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(self._environment())._evaluateString_on_(aString,self._currentContext());
+$1=_st(self._environment())._evaluate_for_(aString,self._currentContext());
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"evaluate:",{aString:aString},globals.HLDebuggerModel)})},
 args: ["aString"],
-source: "evaluate: aString\x0a\x09^ self environment \x0a\x09\x09evaluateString: aString \x0a\x09\x09on: self currentContext",
-messageSends: ["evaluateString:on:", "environment", "currentContext"],
+source: "evaluate: aString\x0a\x09^ self environment \x0a\x09\x09evaluate: aString \x0a\x09\x09for: self currentContext",
+messageSends: ["evaluate:for:", "environment", "currentContext"],
 referencedClasses: []
 }),
 globals.HLDebuggerModel);

src/Helios-Debugger.st

@@ -347,8 +347,8 @@ where
 
 evaluate: aString
 	^ self environment 
-		evaluateString: aString 
-		on: self currentContext
+		evaluate: aString 
+		for: self currentContext
 ! !
 
 !HLDebuggerModel methodsFor: 'initialization'!

src/Helios-Workspace.js

@@ -73,7 +73,7 @@ return smalltalk.withContext(function($ctx1) {
 var $1;
 $1=_st((function(){
 return smalltalk.withContext(function($ctx2) {
-return _st(self._environment())._evaluateString_on_(aString,self._receiver());
+return _st(self._environment())._evaluate_for_(aString,self._receiver());
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._tryCatch_((function(e){
 return smalltalk.withContext(function($ctx2) {
 _st($ErrorHandler())._handleError_(e);
@@ -82,8 +82,8 @@ return nil;
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"doIt:",{aString:aString},globals.HLCodeModel)})},
 args: ["aString"],
-source: "doIt: aString\x0a\x09\x22Evaluate aString in the receiver's `environment`.\x0a\x09\x0a\x09Note: Catch any error and handle it manually, bypassing\x0a\x09boot.js behavior to avoid the browser default action on\x0a\x09ctrl+d/ctrl+p.\x0a\x09\x0a\x09See https://github.com/amber-smalltalk/amber/issues/882\x22\x0a\x0a\x09^ [ self environment evaluateString: aString on: self receiver ]\x0a\x09\x09tryCatch: [ :e | \x0a\x09\x09\x09ErrorHandler handleError: e.\x0a\x09\x09\x09nil ]",
-messageSends: ["tryCatch:", "evaluateString:on:", "environment", "receiver", "handleError:"],
+source: "doIt: aString\x0a\x09\x22Evaluate aString in the receiver's `environment`.\x0a\x09\x0a\x09Note: Catch any error and handle it manually, bypassing\x0a\x09boot.js behavior to avoid the browser default action on\x0a\x09ctrl+d/ctrl+p.\x0a\x09\x0a\x09See https://github.com/amber-smalltalk/amber/issues/882\x22\x0a\x0a\x09^ [ self environment evaluate: aString for: self receiver ]\x0a\x09\x09tryCatch: [ :e | \x0a\x09\x09\x09ErrorHandler handleError: e.\x0a\x09\x09\x09nil ]",
+messageSends: ["tryCatch:", "evaluate:for:", "environment", "receiver", "handleError:"],
 referencedClasses: ["ErrorHandler"]
 }),
 globals.HLCodeModel);

src/Helios-Workspace.st

@@ -40,7 +40,7 @@ doIt: aString
 	
 	See https://github.com/amber-smalltalk/amber/issues/882"
 
-	^ [ self environment evaluateString: aString on: self receiver ]
+	^ [ self environment evaluate: aString for: self receiver ]
 		tryCatch: [ :e | 
 			ErrorHandler handleError: e.
 			nil ]

src/Kernel-Infrastructure.js

@@ -432,15 +432,15 @@ function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
 return smalltalk.withContext(function($ctx1) { 
 _st((function(){
 return smalltalk.withContext(function($ctx2) {
-return self._evaluateString_on_(aString,_st($DoIt())._new());
+return self._evaluate_for_(aString,_st($DoIt())._new());
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._on_do_($Error(),(function(error){
 return smalltalk.withContext(function($ctx2) {
 return self._alert_(_st(error)._messageText());
 }, function($ctx2) {$ctx2.fillBlock({error:error},$ctx1,2)})}));
 return self}, function($ctx1) {$ctx1.fill(self,"compileClassDefinition:",{aString:aString},globals.Environment)})},
 args: ["aString"],
-source: "compileClassDefinition: aString\x0a\x09[ self evaluateString: aString on: DoIt new ]\x0a\x09\x09on: Error\x0a\x09\x09do: [ :error | self alert: error messageText ]",
-messageSends: ["on:do:", "evaluateString:on:", "new", "alert:", "messageText"],
+source: "compileClassDefinition: aString\x0a\x09[ self evaluate: aString for: DoIt new ]\x0a\x09\x09on: Error\x0a\x09\x09do: [ :error | self alert: error messageText ]",
+messageSends: ["on:do:", "evaluate:for:", "new", "alert:", "messageText"],
 referencedClasses: ["DoIt", "Error"]
 }),
 globals.Environment);
@@ -511,19 +511,19 @@ globals.Environment);
 
 smalltalk.addMethod(
 smalltalk.method({
-selector: "eval:on:",
+selector: "evaluate:for:",
 protocol: 'evaluating',
 fn: function (aString,anObject){
 var self=this;
 function $Evaluator(){return globals.Evaluator||(typeof Evaluator=="undefined"?nil:Evaluator)}
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st($Evaluator())._evaluate_on_(aString,anObject);
+$1=_st($Evaluator())._evaluate_for_(aString,anObject);
 return $1;
-}, function($ctx1) {$ctx1.fill(self,"eval:on:",{aString:aString,anObject:anObject},globals.Environment)})},
+}, function($ctx1) {$ctx1.fill(self,"evaluate:for:",{aString:aString,anObject:anObject},globals.Environment)})},
 args: ["aString", "anObject"],
-source: "eval: aString on: anObject\x0a\x09^ Evaluator evaluate: aString on: anObject",
-messageSends: ["evaluate:on:"],
+source: "evaluate: aString for: anObject\x0a\x09^ Evaluator evaluate: aString for: anObject",
+messageSends: ["evaluate:for:"],
 referencedClasses: ["Evaluator"]
 }),
 globals.Environment);
@@ -553,25 +553,6 @@ referencedClasses: []
 }),
 globals.Environment);
 
-smalltalk.addMethod(
-smalltalk.method({
-selector: "evaluateString:on:",
-protocol: 'evaluating',
-fn: function (aString,anObject){
-var self=this;
-function $Evaluator(){return globals.Evaluator||(typeof Evaluator=="undefined"?nil:Evaluator)}
-return smalltalk.withContext(function($ctx1) { 
-var $1;
-$1=_st($Evaluator())._evaluate_for_(aString,anObject);
-return $1;
-}, function($ctx1) {$ctx1.fill(self,"evaluateString:on:",{aString:aString,anObject:anObject},globals.Environment)})},
-args: ["aString", "anObject"],
-source: "evaluateString: aString on: anObject\x0a\x09^ Evaluator evaluate: aString for: anObject",
-messageSends: ["evaluate:for:"],
-referencedClasses: ["Evaluator"]
-}),
-globals.Environment);
-
 smalltalk.addMethod(
 smalltalk.method({
 selector: "inspect:",

src/Kernel-Infrastructure.st

@@ -226,7 +226,7 @@ compileClassComment: aString for: aClass
 !
 
 compileClassDefinition: aString
-	[ self evaluateString: aString on: DoIt new ]
+	[ self evaluate: aString for: DoIt new ]
 		on: Error
 		do: [ :error | self alert: error messageText ]
 !
@@ -250,11 +250,7 @@ evaluate: aBlock on: anErrorClass do: exceptionBlock
 
 !Environment methodsFor: 'evaluating'!
 
-eval: aString on: anObject
-	^ Evaluator evaluate: aString on: anObject
-!
-
-evaluateString: aString on: anObject
+evaluate: aString for: anObject
 	^ Evaluator evaluate: aString for: anObject
 ! !