Use instance_eval instead of binding magic

[ci skip]
hpi-swa · Nov 14, 2017 · 7464de4 · 7464de4
1 parent bf81837
commit 7464de4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/repository/Ruby-Core.package/Ruby.class/class/evaluateExpression.in.to..st b/repository/Ruby-Core.package/Ruby.class/class/evaluateExpression.in.to..st
@@ -1,7 +1,3 @@
 execution
 evaluateExpression: aSelection in: aContext to: receiver
-	| rbCode rbBinding |
-	rbCode := aSelection asString copyReplaceAll: 'self' with: 'that'.
-	rbBinding := Ruby eval: 'blank_binding'.
-	rbBinding local_variable_set: 'that' to: receiver.
-	^ rbBinding eval: rbCode
+	^ receiver instance_eval: aSelection asString
diff --git a/repository/Ruby-Core.package/Ruby.class/class/startUp..st b/repository/Ruby-Core.package/Ruby.class/class/startUp..st
diff --git a/repository/Ruby-Core.package/Ruby.class/methodProperties.json b/repository/Ruby-Core.package/Ruby.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"eval:filePath:breakOnExceptions:" : "fn 3/23/2017 08:59",
 		"evaluateExpression:" : "fn 3/27/2017 23:53",
 		"evaluateExpression:breakOnExceptions:" : "fn 3/27/2017 23:53",
-		"evaluateExpression:in:to:" : "fn 11/13/2017 14:26",
+		"evaluateExpression:in:to:" : "fn 11/14/2017 17:06",
 		"fileExtension" : "fn 3/17/2017 10:20",
 		"getFilename:" : "fn 4/2/2017 19:33",
 		"getSource:" : "fn 3/27/2017 23:54",
@@ -23,7 +23,6 @@
 		"pygmentsLexer" : "fn 5/16/2017 17:48",
 		"restartFrame:with:" : "fn 3/16/2017 22:22",
 		"sourceCodeTemplate" : "fn 3/14/2017 11:22",
-		"startUp:" : "fn 11/13/2017 14:29",
 		"tempNamesIn:" : "fn 3/16/2017 22:45",
 		"tempVariableAt:in:" : "fn 3/16/2017 22:44",
 		"vmSpeaksLanguage" : "fn 3/14/2017 11:33" },

