From 1ba86f9616992c5dc81a6b1e94ca5d54644e693e Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Wed, 10 Jun 2020 16:54:48 +0200 Subject: [PATCH] Move all the Variables from Slots package to Kernel-Variable. --- src/Calypso-SystemQueries/LiteralVariable.extension.st | 6 ------ src/{Slot-Core => Kernel}/AdditionalBinding.class.st | 2 +- src/{Slot-Core => Kernel}/ClassVariable.class.st | 2 +- src/{Slot-Core => Kernel}/GlobalVariable.class.st | 2 +- src/{Slot-Core => Kernel}/IndexedSlot.class.st | 2 +- src/{Slot-Core => Kernel}/InstanceVariableSlot.class.st | 2 +- src/{Slot-Core => Kernel}/LiteralVariable.class.st | 8 +++++++- src/{Slot-Core => Kernel}/PoolVariable.class.st | 2 +- src/{Slot-Core => Kernel}/Slot.class.st | 2 +- src/{Slot-Core => Kernel}/TemporaryVariable.class.st | 2 +- src/{Slot-Core => Kernel}/UndeclaredVariable.class.st | 2 +- src/{Slot-Core => Kernel}/Variable.class.st | 2 +- src/{Slot-Core => Kernel}/WorkspaceVariable.class.st | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename src/{Slot-Core => Kernel}/AdditionalBinding.class.st (95%) rename src/{Slot-Core => Kernel}/ClassVariable.class.st (97%) rename src/{Slot-Core => Kernel}/GlobalVariable.class.st (96%) rename src/{Slot-Core => Kernel}/IndexedSlot.class.st (97%) rename src/{Slot-Core => Kernel}/InstanceVariableSlot.class.st (98%) rename src/{Slot-Core => Kernel}/LiteralVariable.class.st (97%) rename src/{Slot-Core => Kernel}/PoolVariable.class.st (81%) rename src/{Slot-Core => Kernel}/Slot.class.st (99%) rename src/{Slot-Core => Kernel}/TemporaryVariable.class.st (98%) rename src/{Slot-Core => Kernel}/UndeclaredVariable.class.st (96%) rename src/{Slot-Core => Kernel}/Variable.class.st (98%) rename src/{Slot-Core => Kernel}/WorkspaceVariable.class.st (91%) diff --git a/src/Calypso-SystemQueries/LiteralVariable.extension.st b/src/Calypso-SystemQueries/LiteralVariable.extension.st index 57de97a1aee..a25f96bf9ec 100644 --- 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 b/src/Kernel/AdditionalBinding.class.st similarity index 95% rename from src/Slot-Core/AdditionalBinding.class.st rename to src/Kernel/AdditionalBinding.class.st index 26383c82cda..2445f43ee69 100644 --- a/src/Slot-Core/AdditionalBinding.class.st +++ b/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 b/src/Kernel/ClassVariable.class.st similarity index 97% rename from src/Slot-Core/ClassVariable.class.st rename to src/Kernel/ClassVariable.class.st index b24f2dfbc99..d0485b7e9e4 100644 --- a/src/Slot-Core/ClassVariable.class.st +++ b/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 b/src/Kernel/GlobalVariable.class.st similarity index 96% rename from src/Slot-Core/GlobalVariable.class.st rename to src/Kernel/GlobalVariable.class.st index be050f4460f..fab53ecfc6d 100644 --- a/src/Slot-Core/GlobalVariable.class.st +++ b/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 b/src/Kernel/IndexedSlot.class.st similarity index 97% rename from src/Slot-Core/IndexedSlot.class.st rename to src/Kernel/IndexedSlot.class.st index 9bfdd836f4f..259211286d4 100644 --- a/src/Slot-Core/IndexedSlot.class.st +++ b/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 b/src/Kernel/InstanceVariableSlot.class.st similarity index 98% rename from src/Slot-Core/InstanceVariableSlot.class.st rename to src/Kernel/InstanceVariableSlot.class.st index 0ead6782dc3..2a763fbe022 100644 --- a/src/Slot-Core/InstanceVariableSlot.class.st +++ b/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 b/src/Kernel/LiteralVariable.class.st similarity index 97% rename from src/Slot-Core/LiteralVariable.class.st rename to src/Kernel/LiteralVariable.class.st index 92dc807e3a9..6c7a16f294f 100644 --- a/src/Slot-Core/LiteralVariable.class.st +++ b/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 b/src/Kernel/PoolVariable.class.st similarity index 81% rename from src/Slot-Core/PoolVariable.class.st rename to src/Kernel/PoolVariable.class.st index 2cb9ab625ce..993a8c6ecc9 100644 --- a/src/Slot-Core/PoolVariable.class.st +++ b/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 b/src/Kernel/Slot.class.st similarity index 99% rename from src/Slot-Core/Slot.class.st rename to src/Kernel/Slot.class.st index 2d2145a6b87..66bc58fbba2 100644 --- a/src/Slot-Core/Slot.class.st +++ b/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 b/src/Kernel/TemporaryVariable.class.st similarity index 98% rename from src/Slot-Core/TemporaryVariable.class.st rename to src/Kernel/TemporaryVariable.class.st index 55c56af6afb..c9560d68ce1 100644 --- a/src/Slot-Core/TemporaryVariable.class.st +++ b/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 b/src/Kernel/UndeclaredVariable.class.st similarity index 96% rename from src/Slot-Core/UndeclaredVariable.class.st rename to src/Kernel/UndeclaredVariable.class.st index 25a7c026416..61c638b75c3 100644 --- a/src/Slot-Core/UndeclaredVariable.class.st +++ b/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 b/src/Kernel/Variable.class.st similarity index 98% rename from src/Slot-Core/Variable.class.st rename to src/Kernel/Variable.class.st index ec27f93cc54..1b3e91b6b97 100644 --- a/src/Slot-Core/Variable.class.st +++ b/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 b/src/Kernel/WorkspaceVariable.class.st similarity index 91% rename from src/Slot-Core/WorkspaceVariable.class.st rename to src/Kernel/WorkspaceVariable.class.st index 47fea860012..5662c1495ae 100644 --- a/src/Slot-Core/WorkspaceVariable.class.st +++ b/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' }