renames: readInContext: and write:inContext:

demarey · Jun 20, 2020 · e88950d · e88950d
1 parent adf8e7c
commit e88950d
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 31 deletions.
diff --git a/src/Debugging-Core/Context.extension.st b/src/Debugging-Core/Context.extension.st
@@ -23,7 +23,7 @@ Context >> callPrimitive: primNumber [
 Context >> lookupSymbol: aSymbol [
 	| var |
 	var := self lookupVar: aSymbol.
-	^ var readFromContext: self
+	^ var readInContext: self
 ]
 
 { #category : #'*Debugging-Core' }
@@ -366,7 +366,7 @@ Context >> tempNamed: aName [
 
 	| var |
 	var := self lookupTempVar: aName.
-	^var readFromContext: self
+	^var readInContext: self
 ]
 
 { #category : #'*Debugging-Core' }
@@ -375,7 +375,7 @@ Context >> tempNamed: aName put: anObject [
 
 	| var |
 	var := self lookupTempVar: aName.
-	^var write: anObject toContext: self
+	^var write: anObject inContext: self
 ]
 
 { #category : #'*Debugging-Core' }

diff --git a/src/HeuristicCompletion-Model/CoVariableValueMessageHeuristic.class.st b/src/HeuristicCompletion-Model/CoVariableValueMessageHeuristic.class.st
@@ -33,7 +33,7 @@ CoVariableValueMessageHeuristic >> valueOfVariable: aName inContext: completionC
 	If we find in the doItContext has a variable with the given name, use it, otherwise ignore it."
 	(completionContext doItContext ifNotNil: [ :context | 
 		(context lookupVar: aName)
-			ifNotNil: [:var | var readFromContext: context ] ])
+			ifNotNil: [:var | var readInContext: context ] ])
 		ifNotNil: [ :value | ^ aBlock value: value ].
 
 	"In the playground, the binding values comes in the bindings of the requestor.

diff --git a/src/Kernel/LiteralVariable.class.st b/src/Kernel/LiteralVariable.class.st
@@ -227,7 +227,7 @@ LiteralVariable >> read [
 ]
 
 { #category : #debugging }
-LiteralVariable >> readFromContext: aContext [
+LiteralVariable >> readInContext: aContext [
 	^self value
 ]
 
@@ -263,7 +263,7 @@ LiteralVariable >> write: anObject [
 ]
 
 { #category : #debugging }
-LiteralVariable >> write: aValue toContext: aContext [
+LiteralVariable >> write: aValue inContext: aContext [
 	self isWritable ifFalse: [ 
 		^self error: 'Variable ' , name, ' is read only'].
 

diff --git a/src/Kernel/Slot.class.st b/src/Kernel/Slot.class.st
@@ -293,7 +293,7 @@ Slot >> read: anObject [
 ]
 
 { #category : #debugging }
-Slot >> readFromContext: aContext [
+Slot >> readInContext: aContext [
 	^self read: aContext receiver
 ]
 
@@ -346,12 +346,12 @@ Slot >> wantsInitialization [
 	^false
 ]
 
+{ #category : #debugging }
+Slot >> write: aValue inContext: aContext [
+	self write: aValue to: aContext receiver
+]
+
 { #category : #'meta-object-protocol' }
 Slot >> write: aValue to: anObject [
 	^self subclassResponsibility
 ]
-
-{ #category : #debugging }
-Slot >> write: aValue toContext: aContext [
-	self write: aValue to: aContext receiver
-]
diff --git a/src/Kernel/Variable.class.st b/src/Kernel/Variable.class.st
@@ -231,7 +231,7 @@ Variable >> propertyAt: propName put: propValue [
 ]
 
 { #category : #debugging }
-Variable >> readFromContext: aContext [
+Variable >> readInContext: aContext [
 	self subclassResponsibility 
 ]
 
@@ -276,6 +276,6 @@ Variable >> variable [
 ]
 
 { #category : #debugging }
-Variable >> write: aValue toContext: aContext [
+Variable >> write: aValue inContext: aContext [
 	self subclassResponsibility 
 ]
diff --git a/src/OpalCompiler-Core/OCSelfVariable.class.st b/src/OpalCompiler-Core/OCSelfVariable.class.st
@@ -37,6 +37,6 @@ OCSelfVariable >> isSelfOrSuper [
 ]
 
 { #category : #debugging }
-OCSelfVariable >> readFromContext: aContext [
+OCSelfVariable >> readInContext: aContext [
 	^aContext receiver
 ]
diff --git a/src/OpalCompiler-Core/OCSpecialVariable.class.st b/src/OpalCompiler-Core/OCSpecialVariable.class.st
@@ -30,7 +30,7 @@ OCSpecialVariable >> isWritable [
 ]
 
 { #category : #debugging }
-OCSpecialVariable >> write: aValue toContext: aContext [
+OCSpecialVariable >> write: aValue inContext: aContext [
 
 	self error: name, ' is reserved word and cant be modified'
 ]
diff --git a/src/OpalCompiler-Core/OCSuperVariable.class.st b/src/OpalCompiler-Core/OCSuperVariable.class.st
@@ -38,6 +38,6 @@ OCSuperVariable >> isSuper [
 ]
 
 { #category : #debugging }
-OCSuperVariable >> readFromContext: aContext [
+OCSuperVariable >> readInContext: aContext [
 	^aContext receiver
 ]
diff --git a/src/OpalCompiler-Core/OCTempVariable.class.st b/src/OpalCompiler-Core/OCTempVariable.class.st
@@ -142,14 +142,6 @@ OCTempVariable >> markWrite [
 	super markWrite.
 ]
 
-{ #category : #debugging }
-OCTempVariable >> readFromContext: aContext [
-
-	| contextScope |
-	contextScope := aContext astScope.
-	^self readFromContext: aContext scope: contextScope
-]
-
 { #category : #debugging }
 OCTempVariable >> readFromContext: aContext scope: contextScope [
 	| definitionContext |
@@ -164,7 +156,15 @@ OCTempVariable >> readFromLocalContext: aContext [
 ]
 
 { #category : #debugging }
-OCTempVariable >> write: aValue toContext: aContext [
+OCTempVariable >> readInContext: aContext [
+
+	| contextScope |
+	contextScope := aContext astScope.
+	^self readFromContext: aContext scope: contextScope
+]
+
+{ #category : #debugging }
+OCTempVariable >> write: aValue inContext: aContext [
 
 	| contextScope |
 	contextScope := aContext astScope.

diff --git a/src/OpalCompiler-Core/OCThisContextVariable.class.st b/src/OpalCompiler-Core/OCThisContextVariable.class.st
@@ -32,6 +32,6 @@ OCThisContextVariable >> isThisContext [
 ]
 
 { #category : #debugging }
-OCThisContextVariable >> readFromContext: aContext [
+OCThisContextVariable >> readInContext: aContext [
 	^aContext
 ]
diff --git a/src/Slot-Tests/ClassVariableTest.class.st b/src/Slot-Tests/ClassVariableTest.class.st
@@ -71,7 +71,7 @@ ClassVariableTest >> testReadingFromContext [
 	classVariable := self class classVariableNamed: #TestVariable.
 
 	self
-		assert: (classVariable readFromContext: thisContext)
+		assert: (classVariable readInContext: thisContext)
 		equals: #testValue
 ]
 
@@ -93,7 +93,7 @@ ClassVariableTest >> testWritingToContext [
 
 	| classVariable |
 	classVariable := self class classVariableNamed: #TestVariable.
-	classVariable write: #testValue toContext: thisContext.
+	classVariable write: #testValue inContext: thisContext.
 
 	self assert: TestVariable equals: #testValue
 ]
diff --git a/src/Slot-Tests/SlotTest.class.st b/src/Slot-Tests/SlotTest.class.st
@@ -87,7 +87,7 @@ SlotTest >> testReadFromContext [
 	ivarForTesting := #testValue.
 	slot := self class slotNamed: #ivarForTesting.
 
-	self assert: (slot readFromContext: thisContext) equals: #testValue
+	self assert: (slot readInContext: thisContext) equals: #testValue
 ]
 
 { #category : #'tests - properties' }
@@ -116,7 +116,7 @@ SlotTest >> testWriteToContext [
 
 	| slot |
 	slot := self class slotNamed: #ivarForTesting.
-	slot write: #testValue toContext: thisContext.
+	slot write: #testValue inContext: thisContext.
 
 	self assert: ivarForTesting equals: #testValue
 ]