Skip to content

Commit

Permalink
50065
Browse files Browse the repository at this point in the history 
15606 Reflectivity: Add more reifications
	https://pharo.fogbugz.com/f/cases/15606

15604 Clean up OldClassBuilderAdapter more...
	https://pharo.fogbugz.com/f/cases/15604

http://files.pharo.org/image/50/50065.zip
  • Loading branch information
Jenkins Build Server authored and ci committed May 25, 2015
1 parent 4436520 commit f1385d7
Show file tree
Hide file tree
Showing 55 changed files with 200 additions and 65 deletions.
24 changes: 12 additions & 12 deletions ... creation/subclass_instanceVariableNames_classVariableNames_poolDictionaries_category_.st
View file
@@ -1,15 +1,15 @@
subclass: t instanceVariableNames: f classVariableNames: d poolDictionaries: s category: cat
"This is the standard initialization message for creating a new class as a
subclass of an existing class (the receiver)."
| class |
class := self classBuilder
name: t
inEnvironment: self environment
subclassOf: self
type: self typeOfClass
instanceVariableNames: f
classVariableNames: d
poolDictionaries: s
category: cat.
class ifNotNil: [ class setTraitComposition: {} asTraitComposition ].
^ class
^ PharoClassInstaller make: [ :builder |
builder
superclass: self;
name: t;
layoutClass: (ObjectLayout layoutForType: self typeOfClass);
slots: f asSlotCollection;
sharedVariablesFromString: d;
sharedPools: s;
category: cat;
environment: self environment;
copyTraitCompositionFromExistingClass;
copyClassSlotsFromExistingClass ].
1 change: 1 addition & 0 deletions Reflectivity.package/RFLinkReification.class/README.md
View file
@@ -0,0 +1 @@
I reify the link itself.
2 changes: 2 additions & 0 deletions Reflectivity.package/RFLinkReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#link
2 changes: 2 additions & 0 deletions Reflectivity.package/RFLinkReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBProgramNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFLinkReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFLinkReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions ...ivity.package/RFLinkReification.class/instance/as yet unclassified/genForRBProgramNode.st
View file
@@ -0,0 +1,2 @@
genForRBProgramNode
^link asLiteralNode
1 change: 1 addition & 0 deletions Reflectivity.package/RFNewValueReification.class/README.md
View file
@@ -0,0 +1 @@
the assigned value of an assignment
2 changes: 2 additions & 0 deletions Reflectivity.package/RFNewValueReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#newValue
2 changes: 2 additions & 0 deletions Reflectivity.package/RFNewValueReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBAssignmentNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFNewValueReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFNewValueReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions Reflectivity.package/RFNewValueReification.class/instance/generate/genForRBAssignmentNode.st
View file
@@ -0,0 +1,2 @@
genForRBAssignmentNode
^node value
1 change: 1 addition & 0 deletions Reflectivity.package/RFNodeReification.class/README.md
View file
@@ -0,0 +1 @@
I am the node that the link is installed on
2 changes: 2 additions & 0 deletions Reflectivity.package/RFNodeReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#node
2 changes: 2 additions & 0 deletions Reflectivity.package/RFNodeReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBProgramNode}.
5 changes: 5 additions & 0 deletions Reflectivity.package/RFNodeReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFNodeReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions ...ivity.package/RFNodeReification.class/instance/as yet unclassified/genForRBProgramNode.st
View file
@@ -0,0 +1,2 @@
genForRBProgramNode
^node asLiteralNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBAssignmentNode.st
View file
@@ -0,0 +1,2 @@
genForRBAssignmentNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBBlockNode.st
View file
@@ -0,0 +1,2 @@
genForRBBlockNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBCascadeNode.st
View file
@@ -0,0 +1,2 @@
genForRBCascadeNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBLiteralNode.st
View file
@@ -0,0 +1,2 @@
genForRBLiteralNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBProgramNode.st
View file
@@ -0,0 +1,2 @@
genForRBProgramNode
self subclassResponsibility
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBReturnNode.st
View file
@@ -0,0 +1,2 @@
genForRBReturnNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBSequenceNode.st
View file
@@ -0,0 +1,2 @@
genForRBSequenceNode
^self genForRBProgramNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFReification.class/instance/generate/genForRBVariableNode.st
View file
@@ -0,0 +1,2 @@
genForRBVariableNode
^self genForRBProgramNode
1 change: 1 addition & 0 deletions Reflectivity.package/RFSelectorReification.class/README.md
View file
@@ -0,0 +1 @@
I am the selector of a message send or method
2 changes: 2 additions & 0 deletions Reflectivity.package/RFSelectorReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#selector
2 changes: 2 additions & 0 deletions Reflectivity.package/RFSelectorReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBMessageNode. RBMethodNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFSelectorReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFSelectorReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions Reflectivity.package/RFSelectorReification.class/instance/generate/genForRBMessageNode.st
View file
@@ -0,0 +1,2 @@
genForRBMessageNode
^node selector asLiteralNode
2 changes: 2 additions & 0 deletions Reflectivity.package/RFSelectorReification.class/instance/generate/genForRBMethodNode.st
View file
@@ -0,0 +1,2 @@
genForRBMethodNode
^node selector asLiteralNode
1 change: 1 addition & 0 deletions Reflectivity.package/RFTArgumentsReification.class/README.md
View file
@@ -0,0 +1 @@
I reify the arguments of a message send
2 changes: 2 additions & 0 deletions Reflectivity.package/RFTArgumentsReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#arguments
2 changes: 2 additions & 0 deletions Reflectivity.package/RFTArgumentsReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBMessageNode. RBMethodNode. RBBlockNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFTArgumentsReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFTArgumentsReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
16 changes: 16 additions & 0 deletions Reflectivity.package/RFTArgumentsReification.class/instance/generate/genForRBProgramNode.st
View file
@@ -0,0 +1,16 @@
genForRBProgramNode
node numArgs = 0
ifTrue: [ ^ #() asLiteralNode ].
node numArgs <= 4
ifTrue: [ ^ RBMessageNode receiver: Array asLiteralNode selector: (#braceWith numArgs: node numArgs) arguments: node arguments ].
node numArgs > 4
ifTrue: [
| stream messages |
stream := RBMessageNode
receiver: Array asLiteralNode
selector: #braceStream:
argument: node arguments size asLiteralNode.
messages := (node arguments collect: [ :each | RBMessageNode receiver: stream selector: #nextPut: argument: each ])
asOrderedCollection.
messages add: (RBMessageNode receiver: stream selector: #braceArray).
^ RBCascadeNode messages: messages ]
1 change: 1 addition & 0 deletions Reflectivity.package/RFThisContextReification.class/README.md
View file
@@ -0,0 +1 @@
I can be used to pass the context to the meta object
2 changes: 2 additions & 0 deletions Reflectivity.package/RFThisContextReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#context
2 changes: 2 additions & 0 deletions Reflectivity.package/RFThisContextReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBProgramNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFThisContextReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFThisContextReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions Reflectivity.package/RFThisContextReification.class/instance/generate/genForRBProgramNode.st
View file
@@ -0,0 +1,2 @@
genForRBProgramNode
^RBVariableNode named: 'thisContext'
1 change: 1 addition & 0 deletions Reflectivity.package/RFValueReification.class/README.md
View file
@@ -0,0 +1 @@
value of a variable read or assignment
2 changes: 2 additions & 0 deletions Reflectivity.package/RFValueReification.class/class/plugin interface/key.st
View file
@@ -0,0 +1,2 @@
key
^#value
2 changes: 2 additions & 0 deletions Reflectivity.package/RFValueReification.class/class/plugin interface/nodes.st
View file
@@ -0,0 +1,2 @@
nodes
^{RBVariableNode. RBAssignmentNode}
5 changes: 5 additions & 0 deletions Reflectivity.package/RFValueReification.class/definition.st
View file
@@ -0,0 +1,5 @@
RFReification subclass: #RFValueReification
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'Reflectivity-Links'
2 changes: 2 additions & 0 deletions Reflectivity.package/RFValueReification.class/instance/generate/genForRBAssignmentNode.st
View file
@@ -0,0 +1,2 @@
genForRBAssignmentNode
^node variable
2 changes: 2 additions & 0 deletions Reflectivity.package/RFValueReification.class/instance/generate/genForRBTempVariableNode.st
View file
@@ -0,0 +1,2 @@
genForRBTempVariableNode
^node copy.
3 changes: 3 additions & 0 deletions Reflectivity.package/RFValueReification.class/instance/generate/genForRBVariableNode.st
View file
@@ -0,0 +1,3 @@
genForRBVariableNode
node isGlobal ifTrue: [^node binding value asLiteralNode].
^node copy.
8 changes: 4 additions & 4 deletions ...s/instance/pharo - scripts/script50064.st → ...s/instance/pharo - scripts/script50065.st
View file
@@ -1,4 +1,4 @@
script50064
script50065

^ 'AST-Core-TheIntegrator.294.mcz
AST-Tests-Core-TheIntegrator.68.mcz
Expand Down Expand Up @@ -114,7 +114,7 @@ HudsonBuildTools20-TheIntegrator.65.mcz
IssueTracking-TheIntegrator.6.mcz
IssueTracking-Tests-TheIntegrator.3.mcz
Jobs-EstebanLorenzano.4.mcz
Kernel-TheIntegrator.2035.mcz
Kernel-TheIntegrator.2037.mcz
KernelTests-TheIntegrator.776.mcz
Keymapping-Core-EstebanLorenzano.195.mcz
Keymapping-KeyCombinations-TheIntegrator.48.mcz
Expand Down Expand Up @@ -224,7 +224,7 @@ Refactoring-Tests-Changes-MarcusDenker.38.mcz
Refactoring-Tests-Core-TheIntegrator.123.mcz
Refactoring-Tests-Critics-TheIntegrator.31.mcz
Refactoring-Tests-Environment-StephaneDucasse.11.mcz
Reflectivity-TheIntegrator.48.mcz
Reflectivity-TheIntegrator.50.mcz
Reflectivity-Tests-TheIntegrator.34.mcz
Regex-Core-MarcusDenker.33.mcz
Regex-Help-MarcusDenker.5.mcz
Expand Down Expand Up @@ -314,7 +314,7 @@ Tool-TxWorkspace-TorstenBergmann.5.mcz
Tool-Workspace-TheIntegrator.24.mcz
Tools-TheIntegrator.1503.mcz
ToolsTest-MarcusDenker.denker.71.mcz
Traits-TheIntegrator.771.mcz
Traits-TheIntegrator.773.mcz
Transcript-TheIntegrator.34.mcz
TxText-Athens-SeanDeNigris.50.mcz
TxText-AthensTests-SeanDeNigris.10.mcz
Expand Down
9 changes: 0 additions & 9 deletions ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50064.st
View file

This file was deleted.

9 changes: 9 additions & 0 deletions ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50065.st
View file
@@ -0,0 +1,9 @@
update50065
"self new update50065"
self withUpdateLog: '15606 Reflectivity: Add more reifications
https://pharo.fogbugz.com/f/cases/15606
15604 Clean up OldClassBuilderAdapter more...
https://pharo.fogbugz.com/f/cases/15604'.
self loadTogether: self script50065 merge: false.
self flushCaches.
7 changes: 4 additions & 3 deletions ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
View file
@@ -1,5 +1,6 @@
commentForCurrentUpdate
^ '15605 Update Rubric
https://pharo.fogbugz.com/f/cases/15605
^ '15606 Reflectivity: Add more reifications
https://pharo.fogbugz.com/f/cases/15606
'
15604 Clean up OldClassBuilderAdapter more...
https://pharo.fogbugz.com/f/cases/15604'
22 changes: 13 additions & 9 deletions ...riableByteSubclass_instanceVariableNames_classVariableNames_poolDictionaries_category_.st
View file
Expand Up @@ -10,12 +10,16 @@ variableByteSubclass: t instanceVariableNames: f
and: [oldClassOrNil typeOfClass == #compiledMethod])
ifTrue: [#compiledMethod]
ifFalse: [#bytes].
^self classBuilder
name: t
inEnvironment: self environment
subclassOf: self
type: actualType
instanceVariableNames: f
classVariableNames: d
poolDictionaries: s
category: cat

^ PharoClassInstaller make: [ :builder |
builder
superclass: self;
name: t;
layoutClass: (ObjectLayout layoutForType: actualType);
slots: f asSlotCollection;
sharedVariablesFromString: d;
sharedPools: s;
category: cat;
environment: self environment;
copyTraitCompositionFromExistingClass;
copyClassSlotsFromExistingClass ].
23 changes: 13 additions & 10 deletions ...n/variableSubclass_instanceVariableNames_classVariableNames_poolDictionaries_category_.st
View file
Expand Up @@ -2,13 +2,16 @@ variableSubclass: t instanceVariableNames: f classVariableNames: d poolDictionar
"This is the standard initialization message for creating a new class as a
subclass of an existing class (the receiver) in which the subclass is to
have indexable pointer variables."

^ self classBuilder
name: t
inEnvironment: self environment
subclassOf: self
type: #variable
instanceVariableNames: f
classVariableNames: d
poolDictionaries: s
category: cat

^ PharoClassInstaller make: [ :builder |
builder
superclass: self;
name: t;
layoutClass: (ObjectLayout layoutForType: #variable);
slots: f asSlotCollection;
sharedVariablesFromString: d;
sharedPools: s;
category: cat;
environment: self environment;
copyTraitCompositionFromExistingClass;
copyClassSlotsFromExistingClass ].
21 changes: 12 additions & 9 deletions ...riableWordSubclass_instanceVariableNames_classVariableNames_poolDictionaries_category_.st
View file
Expand Up @@ -3,12 +3,15 @@ variableWordSubclass: t instanceVariableNames: f
"This is the standard initialization message for creating a new class as a
subclass of an existing class (the receiver) in which the subclass is to
have indexable word-sized nonpointer variables."
^self classBuilder
name: t
inEnvironment: self environment
subclassOf: self
type: #words
instanceVariableNames: f
classVariableNames: d
poolDictionaries: s
category: cat
^ PharoClassInstaller make: [ :builder |
builder
superclass: self;
name: t;
layoutClass: (ObjectLayout layoutForType: #words);
slots: f asSlotCollection;
sharedVariablesFromString: d;
sharedPools: s;
category: cat;
environment: self environment;
copyTraitCompositionFromExistingClass;
copyClassSlotsFromExistingClass ].

0 comments on commit f1385d7

Please sign in to comment.