diff --git a/repository/Ruby-Core.package/monticello.meta/version b/repository/Ruby-Core.package/monticello.meta/version
@@ -1 +1 @@
-(name 'Ruby-Core-fn.9' message 'Add Ruby class>>primBreakOnExceptionsDuringSends:' id 'a3dd00e0-2f31-4398-9f3b-778541a9ea60' date '14 November 2017' time '10:01:04.784037 am' author 'fn' ancestors ((name 'Ruby-Core-fn.8' message 'Add support for Ruby Bindings.' id 'bb1f89c6-a47b-4123-b5dd-8549b170736f' date '13 November 2017' time '3:18:05.11033 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.7' message 'Cleanups' id '0d0a21be-1f5d-4c8a-a41d-540112bd0e3b' date '23 May 2017' time '4:40:47.799452 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.6' message 'Introduce RubyProcess class' id '6e29ec50-ce7a-42ad-9912-ec799a11c3b3' date '6 May 2017' time '8:42:11.610918 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.5' message 'Updates' id '405326bf-5725-48cf-8895-d51382c8cb38' date '28 April 2017' time '4:44:08.446987 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.4' message 'Update in-image code' id '132afc61-6eed-4cbc-97ae-952bbd94abcf' date '31 March 2017' time '12:39:12.106118 am' author 'fn' ancestors ((name 'Ruby-Core-fn.3' message 'Update in-image code' id '0c2297bb-784e-4022-a5d7-0b9c0d54bb7f' date '22 March 2017' time '9:44:58.947694 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.2' message 'Improve Ruby integration' id '7a70298b-51b4-4e22-baa7-0caf3578d63b' date '15 March 2017' time '10:23:26.351199 am' author 'fn' ancestors ((name 'Ruby-Core-fn.1' message 'Introduce Ruby and RubyObject classes' id '8afbeb30-0e54-4ea1-8841-350120813f0d' date '14 March 2017' time '10:53:52.189423 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'Ruby-Core-fn.10' message 'Use instance_eval instead of binding magic' id '5549780c-b724-4761-855e-789fa3fbcb69' date '14 November 2017' time '5:07:40.370652 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.9' message 'Add Ruby class>>primBreakOnExceptionsDuringSends:' id 'a3dd00e0-2f31-4398-9f3b-778541a9ea60' date '14 November 2017' time '10:01:04.784037 am' author 'fn' ancestors ((name 'Ruby-Core-fn.8' message 'Add support for Ruby Bindings.' id 'bb1f89c6-a47b-4123-b5dd-8549b170736f' date '13 November 2017' time '3:18:05.11033 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.7' message 'Cleanups' id '0d0a21be-1f5d-4c8a-a41d-540112bd0e3b' date '23 May 2017' time '4:40:47.799452 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.6' message 'Introduce RubyProcess class' id '6e29ec50-ce7a-42ad-9912-ec799a11c3b3' date '6 May 2017' time '8:42:11.610918 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.5' message 'Updates' id '405326bf-5725-48cf-8895-d51382c8cb38' date '28 April 2017' time '4:44:08.446987 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.4' message 'Update in-image code' id '132afc61-6eed-4cbc-97ae-952bbd94abcf' date '31 March 2017' time '12:39:12.106118 am' author 'fn' ancestors ((name 'Ruby-Core-fn.3' message 'Update in-image code' id '0c2297bb-784e-4022-a5d7-0b9c0d54bb7f' date '22 March 2017' time '9:44:58.947694 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.2' message 'Improve Ruby integration' id '7a70298b-51b4-4e22-baa7-0caf3578d63b' date '15 March 2017' time '10:23:26.351199 am' author 'fn' ancestors ((name 'Ruby-Core-fn.1' message 'Introduce Ruby and RubyObject classes' id '8afbeb30-0e54-4ea1-8841-350120813f0d' date '14 March 2017' time '10:53:52.189423 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(name 'Ruby-Core-fn.9' message 'Add Ruby class>>primBreakOnExceptionsDuringSends:' id 'a3dd00e0-2f31-4398-9f3b-778541a9ea60' date '14 November 2017' time '10:01:04.784037 am' author 'fn' ancestors ((name 'Ruby-Core-fn.8' message 'Add support for Ruby Bindings.' id 'bb1f89c6-a47b-4123-b5dd-8549b170736f' date '13 November 2017' time '3:18:05.11033 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.7' message 'Cleanups' id '0d0a21be-1f5d-4c8a-a41d-540112bd0e3b' date '23 May 2017' time '4:40:47.799452 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.6' message 'Introduce RubyProcess class' id '6e29ec50-ce7a-42ad-9912-ec799a11c3b3' date '6 May 2017' time '8:42:11.610918 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.5' message 'Updates' id '405326bf-5725-48cf-8895-d51382c8cb38' date '28 April 2017' time '4:44:08.446987 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.4' message 'Update in-image code' id '132afc61-6eed-4cbc-97ae-952bbd94abcf' date '31 March 2017' time '12:39:12.106118 am' author 'fn' ancestors ((name 'Ruby-Core-fn.3' message 'Update in-image code' id '0c2297bb-784e-4022-a5d7-0b9c0d54bb7f' date '22 March 2017' time '9:44:58.947694 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.2' message 'Improve Ruby integration' id '7a70298b-51b4-4e22-baa7-0caf3578d63b' date '15 March 2017' time '10:23:26.351199 am' author 'fn' ancestors ((name 'Ruby-Core-fn.1' message 'Introduce Ruby and RubyObject classes' id '8afbeb30-0e54-4ea1-8841-350120813f0d' date '14 March 2017' time '10:53:52.189423 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
		(name 'Ruby-Core-fn.10' message 'Use instance_eval instead of binding magic' id '5549780c-b724-4761-855e-789fa3fbcb69' date '14 November 2017' time '5:07:40.370652 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.9' message 'Add Ruby class>>primBreakOnExceptionsDuringSends:' id 'a3dd00e0-2f31-4398-9f3b-778541a9ea60' date '14 November 2017' time '10:01:04.784037 am' author 'fn' ancestors ((name 'Ruby-Core-fn.8' message 'Add support for Ruby Bindings.' id 'bb1f89c6-a47b-4123-b5dd-8549b170736f' date '13 November 2017' time '3:18:05.11033 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.7' message 'Cleanups' id '0d0a21be-1f5d-4c8a-a41d-540112bd0e3b' date '23 May 2017' time '4:40:47.799452 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.6' message 'Introduce RubyProcess class' id '6e29ec50-ce7a-42ad-9912-ec799a11c3b3' date '6 May 2017' time '8:42:11.610918 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.5' message 'Updates' id '405326bf-5725-48cf-8895-d51382c8cb38' date '28 April 2017' time '4:44:08.446987 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.4' message 'Update in-image code' id '132afc61-6eed-4cbc-97ae-952bbd94abcf' date '31 March 2017' time '12:39:12.106118 am' author 'fn' ancestors ((name 'Ruby-Core-fn.3' message 'Update in-image code' id '0c2297bb-784e-4022-a5d7-0b9c0d54bb7f' date '22 March 2017' time '9:44:58.947694 pm' author 'fn' ancestors ((name 'Ruby-Core-fn.2' message 'Improve Ruby integration' id '7a70298b-51b4-4e22-baa7-0caf3578d63b' date '15 March 2017' time '10:23:26.351199 am' author 'fn' ancestors ((name 'Ruby-Core-fn.1' message 'Introduce Ruby and RubyObject classes' id '8afbeb30-0e54-4ea1-8841-350120813f0d' date '14 March 2017' time '10:53:52.189423 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())