Merge pull request #6545 from MarcusDenker/MoveVariablesToKernel

Move Variables to Kernel
pharo-project · Jun 10, 2020 · 982da21 · 982da21
2 parents 97b6d4e + 1ba86f9
commit 982da21
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/src/Calypso-SystemQueries/LiteralVariable.extension.st b/src/Calypso-SystemQueries/LiteralVariable.extension.st
@@ -1,11 +1,5 @@
 Extension { #name : #LiteralVariable }
 
-{ #category : #'*Calypso-SystemQueries' }
-LiteralVariable >> isReferencedIn: aMethod [ 
-
-	^(self isReadIn: aMethod) or: [ self isWrittenIn: aMethod ]
-]
-
 { #category : #'*Calypso-SystemQueries' }
 LiteralVariable >> printAsConstantQueryItem [
 	^self key

diff --git a/src/Slot-Core/AdditionalBinding.class.st → src/Kernel/AdditionalBinding.class.st b/src/Slot-Core/AdditionalBinding.class.st → src/Kernel/AdditionalBinding.class.st
@@ -12,7 +12,7 @@ AddionalBinding is used, too, by both Slots and Reflectivity to reference direct
 Class {
 	#name : #AdditionalBinding,
 	#superclass : #LiteralVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #'code generation' }

diff --git a/src/Slot-Core/ClassVariable.class.st → src/Kernel/ClassVariable.class.st b/src/Slot-Core/ClassVariable.class.st → src/Kernel/ClassVariable.class.st
@@ -9,7 +9,7 @@ You can subclass me and implement #read and #write: for creating special kinds o
 Class {
 	#name : #ClassVariable,
 	#superclass : #LiteralVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #printing }

diff --git a/src/Slot-Core/GlobalVariable.class.st → src/Kernel/GlobalVariable.class.st b/src/Slot-Core/GlobalVariable.class.st → src/Kernel/GlobalVariable.class.st
@@ -6,7 +6,7 @@ The compiler forwards bytecode generation to me for accessing the variable.
 Class {
 	#name : #GlobalVariable,
 	#superclass : #LiteralVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #queries }

diff --git a/src/Slot-Core/IndexedSlot.class.st → src/Kernel/IndexedSlot.class.st b/src/Slot-Core/IndexedSlot.class.st → src/Kernel/IndexedSlot.class.st
@@ -9,7 +9,7 @@ Class {
 	#instVars : [
 		'index'
 	],
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #comparing }

diff --git a/src/Slot-Core/InstanceVariableSlot.class.st → src/Kernel/InstanceVariableSlot.class.st b/src/Slot-Core/InstanceVariableSlot.class.st → src/Kernel/InstanceVariableSlot.class.st
@@ -10,7 +10,7 @@ If you subclass this class, take note that as it overrides both #emitStore: and
 Class {
 	#name : #InstanceVariableSlot,
 	#superclass : #IndexedSlot,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #cleanup }

diff --git a/src/Slot-Core/LiteralVariable.class.st → src/Kernel/LiteralVariable.class.st b/src/Slot-Core/LiteralVariable.class.st → src/Kernel/LiteralVariable.class.st
@@ -18,7 +18,7 @@ Class {
 	#instVars : [
 		'value'
 	],
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #validating }
@@ -147,6 +147,12 @@ LiteralVariable >> isReferenced [
 	^false
 ]
 
+{ #category : #queries }
+LiteralVariable >> isReferencedIn: aMethod [ 
+
+	^(self isReadIn: aMethod) or: [ self isWrittenIn: aMethod ]
+]
+
 { #category : #testing }
 LiteralVariable >> isSelfEvaluating [
 	^ self key isSelfEvaluating and: [self value isSelfEvaluating]

diff --git a/src/Slot-Core/PoolVariable.class.st → src/Kernel/PoolVariable.class.st b/src/Slot-Core/PoolVariable.class.st → src/Kernel/PoolVariable.class.st
@@ -4,5 +4,5 @@ This subclass will model the class variables of SharedPool subclasses and thus p
 Class {
 	#name : #PoolVariable,
 	#superclass : #ClassVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
diff --git a/src/Slot-Core/Slot.class.st → src/Kernel/Slot.class.st b/src/Slot-Core/Slot.class.st → src/Kernel/Slot.class.st
@@ -32,7 +32,7 @@ Class {
 	#classInstVars : [
 		'slotClassDefinition'
 	],
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #'instance creation' }

diff --git a/src/Slot-Core/TemporaryVariable.class.st → src/Kernel/TemporaryVariable.class.st b/src/Slot-Core/TemporaryVariable.class.st → src/Kernel/TemporaryVariable.class.st
@@ -16,7 +16,7 @@ Class {
 	#classVars : [
 		'PersistentTemps'
 	],
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #'class initialization' }

diff --git a/src/Slot-Core/UndeclaredVariable.class.st → src/Kernel/UndeclaredVariable.class.st b/src/Slot-Core/UndeclaredVariable.class.st → src/Kernel/UndeclaredVariable.class.st
@@ -8,7 +8,7 @@ In future I can profice logging and user warning when evaluated code accesses un
 Class {
 	#name : #UndeclaredVariable,
 	#superclass : #LiteralVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #queries }

diff --git a/src/Slot-Core/Variable.class.st → src/Kernel/Variable.class.st b/src/Slot-Core/Variable.class.st → src/Kernel/Variable.class.st
@@ -26,7 +26,7 @@ Class {
 	#classVars : [
 		'Properties'
 	],
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #'class initialization' }

diff --git a/src/Slot-Core/WorkspaceVariable.class.st → src/Kernel/WorkspaceVariable.class.st b/src/Slot-Core/WorkspaceVariable.class.st → src/Kernel/WorkspaceVariable.class.st
@@ -4,7 +4,7 @@ I am a binding in a Workspace. Used for non-defined temps
 Class {
 	#name : #WorkspaceVariable,
 	#superclass : #LiteralVariable,
-	#category : #'Slot-Core-Variables'
+	#category : #'Kernel-Variables'
 }
 
 { #category : #'code generation' }