diff --git a/BaselineOfDruid/BaselineOfDruid.class.st b/BaselineOfDruid/BaselineOfDruid.class.st index 218f0946..32581cf8 100644 --- a/BaselineOfDruid/BaselineOfDruid.class.st +++ b/BaselineOfDruid/BaselineOfDruid.class.st @@ -32,15 +32,18 @@ BaselineOfDruid >> baseline: spec [ spec package: 'Druid' with: [ spec requires: #('AIGraphAlgorithms' 'MachineArithmetic') ]; + package: 'Druid-Tests' with: [ spec requires: #('Druid') ]; + package: 'Druid-Cogit' with: [ spec requires: #('Druid' 'PharoVM') ]; + package: 'Druid-Cogit-Tests' with: [ spec requires: #('Druid-Cogit' 'Druid-Tests') ]; package: 'Druid-Opal' with: [ spec requires: #('Druid') ]; - package: 'Druid-Tests' with: [ spec requires: #('Druid') ]; + package: 'Druid-Opal-Tests' with: [ spec requires: #('Druid-Opal' 'Druid-Tests') ]; package: 'Druid-UI' with: [ spec requires: #('Druid' 'Druid-Tests') ]. spec group: 'Core' with: #('Druid'); - group: 'Cogit' with: #('Druid-Cogit' 'Druid-Tests'); - group: 'Opal' with: #('Druid-Opal'); + group: 'Cogit' with: #('Druid-Cogit' 'Druid-Cogit-Tests'); + group: 'Opal' with: #('Druid-Opal' 'Druid-Opal-Tests'); group: 'Full' with: #('Core' 'Cogit' 'Opal'); group: 'Tests' with: #('Druid-Tests'); group: 'UI' with: #('Druid-UI'); diff --git a/Druid-Tests/DRAbstractCompilerCollectorTest.class.st b/Druid-Cogit-Tests/DRAbstractCompilerCollectorTest.class.st similarity index 92% rename from Druid-Tests/DRAbstractCompilerCollectorTest.class.st rename to Druid-Cogit-Tests/DRAbstractCompilerCollectorTest.class.st index faab8209..faa039d6 100644 --- a/Druid-Tests/DRAbstractCompilerCollectorTest.class.st +++ b/Druid-Cogit-Tests/DRAbstractCompilerCollectorTest.class.st @@ -8,9 +8,8 @@ Class { #instVars : [ 'testingEnvironment' ], - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'initialization' } diff --git a/Druid-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st b/Druid-Cogit-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st similarity index 90% rename from Druid-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st rename to Druid-Cogit-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st index a37b8589..0e294b72 100644 --- a/Druid-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st +++ b/Druid-Cogit-Tests/DRBasicCogInterpreterArithmeticPrimitives.class.st @@ -4,9 +4,8 @@ Implements an Interpreter with very few arithmetic primitives. None of the primi Class { #name : 'DRBasicCogInterpreterArithmeticPrimitives', #superclass : 'CogVMSimulatorLSB', - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'constants' } diff --git a/Druid-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st b/Druid-Cogit-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st similarity index 87% rename from Druid-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st rename to Druid-Cogit-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st index d115a371..9881dadd 100644 --- a/Druid-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st +++ b/Druid-Cogit-Tests/DRBasicCogInterpreterObjectMemoryPrimitives.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRBasicCogInterpreterObjectMemoryPrimitives', #superclass : 'CogVMSimulatorLSB', - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'constants' } diff --git a/Druid-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st b/Druid-Cogit-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st similarity index 87% rename from Druid-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st rename to Druid-Cogit-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st index 64ec604b..3078d463 100644 --- a/Druid-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st +++ b/Druid-Cogit-Tests/DRBasicCogInterpreterPrimitivesWithoutParameters.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRBasicCogInterpreterPrimitivesWithoutParameters', #superclass : 'CogVMSimulatorLSB', - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'constants' } diff --git a/Druid-Tests/DRBytecodeCompilationTest.class.st b/Druid-Cogit-Tests/DRBytecodeCompilationTest.class.st similarity index 99% rename from Druid-Tests/DRBytecodeCompilationTest.class.st rename to Druid-Cogit-Tests/DRBytecodeCompilationTest.class.st index d4ecbf55..3b291531 100644 --- a/Druid-Tests/DRBytecodeCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRBytecodeCompilationTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRBytecodeCompilationTest', #superclass : 'DRMetaCompilationTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRBytecodeCompilationTestResource.class.st b/Druid-Cogit-Tests/DRBytecodeCompilationTestResource.class.st similarity index 98% rename from Druid-Tests/DRBytecodeCompilationTestResource.class.st rename to Druid-Cogit-Tests/DRBytecodeCompilationTestResource.class.st index 2f167588..e577faf6 100644 --- a/Druid-Tests/DRBytecodeCompilationTestResource.class.st +++ b/Druid-Cogit-Tests/DRBytecodeCompilationTestResource.class.st @@ -8,8 +8,8 @@ Class { #classInstVars : [ 'mode' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRBytecodeScenarioCompilationTest.class.st b/Druid-Cogit-Tests/DRBytecodeScenarioCompilationTest.class.st similarity index 99% rename from Druid-Tests/DRBytecodeScenarioCompilationTest.class.st rename to Druid-Cogit-Tests/DRBytecodeScenarioCompilationTest.class.st index 7c7c8832..9e6afb0a 100644 --- a/Druid-Tests/DRBytecodeScenarioCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRBytecodeScenarioCompilationTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRBytecodeScenarioCompilationTest', #superclass : 'DRBytecodeCompilationTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRCleanStackInstructionsTest.class.st b/Druid-Cogit-Tests/DRCleanStackInstructionsTest.class.st similarity index 97% rename from Druid-Tests/DRCleanStackInstructionsTest.class.st rename to Druid-Cogit-Tests/DRCleanStackInstructionsTest.class.st index 33e33add..bf3039b7 100644 --- a/Druid-Tests/DRCleanStackInstructionsTest.class.st +++ b/Druid-Cogit-Tests/DRCleanStackInstructionsTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRCleanStackInstructionsTest', #superclass : 'DROptimisationTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRCogitCanonicaliserTest.class.st b/Druid-Cogit-Tests/DRCogitCanonicaliserTest.class.st similarity index 99% rename from Druid-Tests/DRCogitCanonicaliserTest.class.st rename to Druid-Cogit-Tests/DRCogitCanonicaliserTest.class.st index 420856dd..7862e280 100644 --- a/Druid-Tests/DRCogitCanonicaliserTest.class.st +++ b/Druid-Cogit-Tests/DRCogitCanonicaliserTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRCogitCanonicaliserTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRCogitGeneratorTest.class.st b/Druid-Cogit-Tests/DRCogitGeneratorTest.class.st similarity index 99% rename from Druid-Tests/DRCogitGeneratorTest.class.st rename to Druid-Cogit-Tests/DRCogitGeneratorTest.class.st index 74642b90..590868eb 100644 --- a/Druid-Tests/DRCogitGeneratorTest.class.st +++ b/Druid-Cogit-Tests/DRCogitGeneratorTest.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'generator' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'helpers' } diff --git a/Druid-Tests/DRCogitOperandSorterTest.class.st b/Druid-Cogit-Tests/DRCogitOperandSorterTest.class.st similarity index 98% rename from Druid-Tests/DRCogitOperandSorterTest.class.st rename to Druid-Cogit-Tests/DRCogitOperandSorterTest.class.st index 37d6eaaf..b5be432f 100644 --- a/Druid-Tests/DRCogitOperandSorterTest.class.st +++ b/Druid-Cogit-Tests/DRCogitOperandSorterTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRCogitOperandSorterTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRCogitRegisterAllocatorTest.class.st b/Druid-Cogit-Tests/DRCogitRegisterAllocatorTest.class.st similarity index 99% rename from Druid-Tests/DRCogitRegisterAllocatorTest.class.st rename to Druid-Cogit-Tests/DRCogitRegisterAllocatorTest.class.st index 6b50412b..2d2c9a7b 100644 --- a/Druid-Tests/DRCogitRegisterAllocatorTest.class.st +++ b/Druid-Cogit-Tests/DRCogitRegisterAllocatorTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRCogitRegisterAllocatorTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRCogitStackCoalescingTest.class.st b/Druid-Cogit-Tests/DRCogitStackCoalescingTest.class.st similarity index 98% rename from Druid-Tests/DRCogitStackCoalescingTest.class.st rename to Druid-Cogit-Tests/DRCogitStackCoalescingTest.class.st index afd9c54f..77d1dd0a 100644 --- a/Druid-Tests/DRCogitStackCoalescingTest.class.st +++ b/Druid-Cogit-Tests/DRCogitStackCoalescingTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRCogitStackCoalescingTest', #superclass : 'DROptimisationTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRCogitStackToRegisterGeneratorTest.class.st b/Druid-Cogit-Tests/DRCogitStackToRegisterGeneratorTest.class.st similarity index 96% rename from Druid-Tests/DRCogitStackToRegisterGeneratorTest.class.st rename to Druid-Cogit-Tests/DRCogitStackToRegisterGeneratorTest.class.st index 0a307d62..a3bbecf7 100644 --- a/Druid-Tests/DRCogitStackToRegisterGeneratorTest.class.st +++ b/Druid-Cogit-Tests/DRCogitStackToRegisterGeneratorTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRCogitStackToRegisterGeneratorTest', #superclass : 'DRCogitGeneratorTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'helpers' } diff --git a/Druid-Tests/DRComposedConditionalSplittingTest.class.st b/Druid-Cogit-Tests/DRComposedConditionalSplittingTest.class.st similarity index 98% rename from Druid-Tests/DRComposedConditionalSplittingTest.class.st rename to Druid-Cogit-Tests/DRComposedConditionalSplittingTest.class.st index de153afd..0d21f82b 100644 --- a/Druid-Tests/DRComposedConditionalSplittingTest.class.st +++ b/Druid-Cogit-Tests/DRComposedConditionalSplittingTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRComposedConditionalSplittingTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'initialization' } diff --git a/Druid-Tests/DRCustomisedCompilerTest.class.st b/Druid-Cogit-Tests/DRCustomisedCompilerTest.class.st similarity index 97% rename from Druid-Tests/DRCustomisedCompilerTest.class.st rename to Druid-Cogit-Tests/DRCustomisedCompilerTest.class.st index 7ad03af6..6eae95ed 100644 --- a/Druid-Tests/DRCustomisedCompilerTest.class.st +++ b/Druid-Cogit-Tests/DRCustomisedCompilerTest.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'compiler' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRDeadPathEliminationTest.class.st b/Druid-Cogit-Tests/DRDeadPathEliminationTest.class.st similarity index 98% rename from Druid-Tests/DRDeadPathEliminationTest.class.st rename to Druid-Cogit-Tests/DRDeadPathEliminationTest.class.st index ff2b6a08..14de118e 100644 --- a/Druid-Tests/DRDeadPathEliminationTest.class.st +++ b/Druid-Cogit-Tests/DRDeadPathEliminationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRDeadPathEliminationTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'initialization' } diff --git a/Druid-Tests/DRDispatchTableBuilderTest.class.st b/Druid-Cogit-Tests/DRDispatchTableBuilderTest.class.st similarity index 91% rename from Druid-Tests/DRDispatchTableBuilderTest.class.st rename to Druid-Cogit-Tests/DRDispatchTableBuilderTest.class.st index 1b0e26b6..46cb073f 100644 --- a/Druid-Tests/DRDispatchTableBuilderTest.class.st +++ b/Druid-Cogit-Tests/DRDispatchTableBuilderTest.class.st @@ -7,9 +7,8 @@ Class { #instVars : [ 'dispatchTableBuilder' ], - #category : 'Druid-Tests-InterpreterBuilder', - #package : 'Druid-Tests', - #tag : 'InterpreterBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRDruidTest.class.st b/Druid-Cogit-Tests/DRDruidTest.class.st similarity index 94% rename from Druid-Tests/DRDruidTest.class.st rename to Druid-Cogit-Tests/DRDruidTest.class.st index 132c65fe..b946d054 100644 --- a/Druid-Tests/DRDruidTest.class.st +++ b/Druid-Cogit-Tests/DRDruidTest.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'fakeTrampoline' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'private' } diff --git a/Druid-Tests/DREmptyInterpreter.class.st b/Druid-Cogit-Tests/DREmptyInterpreter.class.st similarity index 93% rename from Druid-Tests/DREmptyInterpreter.class.st rename to Druid-Cogit-Tests/DREmptyInterpreter.class.st index bb160ac3..ddf5b82e 100644 --- a/Druid-Tests/DREmptyInterpreter.class.st +++ b/Druid-Cogit-Tests/DREmptyInterpreter.class.st @@ -5,8 +5,8 @@ It represents an empty interpreter, i.e. it doesn't provide any primitive method Class { #name : 'DREmptyInterpreter', #superclass : 'CogVMSimulatorLSB', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'constants' } diff --git a/Druid-Tests/DRInlinePrimitiveTest.class.st b/Druid-Cogit-Tests/DRInlinePrimitiveTest.class.st similarity index 95% rename from Druid-Tests/DRInlinePrimitiveTest.class.st rename to Druid-Cogit-Tests/DRInlinePrimitiveTest.class.st index 0ba9cb55..47d5d761 100644 --- a/Druid-Tests/DRInlinePrimitiveTest.class.st +++ b/Druid-Cogit-Tests/DRInlinePrimitiveTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRInlinePrimitiveTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'initialization' } diff --git a/Druid-Tests/DRInterpreterCompilationUnitTest.class.st b/Druid-Cogit-Tests/DRInterpreterCompilationUnitTest.class.st similarity index 98% rename from Druid-Tests/DRInterpreterCompilationUnitTest.class.st rename to Druid-Cogit-Tests/DRInterpreterCompilationUnitTest.class.st index 3baac2f1..b0838cf7 100644 --- a/Druid-Tests/DRInterpreterCompilationUnitTest.class.st +++ b/Druid-Cogit-Tests/DRInterpreterCompilationUnitTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRInterpreterCompilationUnitTest', #superclass : 'TestCase', - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'configuration' } diff --git a/Druid-Tests/DRInterpreterToCompilerTest.class.st b/Druid-Cogit-Tests/DRInterpreterToCompilerTest.class.st similarity index 98% rename from Druid-Tests/DRInterpreterToCompilerTest.class.st rename to Druid-Cogit-Tests/DRInterpreterToCompilerTest.class.st index 3d2970a5..6c825750 100644 --- a/Druid-Tests/DRInterpreterToCompilerTest.class.st +++ b/Druid-Cogit-Tests/DRInterpreterToCompilerTest.class.st @@ -4,9 +4,8 @@ Class { #instVars : [ 'interpreterToCompiler' ], - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRLinearScanRegisterAllocatorTest.class.st b/Druid-Cogit-Tests/DRLinearScanRegisterAllocatorTest.class.st similarity index 99% rename from Druid-Tests/DRLinearScanRegisterAllocatorTest.class.st rename to Druid-Cogit-Tests/DRLinearScanRegisterAllocatorTest.class.st index bf06a2ba..8d1fab6b 100644 --- a/Druid-Tests/DRLinearScanRegisterAllocatorTest.class.st +++ b/Druid-Cogit-Tests/DRLinearScanRegisterAllocatorTest.class.st @@ -6,8 +6,8 @@ Class { 'spillRegister1', 'spillRegister2' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRLinearizationTest.class.st b/Druid-Cogit-Tests/DRLinearizationTest.class.st similarity index 99% rename from Druid-Tests/DRLinearizationTest.class.st rename to Druid-Cogit-Tests/DRLinearizationTest.class.st index 718f1fde..fa205b73 100644 --- a/Druid-Tests/DRLinearizationTest.class.st +++ b/Druid-Cogit-Tests/DRLinearizationTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRLinearizationTest', #superclass : 'DRDruidTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests-basic' } diff --git a/Druid-Tests/DRLoopInvariantCodeMotionTest.class.st b/Druid-Cogit-Tests/DRLoopInvariantCodeMotionTest.class.st similarity index 98% rename from Druid-Tests/DRLoopInvariantCodeMotionTest.class.st rename to Druid-Cogit-Tests/DRLoopInvariantCodeMotionTest.class.st index 1bdba3ff..29ec7cc5 100644 --- a/Druid-Tests/DRLoopInvariantCodeMotionTest.class.st +++ b/Druid-Cogit-Tests/DRLoopInvariantCodeMotionTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRLoopInvariantCodeMotionTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'assertion' } diff --git a/Druid-Tests/DRLoopTest.class.st b/Druid-Cogit-Tests/DRLoopTest.class.st similarity index 97% rename from Druid-Tests/DRLoopTest.class.st rename to Druid-Cogit-Tests/DRLoopTest.class.st index 26fac6f9..44b3fc1f 100644 --- a/Druid-Tests/DRLoopTest.class.st +++ b/Druid-Cogit-Tests/DRLoopTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRLoopTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRLoopUnrollingTest.class.st b/Druid-Cogit-Tests/DRLoopUnrollingTest.class.st similarity index 97% rename from Druid-Tests/DRLoopUnrollingTest.class.st rename to Druid-Cogit-Tests/DRLoopUnrollingTest.class.st index 8c8320fe..1652c059 100644 --- a/Druid-Tests/DRLoopUnrollingTest.class.st +++ b/Druid-Cogit-Tests/DRLoopUnrollingTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRLoopUnrollingTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'generation-IR' } diff --git a/Druid-Tests/DRMetaCompilationTest.class.st b/Druid-Cogit-Tests/DRMetaCompilationTest.class.st similarity index 94% rename from Druid-Tests/DRMetaCompilationTest.class.st rename to Druid-Cogit-Tests/DRMetaCompilationTest.class.st index c9da336c..ade6bb6b 100644 --- a/Druid-Tests/DRMetaCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRMetaCompilationTest.class.st @@ -5,8 +5,8 @@ Class { 'cogitStyle', 'compilerClass' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'building suites' } diff --git a/Druid-Tests/DRMetacompilerTest.class.st b/Druid-Cogit-Tests/DRMetacompilerTest.class.st similarity index 90% rename from Druid-Tests/DRMetacompilerTest.class.st rename to Druid-Cogit-Tests/DRMetacompilerTest.class.st index e654081d..2060aed0 100644 --- a/Druid-Tests/DRMetacompilerTest.class.st +++ b/Druid-Cogit-Tests/DRMetacompilerTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRMetacompilerTest', #superclass : 'DROptimisationTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRPathGenerationTest.class.st b/Druid-Cogit-Tests/DRPathGenerationTest.class.st similarity index 99% rename from Druid-Tests/DRPathGenerationTest.class.st rename to Druid-Cogit-Tests/DRPathGenerationTest.class.st index 8b20bd2b..d4bcf121 100644 --- a/Druid-Tests/DRPathGenerationTest.class.st +++ b/Druid-Cogit-Tests/DRPathGenerationTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRPathGenerationTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'api' } diff --git a/Druid-Tests/DRPiABCDDeadBranchEliminationTest.class.st b/Druid-Cogit-Tests/DRPiABCDDeadBranchEliminationTest.class.st similarity index 98% rename from Druid-Tests/DRPiABCDDeadBranchEliminationTest.class.st rename to Druid-Cogit-Tests/DRPiABCDDeadBranchEliminationTest.class.st index 516ef339..82e2187e 100644 --- a/Druid-Tests/DRPiABCDDeadBranchEliminationTest.class.st +++ b/Druid-Cogit-Tests/DRPiABCDDeadBranchEliminationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiABCDDeadBranchEliminationTest', #superclass : 'DRPiNodesTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRPiConstantDeadBranchEliminationTest.class.st b/Druid-Cogit-Tests/DRPiConstantDeadBranchEliminationTest.class.st similarity index 97% rename from Druid-Tests/DRPiConstantDeadBranchEliminationTest.class.st rename to Druid-Cogit-Tests/DRPiConstantDeadBranchEliminationTest.class.st index 76b22416..82c7edb0 100644 --- a/Druid-Tests/DRPiConstantDeadBranchEliminationTest.class.st +++ b/Druid-Cogit-Tests/DRPiConstantDeadBranchEliminationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiConstantDeadBranchEliminationTest', #superclass : 'DRPiNodesTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRPiMessageSplittingTest.class.st b/Druid-Cogit-Tests/DRPiMessageSplittingTest.class.st similarity index 91% rename from Druid-Tests/DRPiMessageSplittingTest.class.st rename to Druid-Cogit-Tests/DRPiMessageSplittingTest.class.st index 560e9c6f..e03203aa 100644 --- a/Druid-Tests/DRPiMessageSplittingTest.class.st +++ b/Druid-Cogit-Tests/DRPiMessageSplittingTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiMessageSplittingTest', #superclass : 'DRPiNodesTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRPiNodesInsertionTest.class.st b/Druid-Cogit-Tests/DRPiNodesInsertionTest.class.st similarity index 98% rename from Druid-Tests/DRPiNodesInsertionTest.class.st rename to Druid-Cogit-Tests/DRPiNodesInsertionTest.class.st index d6ccbab9..6c2a1fca 100644 --- a/Druid-Tests/DRPiNodesInsertionTest.class.st +++ b/Druid-Cogit-Tests/DRPiNodesInsertionTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiNodesInsertionTest', #superclass : 'DRPiNodesTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRPiNodesTest.class.st b/Druid-Cogit-Tests/DRPiNodesTest.class.st similarity index 94% rename from Druid-Tests/DRPiNodesTest.class.st rename to Druid-Cogit-Tests/DRPiNodesTest.class.st index 9ac32ab9..602e0716 100644 --- a/Druid-Tests/DRPiNodesTest.class.st +++ b/Druid-Cogit-Tests/DRPiNodesTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiNodesTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRPiZ3DeadBranchEliminationTest.class.st b/Druid-Cogit-Tests/DRPiZ3DeadBranchEliminationTest.class.st similarity index 98% rename from Druid-Tests/DRPiZ3DeadBranchEliminationTest.class.st rename to Druid-Cogit-Tests/DRPiZ3DeadBranchEliminationTest.class.st index 0e66514a..33bbafa3 100644 --- a/Druid-Tests/DRPiZ3DeadBranchEliminationTest.class.st +++ b/Druid-Cogit-Tests/DRPiZ3DeadBranchEliminationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRPiZ3DeadBranchEliminationTest', #superclass : 'DRPiNodesTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRPrimitiveCompilationTest.class.st b/Druid-Cogit-Tests/DRPrimitiveCompilationTest.class.st similarity index 98% rename from Druid-Tests/DRPrimitiveCompilationTest.class.st rename to Druid-Cogit-Tests/DRPrimitiveCompilationTest.class.st index a0830c6c..6cf5b0e0 100644 --- a/Druid-Tests/DRPrimitiveCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRPrimitiveCompilationTest.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'stopAddress' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing - primitives' } diff --git a/Druid-Tests/DRPrimitiveCompilationTestResource.class.st b/Druid-Cogit-Tests/DRPrimitiveCompilationTestResource.class.st similarity index 96% rename from Druid-Tests/DRPrimitiveCompilationTestResource.class.st rename to Druid-Cogit-Tests/DRPrimitiveCompilationTestResource.class.st index 71f7178a..72fecb55 100644 --- a/Druid-Tests/DRPrimitiveCompilationTestResource.class.st +++ b/Druid-Cogit-Tests/DRPrimitiveCompilationTestResource.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRPrimitiveCompilationTestResource', #superclass : 'DRBytecodeCompilationTestResource', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRPrimitiveScenarioCompilationTest.class.st b/Druid-Cogit-Tests/DRPrimitiveScenarioCompilationTest.class.st similarity index 99% rename from Druid-Tests/DRPrimitiveScenarioCompilationTest.class.st rename to Druid-Cogit-Tests/DRPrimitiveScenarioCompilationTest.class.st index b3f82314..09768741 100644 --- a/Druid-Tests/DRPrimitiveScenarioCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRPrimitiveScenarioCompilationTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRPrimitiveScenarioCompilationTest', #superclass : 'DRPrimitiveCompilationTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests-methodactivations' } diff --git a/Druid-Tests/DRPrimitiveSelectionTest.class.st b/Druid-Cogit-Tests/DRPrimitiveSelectionTest.class.st similarity index 95% rename from Druid-Tests/DRPrimitiveSelectionTest.class.st rename to Druid-Cogit-Tests/DRPrimitiveSelectionTest.class.st index 15cc0e4a..ea3f37d7 100644 --- a/Druid-Tests/DRPrimitiveSelectionTest.class.st +++ b/Druid-Cogit-Tests/DRPrimitiveSelectionTest.class.st @@ -5,9 +5,8 @@ Class { 'primitiveMethods', 'interpreterToCompiler' ], - #category : 'Druid-Tests-CompilerBuilder', - #package : 'Druid-Tests', - #tag : 'CompilerBuilder' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRProductionBytecodeTest.class.st b/Druid-Cogit-Tests/DRProductionBytecodeTest.class.st similarity index 99% rename from Druid-Tests/DRProductionBytecodeTest.class.st rename to Druid-Cogit-Tests/DRProductionBytecodeTest.class.st index d9dd564b..741f15f2 100644 --- a/Druid-Tests/DRProductionBytecodeTest.class.st +++ b/Druid-Cogit-Tests/DRProductionBytecodeTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRProductionBytecodeTest', #superclass : 'DRBytecodeCompilationTest', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRProductionPrimitiveCompilationTest.class.st b/Druid-Cogit-Tests/DRProductionPrimitiveCompilationTest.class.st similarity index 99% rename from Druid-Tests/DRProductionPrimitiveCompilationTest.class.st rename to Druid-Cogit-Tests/DRProductionPrimitiveCompilationTest.class.st index 2e01a1f4..4d1de613 100644 --- a/Druid-Tests/DRProductionPrimitiveCompilationTest.class.st +++ b/Druid-Cogit-Tests/DRProductionPrimitiveCompilationTest.class.st @@ -5,8 +5,8 @@ Class { 'finishCodeAddress', 'finishEndInstruction' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing - primitives' } diff --git a/Druid-Tests/DRStackEffectTest.class.st b/Druid-Cogit-Tests/DRStackEffectTest.class.st similarity index 98% rename from Druid-Tests/DRStackEffectTest.class.st rename to Druid-Cogit-Tests/DRStackEffectTest.class.st index 5fe51e00..38bedce5 100644 --- a/Druid-Tests/DRStackEffectTest.class.st +++ b/Druid-Cogit-Tests/DRStackEffectTest.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'irBuilder' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'accessing' } diff --git a/Druid-Tests/DRStagingTest.class.st b/Druid-Cogit-Tests/DRStagingTest.class.st similarity index 98% rename from Druid-Tests/DRStagingTest.class.st rename to Druid-Cogit-Tests/DRStagingTest.class.st index 95c3e9b0..9eb29feb 100644 --- a/Druid-Tests/DRStagingTest.class.st +++ b/Druid-Cogit-Tests/DRStagingTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRStagingTest', #superclass : 'DROptimisationTest', - #category : 'Druid-Tests-Staging', - #package : 'Druid-Tests', - #tag : 'Staging' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRStoreTemporaryStagedLoopTest.class.st b/Druid-Cogit-Tests/DRStoreTemporaryStagedLoopTest.class.st similarity index 93% rename from Druid-Tests/DRStoreTemporaryStagedLoopTest.class.st rename to Druid-Cogit-Tests/DRStoreTemporaryStagedLoopTest.class.st index df6f2f67..ecedec2b 100644 --- a/Druid-Tests/DRStoreTemporaryStagedLoopTest.class.st +++ b/Druid-Cogit-Tests/DRStoreTemporaryStagedLoopTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRStoreTemporaryStagedLoopTest', #superclass : 'DROptimisationTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRTailDuplicateStagedExpressionsTest.class.st b/Druid-Cogit-Tests/DRTailDuplicateStagedExpressionsTest.class.st similarity index 91% rename from Druid-Tests/DRTailDuplicateStagedExpressionsTest.class.st rename to Druid-Cogit-Tests/DRTailDuplicateStagedExpressionsTest.class.st index f93a9b0a..b01b0e75 100644 --- a/Druid-Tests/DRTailDuplicateStagedExpressionsTest.class.st +++ b/Druid-Cogit-Tests/DRTailDuplicateStagedExpressionsTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRTailDuplicateStagedExpressionsTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'running' } diff --git a/Druid-Tests/DRTailDuplicationTest.class.st b/Druid-Cogit-Tests/DRTailDuplicationTest.class.st similarity index 99% rename from Druid-Tests/DRTailDuplicationTest.class.st rename to Druid-Cogit-Tests/DRTailDuplicationTest.class.st index dab0de65..37d64c5e 100644 --- a/Druid-Tests/DRTailDuplicationTest.class.st +++ b/Druid-Cogit-Tests/DRTailDuplicationTest.class.st @@ -1,9 +1,8 @@ Class { #name : 'DRTailDuplicationTest', #superclass : 'DRMetacompilerTest', - #category : 'Druid-Tests-Optimizations', - #package : 'Druid-Tests', - #tag : 'Optimizations' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DRVMStateTest.class.st b/Druid-Cogit-Tests/DRVMStateTest.class.st similarity index 95% rename from Druid-Tests/DRVMStateTest.class.st rename to Druid-Cogit-Tests/DRVMStateTest.class.st index f6836364..aca5b0b2 100644 --- a/Druid-Tests/DRVMStateTest.class.st +++ b/Druid-Cogit-Tests/DRVMStateTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRVMStateTest', #superclass : 'TestCase', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'tests' } diff --git a/Druid-Tests/DruidCogit.class.st b/Druid-Cogit-Tests/DruidCogit.class.st similarity index 99% rename from Druid-Tests/DruidCogit.class.st rename to Druid-Cogit-Tests/DruidCogit.class.st index 90c79c5f..2010c2f6 100644 --- a/Druid-Tests/DruidCogit.class.st +++ b/Druid-Cogit-Tests/DruidCogit.class.st @@ -1,8 +1,8 @@ Class { #name : 'DruidCogit', #superclass : 'Cogit', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'configuration' } diff --git a/Druid-Tests/DruidTestInterpreter.class.st b/Druid-Cogit-Tests/DruidTestInterpreter.class.st similarity index 99% rename from Druid-Tests/DruidTestInterpreter.class.st rename to Druid-Cogit-Tests/DruidTestInterpreter.class.st index afee8c4b..f9f46bcf 100644 --- a/Druid-Tests/DruidTestInterpreter.class.st +++ b/Druid-Cogit-Tests/DruidTestInterpreter.class.st @@ -7,8 +7,8 @@ Class { #classVars : [ 'classVariable' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'initialization' } diff --git a/Druid-Tests/DruidTestRTLCompiler.class.st b/Druid-Cogit-Tests/DruidTestRTLCompiler.class.st similarity index 99% rename from Druid-Tests/DruidTestRTLCompiler.class.st rename to Druid-Cogit-Tests/DruidTestRTLCompiler.class.st index 34512449..8c74ccfa 100644 --- a/Druid-Tests/DruidTestRTLCompiler.class.st +++ b/Druid-Cogit-Tests/DruidTestRTLCompiler.class.st @@ -1,8 +1,8 @@ Class { #name : 'DruidTestRTLCompiler', #superclass : 'DruidJIT', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'class initialization' } diff --git a/Druid-Tests/DruidTestRTLCompilerForTest.class.st b/Druid-Cogit-Tests/DruidTestRTLCompilerForTest.class.st similarity index 99% rename from Druid-Tests/DruidTestRTLCompilerForTest.class.st rename to Druid-Cogit-Tests/DruidTestRTLCompilerForTest.class.st index 302fdd5c..3cf51219 100644 --- a/Druid-Tests/DruidTestRTLCompilerForTest.class.st +++ b/Druid-Cogit-Tests/DruidTestRTLCompilerForTest.class.st @@ -4,8 +4,8 @@ I am a compiler class that gets modified dynamically by some tests. Class { #name : 'DruidTestRTLCompilerForTest', #superclass : 'DruidTestRTLCompiler', - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'class initialization' } diff --git a/Druid-Tests/SimpleDruidTestRTLCompiler.class.st b/Druid-Cogit-Tests/SimpleDruidTestRTLCompiler.class.st similarity index 99% rename from Druid-Tests/SimpleDruidTestRTLCompiler.class.st rename to Druid-Cogit-Tests/SimpleDruidTestRTLCompiler.class.st index e265afbd..97cd3bfb 100644 --- a/Druid-Tests/SimpleDruidTestRTLCompiler.class.st +++ b/Druid-Cogit-Tests/SimpleDruidTestRTLCompiler.class.st @@ -4,8 +4,8 @@ Class { #instVars : [ 'methodOrBlockNumTemps' ], - #category : 'Druid-Tests', - #package : 'Druid-Tests' + #category : 'Druid-Cogit-Tests', + #package : 'Druid-Cogit-Tests' } { #category : 'class initialization' } diff --git a/Druid-Tests/SimpleStackBasedCogit.extension.st b/Druid-Cogit-Tests/SimpleStackBasedCogit.extension.st similarity index 75% rename from Druid-Tests/SimpleStackBasedCogit.extension.st rename to Druid-Cogit-Tests/SimpleStackBasedCogit.extension.st index 7a4b9f48..079c3a1c 100644 --- a/Druid-Tests/SimpleStackBasedCogit.extension.st +++ b/Druid-Cogit-Tests/SimpleStackBasedCogit.extension.st @@ -1,6 +1,6 @@ Extension { #name : 'SimpleStackBasedCogit' } -{ #category : '*Druid-Tests' } +{ #category : '*Druid-Cogit-Tests' } SimpleStackBasedCogit >> byte2: anInteger [ byte2 := anInteger diff --git a/Druid-Cogit-Tests/package.st b/Druid-Cogit-Tests/package.st new file mode 100644 index 00000000..13d79f22 --- /dev/null +++ b/Druid-Cogit-Tests/package.st @@ -0,0 +1 @@ +Package { #name : 'Druid-Cogit-Tests' } diff --git a/Druid-Opal/DRBytecodeGeneratorTest.class.st b/Druid-Opal-Tests/DRBytecodeGeneratorTest.class.st similarity index 99% rename from Druid-Opal/DRBytecodeGeneratorTest.class.st rename to Druid-Opal-Tests/DRBytecodeGeneratorTest.class.st index 0e351e4a..affc39a2 100644 --- a/Druid-Opal/DRBytecodeGeneratorTest.class.st +++ b/Druid-Opal-Tests/DRBytecodeGeneratorTest.class.st @@ -7,8 +7,7 @@ Class { 'typeSystem' ], #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'assertion' } diff --git a/Druid-Opal/DRCustomizedTypeSystemInliningTest.class.st b/Druid-Opal-Tests/DRCustomizedTypeSystemInliningTest.class.st similarity index 99% rename from Druid-Opal/DRCustomizedTypeSystemInliningTest.class.st rename to Druid-Opal-Tests/DRCustomizedTypeSystemInliningTest.class.st index 9b5bf994..da45d8ac 100644 --- a/Druid-Opal/DRCustomizedTypeSystemInliningTest.class.st +++ b/Druid-Opal-Tests/DRCustomizedTypeSystemInliningTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRCustomizedTypeSystemInliningTest', #superclass : 'DRBytecodeGeneratorTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'running' } diff --git a/Druid-Opal/DRInlineMethodTest.class.st b/Druid-Opal-Tests/DRInlineMethodTest.class.st similarity index 99% rename from Druid-Opal/DRInlineMethodTest.class.st rename to Druid-Opal-Tests/DRInlineMethodTest.class.st index 2faabf32..704f8c9a 100644 --- a/Druid-Opal/DRInlineMethodTest.class.st +++ b/Druid-Opal-Tests/DRInlineMethodTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRInlineMethodTest', #superclass : 'DRMethodOptimizationTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'asserting' } diff --git a/Druid-Opal/DRInlineScopeTest.class.st b/Druid-Opal-Tests/DRInlineScopeTest.class.st similarity index 99% rename from Druid-Opal/DRInlineScopeTest.class.st rename to Druid-Opal-Tests/DRInlineScopeTest.class.st index 0bf955f9..682dbeb0 100644 --- a/Druid-Opal/DRInlineScopeTest.class.st +++ b/Druid-Opal-Tests/DRInlineScopeTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRInlineScopeTest', #superclass : 'DRMethodOptimizationTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'transforming' } diff --git a/Druid-Opal/DRInstructionsTest.class.st b/Druid-Opal-Tests/DRInstructionsTest.class.st similarity index 97% rename from Druid-Opal/DRInstructionsTest.class.st rename to Druid-Opal-Tests/DRInstructionsTest.class.st index 7ac5ee2b..1e7ef519 100644 --- a/Druid-Opal/DRInstructionsTest.class.st +++ b/Druid-Opal-Tests/DRInstructionsTest.class.st @@ -1,8 +1,8 @@ Class { #name : 'DRInstructionsTest', #superclass : 'DRIRTest', - #category : 'Druid-Opal', - #package : 'Druid-Opal' + #category : 'Druid-Opal-Tests', + #package : 'Druid-Opal-Tests' } { #category : 'test' } diff --git a/Druid-Opal/DRLocalVariableInstructionScheluderTest.class.st b/Druid-Opal-Tests/DRLocalVariableInstructionScheluderTest.class.st similarity index 98% rename from Druid-Opal/DRLocalVariableInstructionScheluderTest.class.st rename to Druid-Opal-Tests/DRLocalVariableInstructionScheluderTest.class.st index 83f086d3..67cebd86 100644 --- a/Druid-Opal/DRLocalVariableInstructionScheluderTest.class.st +++ b/Druid-Opal-Tests/DRLocalVariableInstructionScheluderTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRLocalVariableInstructionScheluderTest', #superclass : 'DRMethodOptimizationTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'running' } diff --git a/Druid-Opal/DRMethodOptimizationTest.class.st b/Druid-Opal-Tests/DRMethodOptimizationTest.class.st similarity index 91% rename from Druid-Opal/DRMethodOptimizationTest.class.st rename to Druid-Opal-Tests/DRMethodOptimizationTest.class.st index 3a269a0b..9776a488 100644 --- a/Druid-Opal/DRMethodOptimizationTest.class.st +++ b/Druid-Opal-Tests/DRMethodOptimizationTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRMethodOptimizationTest', #superclass : 'DROptimisationTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'as yet unclassified' } diff --git a/Druid-Opal/DRScopeTest.class.st b/Druid-Opal-Tests/DRScopeTest.class.st similarity index 99% rename from Druid-Opal/DRScopeTest.class.st rename to Druid-Opal-Tests/DRScopeTest.class.st index 13d57582..42b27273 100644 --- a/Druid-Opal/DRScopeTest.class.st +++ b/Druid-Opal-Tests/DRScopeTest.class.st @@ -2,8 +2,7 @@ Class { #name : 'DRScopeTest', #superclass : 'DRIRTest', #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'test' } diff --git a/Druid-Opal/DrOpalExamples.class.st b/Druid-Opal-Tests/DrOpalExamples.class.st similarity index 99% rename from Druid-Opal/DrOpalExamples.class.st rename to Druid-Opal-Tests/DrOpalExamples.class.st index 8b9d25ff..7b680e5e 100644 --- a/Druid-Opal/DrOpalExamples.class.st +++ b/Druid-Opal-Tests/DrOpalExamples.class.st @@ -10,8 +10,7 @@ Class { 'classVariable' ], #category : 'Druid-Opal-Tests', - #package : 'Druid-Opal', - #tag : 'Tests' + #package : 'Druid-Opal-Tests' } { #category : 'as yet unclassified' } diff --git a/Druid-Opal-Tests/package.st b/Druid-Opal-Tests/package.st new file mode 100644 index 00000000..56a8fbc4 --- /dev/null +++ b/Druid-Opal-Tests/package.st @@ -0,0 +1 @@ +Package { #name : 'Druid-Opal-Tests' } diff --git a/Druid-Opal/DRBasicBlock.extension.st b/Druid-Opal/DRBasicBlock.extension.st new file mode 100644 index 00000000..72f1c199 --- /dev/null +++ b/Druid-Opal/DRBasicBlock.extension.st @@ -0,0 +1,8 @@ +Extension { #name : 'DRBasicBlock' } + +{ #category : '*Druid-Opal' } +DRBasicBlock >> initializeScope: aDRScope [ + + ^ self addInstruction: + (self instructionFactory initializeScope: aDRScope) +] diff --git a/Druid-Opal/DRInstructionFactory.extension.st b/Druid-Opal/DRInstructionFactory.extension.st new file mode 100644 index 00000000..c845c8dc --- /dev/null +++ b/Druid-Opal/DRInstructionFactory.extension.st @@ -0,0 +1,7 @@ +Extension { #name : 'DRInstructionFactory' } + +{ #category : '*Druid-Opal' } +DRInstructionFactory >> initializeScope: aDRScope [ + + ^ DRInitializeScope scope: aDRScope +] diff --git a/Druid/OCAbstractMethodScope.extension.st b/Druid-Opal/OCAbstractMethodScope.extension.st similarity index 83% rename from Druid/OCAbstractMethodScope.extension.st rename to Druid-Opal/OCAbstractMethodScope.extension.st index d254eb44..4576051f 100644 --- a/Druid/OCAbstractMethodScope.extension.st +++ b/Druid-Opal/OCAbstractMethodScope.extension.st @@ -1,6 +1,6 @@ Extension { #name : 'OCAbstractMethodScope' } -{ #category : '*Druid' } +{ #category : '*Druid-Opal' } OCAbstractMethodScope >> hasTempDefinitionFor: tempName [ ^ self tempVarNames includes: tempName diff --git a/Druid/DRIRTest.class.st b/Druid-Tests/DRIRTest.class.st similarity index 99% rename from Druid/DRIRTest.class.st rename to Druid-Tests/DRIRTest.class.st index 50452352..d44f62dc 100644 --- a/Druid/DRIRTest.class.st +++ b/Druid-Tests/DRIRTest.class.st @@ -6,8 +6,7 @@ Class { 'instructionFactory' ], #category : 'Druid-Tests', - #package : 'Druid', - #tag : 'Tests' + #package : 'Druid-Tests' } { #category : 'edges' } diff --git a/Druid/DROptimisationTest.class.st b/Druid-Tests/DROptimisationTest.class.st similarity index 95% rename from Druid/DROptimisationTest.class.st rename to Druid-Tests/DROptimisationTest.class.st index 9838f1c7..d85b0d5d 100644 --- a/Druid/DROptimisationTest.class.st +++ b/Druid-Tests/DROptimisationTest.class.st @@ -5,8 +5,7 @@ Class { 'optimisation' ], #category : 'Druid-Tests', - #package : 'Druid', - #tag : 'Tests' + #package : 'Druid-Tests' } { #category : 'testing' } diff --git a/Druid-UI/DRAbstractInstruction.extension.st b/Druid-UI/DRAbstractInstruction.extension.st new file mode 100644 index 00000000..5573a97a --- /dev/null +++ b/Druid-UI/DRAbstractInstruction.extension.st @@ -0,0 +1,103 @@ +Extension { #name : 'DRAbstractInstruction' } + +{ #category : '*Druid-UI' } +DRAbstractInstruction >> inspectionDependencies: aBuilder [ + + + | view blockViews eb | + view := RSCanvas new. + blockViews := self withAllDependencies asSet collect: [ :c | | g label | + g := RSGroup new. + (label := (RSLabel new text: c label asString) + borderColor: Color black; + yourself). + g add: (RSBox new + color: Color white; + border: (RSBorder new color: Color purple; width: 2); + extent: label extent + 10; + yourself). + g add: label. + g asShape + @ RSDraggable; + model: c; + yourself ] as: Array. + view addAll: blockViews. + + eb := RSEdgeBuilder arrowedLine. + eb canvas: view. + eb withBorderAttachPoint. + eb shapes: blockViews. + eb connectToAll: #dependencies. + + "All the characters are displayed using a grid layout" + RSDominanceTreeLayout new + horizontalGap: 50; + shouldValidateCycles; + applyOn: blockViews. + view @ RSCanvasController. + + ^ SpRoassal3InspectorPresenter new + canvas: view; + yourself +] + +{ #category : '*Druid-UI' } +DRAbstractInstruction >> inspectionSource: aBuilder [ + + + ^ self originAST inspectionSource: aBuilder +] + +{ #category : '*Druid-UI' } +DRAbstractInstruction >> inspectionUsers: aBuilder [ + + + | view blockViews eb | + view := RSCanvas new. + blockViews := self withAllUsers asSet collect: [ :c | | g label | + g := RSGroup new. + (label := (RSLabel new text: c label asString) + borderColor: Color black; + yourself). + g add: (RSBox new + color: Color white; + border: (RSBorder new color: Color purple; width: 2); + extent: label extent + 10; + yourself). + g add: label. + g asShape + @ RSDraggable; + model: c; + yourself ] as: Array. + view addAll: blockViews. + + eb := RSEdgeBuilder arrowedLine. + eb canvas: view. + eb withBorderAttachPoint. + eb shapes: blockViews. + eb connectToAll: #users. + + "All the characters are displayed using a grid layout" + RSDominanceTreeLayout new + horizontalGap: 50; + shouldValidateCycles; + applyOn: blockViews. + view @ RSCanvasController. + + ^ SpRoassal3InspectorPresenter new + canvas: view; + yourself +] + +{ #category : '*Druid-UI' } +DRAbstractInstruction >> uiUnroll [ + + | unrollingFactor | + self isBackJump ifFalse: [ + ^ self inform: 'Can only perform loop unrolling from back jumps' ]. + unrollingFactor := UIManager default + request: 'Unrolling factor:' + initialAnswer: '2'. + (unrollingFactor ifNil: [ '' ]) ifEmpty: [ unrollingFactor := 2 ]. + self loop unroll: unrollingFactor asNumber +] diff --git a/Druid-UI/DRBasicBlock.extension.st b/Druid-UI/DRBasicBlock.extension.st new file mode 100644 index 00000000..9ace9f9c --- /dev/null +++ b/Druid-UI/DRBasicBlock.extension.st @@ -0,0 +1,26 @@ +Extension { #name : 'DRBasicBlock' } + +{ #category : '*Druid-UI' } +DRBasicBlock >> inspectionInstructions: aBuilder [ + + + ^ aBuilder newList + display: [ :each | StObjectPrinter asTruncatedTextFrom: each prettyPrint ]; + items: self instructions; + yourself +] + +{ #category : '*Druid-UI' } +DRBasicBlock >> inspectionSourceCode: builder [ + + + | sourceInterval | + sourceInterval := self sourceInterval. + ^ SpCodePresenter new + beForBehavior: self methodNode methodClass; + text: self source; + addTextSegmentDecoration: (SpTextPresenterDecorator forHighlight + interval: (sourceInterval first to: sourceInterval last + 1); + yourself); + yourself +] diff --git a/Druid-UI/DRCompilerExplorer.class.st b/Druid-UI/DRCompilerExplorer.class.st index 42ae5362..03440f27 100644 --- a/Druid-UI/DRCompilerExplorer.class.st +++ b/Druid-UI/DRCompilerExplorer.class.st @@ -1,6 +1,6 @@ Class { - #name : #DRCompilerExplorer, - #superclass : #Object, + #name : 'DRCompilerExplorer', + #superclass : 'Object', #instVars : [ 'interpreter', 'interpreterClass', @@ -15,16 +15,17 @@ Class { #classInstVars : [ 'experiments' ], - #category : #'Druid-UI' + #category : 'Druid-UI', + #package : 'Druid-UI' } -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer class >> experiments [ ^ experiments ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } DRCompilerExplorer class >> on: aSelector [ ^ self new @@ -32,7 +33,7 @@ DRCompilerExplorer class >> on: aSelector [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } DRCompilerExplorer class >> onSelector: aSelector inClass: aClass [ ^ self new @@ -41,13 +42,13 @@ DRCompilerExplorer class >> onSelector: aSelector inClass: aClass [ yourself ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } DRCompilerExplorer class >> saveNewExperiment: experiment [ experiments add: experiment ] -{ #category : #optimising } +{ #category : 'optimising' } DRCompilerExplorer >> apply: opt [ isRecording ifTrue: [ previousCfgs add: lastOpt -> self cfg veryDeepCopy ]. @@ -56,13 +57,13 @@ DRCompilerExplorer >> apply: opt [ shouldGeneratePaths ifTrue: [ self cfg generatePaths ] ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> blocks [ ^ self cfg blocks ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> cfg [ cfg ifNotNil: [ ^ cfg ]. @@ -72,19 +73,19 @@ DRCompilerExplorer >> cfg [ generateDruidIR ] -{ #category : #optimising } +{ #category : 'optimising' } DRCompilerExplorer >> goBack [ cfg := previousCfgs removeLast value ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> highlightePathAt: index [ path := cfg pathAt: index ] -{ #category : #initialization } +{ #category : 'initialization' } DRCompilerExplorer >> initialize [ super initialize. @@ -94,14 +95,14 @@ DRCompilerExplorer >> initialize [ path := OrderedCollection new. ] -{ #category : #inspecting } +{ #category : 'inspecting' } DRCompilerExplorer >> inspectionCFG: aBuilder [ ^ DRCompilerExplorerInspection on: self ] -{ #category : #inspecting } +{ #category : 'inspecting' } DRCompilerExplorer >> inspectionSource [ @@ -111,7 +112,7 @@ DRCompilerExplorer >> inspectionSource [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } DRCompilerExplorer >> interpreter [ | theMemory | @@ -132,49 +133,49 @@ DRCompilerExplorer >> interpreter [ basicInitialize ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> interpreterClass [ ^ interpreterClass ifNil: [ DruidTestInterpreter ] ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> interpreterClass: anObject [ interpreterClass := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> isRecording [ ^ isRecording ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> isRecording: anObject [ isRecording := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> method [ ^ self interpreterClass lookupSelector: selector ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> methodClass [ ^ self interpreter class ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> methodSource [ ^ self method sourceCode ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> optimizations [ ^ { @@ -193,25 +194,25 @@ DRCompilerExplorer >> optimizations [ DRLoopInvariantCodeMotion } ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> path [ ^ path ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> path: anObject [ path := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> previousCfgs [ ^ previousCfgs ] -{ #category : #optimising } +{ #category : 'optimising' } DRCompilerExplorer >> saveExperiment [ self class saveNewExperiment: (DROptimisationExperiment new @@ -220,25 +221,25 @@ DRCompilerExplorer >> saveExperiment [ yourself) ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> selector [ ^ selector ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> selector: aSelector [ selector := aSelector ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> shouldGeneratePaths [ ^ shouldGeneratePaths ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorer >> shouldGeneratePaths: anObject [ shouldGeneratePaths := anObject diff --git a/Druid-UI/DRCompilerExplorerInspection.class.st b/Druid-UI/DRCompilerExplorerInspection.class.st index abf8bc47..ec0d5690 100644 --- a/Druid-UI/DRCompilerExplorerInspection.class.st +++ b/Druid-UI/DRCompilerExplorerInspection.class.st @@ -1,21 +1,22 @@ Class { - #name : #DRCompilerExplorerInspection, - #superclass : #StInspectionPresenter, + #name : 'DRCompilerExplorerInspection', + #superclass : 'StInspectionPresenter', #instVars : [ 'cfgPresenter', 'optimisationToolbar', 'configToolbar' ], - #category : #'Druid-UI' + #category : 'Druid-UI', + #package : 'Druid-UI' } -{ #category : #api } +{ #category : 'api' } DRCompilerExplorerInspection >> activateOnDoubleClick [ cfgPresenter activateOnDoubleClick ] -{ #category : #adding } +{ #category : 'adding' } DRCompilerExplorerInspection >> addConfigButtons [ configToolbar addItem: (self newToolbarToggleButton @@ -41,7 +42,7 @@ DRCompilerExplorerInspection >> addConfigButtons [ yourself) ] -{ #category : #adding } +{ #category : 'adding' } DRCompilerExplorerInspection >> addOptimisationButtons [ optimisationToolbar addItem: (self newToolbarButton @@ -61,13 +62,13 @@ DRCompilerExplorerInspection >> addOptimisationButtons [ optimisationToolbar addItem: toolbarButtom ] ] -{ #category : #accessing } +{ #category : 'accessing' } DRCompilerExplorerInspection >> blocks [ ^ model blocks ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } DRCompilerExplorerInspection >> configureCFGCanvas: view [ model cfg configureVisualization: view. @@ -77,13 +78,13 @@ DRCompilerExplorerInspection >> configureCFGCanvas: view [ self highlightLine: line ] ] ] -{ #category : #api } +{ #category : 'api' } DRCompilerExplorerInspection >> hasOutputActivationPort [ ^ true ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } DRCompilerExplorerInspection >> highlightLine: line [ line border: (RSBorder new @@ -92,7 +93,7 @@ DRCompilerExplorerInspection >> highlightLine: line [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } DRCompilerExplorerInspection >> initializePresenters [ self layout: (SpBoxLayout newVertical @@ -105,7 +106,7 @@ DRCompilerExplorerInspection >> initializePresenters [ self addOptimisationButtons ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } DRCompilerExplorerInspection >> newCFGPresenter [ ^ SpRoassalPresenter new @@ -113,7 +114,7 @@ DRCompilerExplorerInspection >> newCFGPresenter [ yourself ] -{ #category : #api } +{ #category : 'api' } DRCompilerExplorerInspection >> outputActivationPort [ ^ (SpActivationPort newPresenter: self) @@ -121,7 +122,7 @@ DRCompilerExplorerInspection >> outputActivationPort [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } DRCompilerExplorerInspection >> refresh [ "HACKSSSS" diff --git a/Druid-UI/DRControlFlowGraph.extension.st b/Druid-UI/DRControlFlowGraph.extension.st new file mode 100644 index 00000000..ec4d5e85 --- /dev/null +++ b/Druid-UI/DRControlFlowGraph.extension.st @@ -0,0 +1,215 @@ +Extension { #name : 'DRControlFlowGraph' } + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> asInspectorIn: view [ + + self configureVisualization: view. + ^ SpRoassal3InspectorPresenter new + canvas: view; + yourself +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> configureVisualization: view [ + + | blockViews controller | + blockViews := self blocks collect: [ :b | self createBlockView: b ]. + + view addAll: blockViews. + self showLines: blockViews in: view. + + "All the characters are displayed using a grid layout" + RSSugiyamaLayout new + horizontalGap: 50; + applyOn: blockViews. + + self showInfoIn: view. + + controller := RSCanvasController new + noLegend; + yourself. + + view @ controller +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> createBlockView: aBlock [ + + | box label boxes composite labelBackground borderColor | + label := RSLabel new + text: aBlock id asString; + color: Color black; + fontSize: 4; + yourself. + labelBackground := RSCircle new + color: Color white; + border: (RSBorder new color: 'black'); + radius: (label extent x max: label extent y) - 2; + yourself. + borderColor := (markedBlocks includes: aBlock) + ifTrue: [ Color red ] + ifFalse: [ Color black ]. + box := RSBox new + noPaint; + border: (RSBorder new + width: 2; + color: borderColor; + yourself); + cornerRadius: 2; + yourself. + + boxes := aBlock instructions + collect: [ :inst | self createinstructionView: inst ] + as: RSGroup. + RSGridLayout on: boxes. + + box + position: boxes position; + extent: boxes extent + 10. + + composite := RSComposite new + add: box; + addAll: boxes; + draggable; + model: aBlock; + adjustToChildren; + @ (RSPopup text: [ :model | + String streamContents: [ :s | + (model instructions collect: #prettyPrint) + asStringOn: s + delimiter: String cr ] ]); + @ (RSMenuActivable new menuDo: [ :menu :element | + menu + add: 'Tail-duplicate' + target: element model + selector: #tailDuplicate ]); + yourself. + + RSLocation new + outer; + right; + top; + offset: -2 @ 2; + move: label on: boxes. + + labelBackground position: label position. + composite add: labelBackground. + composite add: label. + ^ composite +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> createinstructionView: instruction [ + + ^ RSBox new + model: instruction; + color: (self instructionColor: instruction); + border: (RSBorder new + color: (instruction isStaged + ifTrue: [ Color green paler duller duller duller ] + ifFalse: [ Color black ]); + joinMiter); + @ (RSMenuActivable new menuDo: [ :menu :element | + menu + add: 'Inline' target: element model selector: #inline; + add: 'Unroll' target: element model selector: #uiUnroll ]); + yourself +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> inspectionCFG: aBuilder [ + + + | view | + view := RSCanvas new. + ^ self asInspectorIn: view +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> instructionColor: instruction [ + + instruction isJump ifTrue: [ + instruction isBackJump ifTrue: [ ^ Color purple muchLighter ]. + instruction isConditionalBranch ifTrue: [ ^ Color purple ]. + ^ Color purple muchDarker ]. + instruction isMandatoryInstruction ifTrue: [ ^ Color red ]. + instruction users isEmpty ifTrue: [ ^ Color gray ]. + instruction isPhiFunction ifTrue: [ ^ Color orange ]. + (instruction operands anySatisfy: [ :op | op isPhysicalRegister ]) + ifTrue: [ ^ Color red darker ]. + (instruction operands anySatisfy: [ :op | op isConstant ]) ifTrue: [ + ^ Color yellow darker ]. + instruction isCopy ifTrue: [ ^ Color blue muchLighter ]. + + ^ Color white +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> showBranchConstraints: branchEdges [ + + ^ String streamContents: [ :s | + branchEdges + do: [ :e | + e constraints associationsDo: [ :assoc | + s << (assoc key asString , ' ' , assoc value asString , String cr) ] ] + separatedBy: [ + s << (String cr , '--o--o--o--o--o--o--o--' , String cr) ] ] +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> showInfoIn: view [ + + | label instructions blocks paths info | + + label := [ :text | + RSLabel new + text: text; + color: Color black; + fontSize: 14; + bold; + yourself ]. + + + blocks := label value: self blocks size asString , ' blocks'. + instructions := label value: + self instructions size asString , ' instructions'. + paths := label value: self pathsSize asString , ' paths'. + info := { blocks . instructions . paths }. + + RSVerticalLineLayout new + alignLeft; + on: info. + info := info asShape. + + RSLocation new + below; + offset:( 0 @ 20); + move: info on: view. + + view add: info +] + +{ #category : '*Druid-UI' } +DRControlFlowGraph >> showLines: blockViews in: view [ + + | eb | + eb := RSLineBuilder arrowedLine. + eb canvas: view. + eb color: Color blue muchDarker. + eb width: 2. + eb withBorderAttachPoint. + eb shapes: blockViews. + eb connectToAll: #successors. + + view lines pushBack. + view lines do: [ :line | + | source destination | + source := line model key. + destination := line model value. + line model: (self edgesFrom: source to: destination). + line @ (RSPopup text: [ :edgs | self showBranchConstraints: edgs ]). + (self isAlmostDeadBranch: source to: destination) ifTrue: [ + line color: Color green muchDarker ]. + (self isDeadBranch: source to: destination) ifTrue: [ + line color: Color red muchDarker ] ] +] diff --git a/Druid-UI/DRDominatorTree.extension.st b/Druid-UI/DRDominatorTree.extension.st new file mode 100644 index 00000000..3903c4f9 --- /dev/null +++ b/Druid-UI/DRDominatorTree.extension.st @@ -0,0 +1,103 @@ +Extension { #name : 'DRDominatorTree' } + +{ #category : '*Druid-UI' } +DRDominatorTree >> asInspectorIn: view [ + + self configureVisualization: view. + ^ SpRoassal3InspectorPresenter new + canvas: view; + yourself +] + +{ #category : '*Druid-UI' } +DRDominatorTree >> configureVisualization: view [ + + | blockViews controller | + blockViews := self blockDictionary values collect: [ :treeNode | self createBlockView: treeNode ]. + + view addAll: blockViews. + self showLines: blockViews in: view. + + "All the characters are displayed using a grid layout" + RSSugiyamaLayout new + horizontalGap: 50; + applyOn: blockViews. + + controller := RSCanvasController new + noLegend; + yourself. + + view @ controller +] + +{ #category : '*Druid-UI' } +DRDominatorTree >> createBlockView: treeNode [ + + | box label composite labelBackground | + label := RSLabel new + text: treeNode block id asString; + color: Color black; + fontSize: 4; + yourself. + labelBackground := RSEllipse new + color: Color white; + border: (RSBorder new color: 'black'); + extent: label extent + 5; + yourself. + box := RSBox new + noPaint; + border: (RSBorder new + width: 2; + color: Color black; + yourself); + cornerRadius: 2; + yourself. + + " box + position: boxes position; + extent: boxes extent + 10." + composite := { box } asShape + draggable; + model: treeNode; + yourself. ",boxes" + + RSLocation new + outer; + right; + top; + offset: 3 @ -3. "; + move: label on: boxes" + + labelBackground position: label position. + composite add: labelBackground. + composite add: label. + ^ composite +] + +{ #category : '*Druid-UI' } +DRDominatorTree >> inspectionDominatorTree [ + + + | view | + view := RSCanvas new. + ^ self asInspectorIn: view +] + +{ #category : '*Druid-UI' } +DRDominatorTree >> showLines: blockViews in: view [ + + | eb | + eb := RSLineBuilder arrowedLine. + eb canvas: view. + eb color: Color blue muchDarker. + eb width: 2. + eb withBorderAttachPoint. + eb shapes: blockViews. + eb connectToAll: [ :e | e children ]. + + view lines pushBack. + view lines do: [ :line | + | source destination | + source := line model key. + destination := line model value ] +] diff --git a/Druid-UI/DRJump.extension.st b/Druid-UI/DRJump.extension.st new file mode 100644 index 00000000..9715f168 --- /dev/null +++ b/Druid-UI/DRJump.extension.st @@ -0,0 +1,10 @@ +Extension { #name : 'DRJump' } + +{ #category : '*Druid-UI' } +DRJump >> inspectionSource: aBuilder [ + + + ^ SpCodePresenter new + text: target asString; + yourself +] diff --git a/Druid-UI/DROptimisationExperiment.class.st b/Druid-UI/DROptimisationExperiment.class.st index c6149085..3bd605ee 100644 --- a/Druid-UI/DROptimisationExperiment.class.st +++ b/Druid-UI/DROptimisationExperiment.class.st @@ -1,32 +1,33 @@ Class { - #name : #DROptimisationExperiment, - #superclass : #Object, + #name : 'DROptimisationExperiment', + #superclass : 'Object', #instVars : [ 'movie', 'timestamp' ], - #category : #'Druid-UI' + #category : 'Druid-UI', + #package : 'Druid-UI' } -{ #category : #accessing } +{ #category : 'accessing' } DROptimisationExperiment >> movie [ ^ movie ] -{ #category : #accessing } +{ #category : 'accessing' } DROptimisationExperiment >> movie: anObject [ movie := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } DROptimisationExperiment >> timestamp [ ^ timestamp ] -{ #category : #accessing } +{ #category : 'accessing' } DROptimisationExperiment >> timestamp: anObject [ timestamp := anObject diff --git a/Druid-UI/DRReturn.extension.st b/Druid-UI/DRReturn.extension.st new file mode 100644 index 00000000..b9f73808 --- /dev/null +++ b/Druid-UI/DRReturn.extension.st @@ -0,0 +1,10 @@ +Extension { #name : 'DRReturn' } + +{ #category : '*Druid-UI' } +DRReturn >> inspectionSource: aBuilder [ + + + ^ SpCodePresenter new + text: result asString; + yourself +] diff --git a/Druid/OCValueNode.extension.st b/Druid-UI/OCValueNode.extension.st similarity index 94% rename from Druid/OCValueNode.extension.st rename to Druid-UI/OCValueNode.extension.st index 9c8539c8..d70c69ef 100644 --- a/Druid/OCValueNode.extension.st +++ b/Druid-UI/OCValueNode.extension.st @@ -1,6 +1,6 @@ Extension { #name : 'OCValueNode' } -{ #category : '*Druid' } +{ #category : '*Druid-UI' } OCValueNode >> inspectionSourceCode: builder [ diff --git a/Druid/SpRoassalPresenter.extension.st b/Druid-UI/SpRoassalPresenter.extension.st similarity index 83% rename from Druid/SpRoassalPresenter.extension.st rename to Druid-UI/SpRoassalPresenter.extension.st index ebba9674..0c3ece7c 100644 --- a/Druid/SpRoassalPresenter.extension.st +++ b/Druid-UI/SpRoassalPresenter.extension.st @@ -1,24 +1,24 @@ Extension { #name : 'SpRoassalPresenter' } -{ #category : '*Druid' } +{ #category : '*Druid-UI' } SpRoassalPresenter >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : '*Druid' } +{ #category : '*Druid-UI' } SpRoassalPresenter >> outputActivationPort [ ^ SpActivationPort newPresenter: self ] -{ #category : '*Druid' } +{ #category : '*Druid-UI' } SpRoassalPresenter >> outputSelectionPort [ ^ SpActivationPort newPresenter: self ] -{ #category : '*Druid' } +{ #category : '*Druid-UI' } SpRoassalPresenter >> whenActivatedDo: aBlock [ | context | diff --git a/Druid-UI/package.st b/Druid-UI/package.st index c8b9286b..437374a3 100644 --- a/Druid-UI/package.st +++ b/Druid-UI/package.st @@ -1 +1 @@ -Package { #name : #'Druid-UI' } +Package { #name : 'Druid-UI' } diff --git a/Druid/DRAbstractInstruction.class.st b/Druid/DRAbstractInstruction.class.st index e64e1d20..2aaa97af 100644 --- a/Druid/DRAbstractInstruction.class.st +++ b/Druid/DRAbstractInstruction.class.st @@ -21,95 +21,6 @@ DRAbstractInstruction >> basicBlock: anObject [ basicBlock := anObject ] -{ #category : 'inspecting' } -DRAbstractInstruction >> inspectionDependencies: aBuilder [ - - - | view blockViews eb | - view := RSCanvas new. - blockViews := self withAllDependencies asSet collect: [ :c | | g label | - g := RSGroup new. - (label := (RSLabel new text: c label asString) - borderColor: Color black; - yourself). - g add: (RSBox new - color: Color white; - border: (RSBorder new color: Color purple; width: 2); - extent: label extent + 10; - yourself). - g add: label. - g asShape - @ RSDraggable; - model: c; - yourself ] as: Array. - view addAll: blockViews. - - eb := RSEdgeBuilder arrowedLine. - eb canvas: view. - eb withBorderAttachPoint. - eb shapes: blockViews. - eb connectToAll: #dependencies. - - "All the characters are displayed using a grid layout" - RSDominanceTreeLayout new - horizontalGap: 50; - shouldValidateCycles; - applyOn: blockViews. - view @ RSCanvasController. - - ^ SpRoassal3InspectorPresenter new - canvas: view; - yourself -] - -{ #category : 'inspecting' } -DRAbstractInstruction >> inspectionSource: aBuilder [ - - - ^ self originAST inspectionSource: aBuilder -] - -{ #category : 'inspecting' } -DRAbstractInstruction >> inspectionUsers: aBuilder [ - - - | view blockViews eb | - view := RSCanvas new. - blockViews := self withAllUsers asSet collect: [ :c | | g label | - g := RSGroup new. - (label := (RSLabel new text: c label asString) - borderColor: Color black; - yourself). - g add: (RSBox new - color: Color white; - border: (RSBorder new color: Color purple; width: 2); - extent: label extent + 10; - yourself). - g add: label. - g asShape - @ RSDraggable; - model: c; - yourself ] as: Array. - view addAll: blockViews. - - eb := RSEdgeBuilder arrowedLine. - eb canvas: view. - eb withBorderAttachPoint. - eb shapes: blockViews. - eb connectToAll: #users. - - "All the characters are displayed using a grid layout" - RSDominanceTreeLayout new - horizontalGap: 50; - shouldValidateCycles; - applyOn: blockViews. - view @ RSCanvasController. - - ^ SpRoassal3InspectorPresenter new - canvas: view; - yourself -] - { #category : 'testing' } DRAbstractInstruction >> isArithmeticInstruction [ @@ -215,19 +126,6 @@ DRAbstractInstruction >> rtlOperandQualifierForAbsoluteAddress [ ^ #'M64:r:' ] -{ #category : 'inspecting' } -DRAbstractInstruction >> uiUnroll [ - - | unrollingFactor | - self isBackJump ifFalse: [ - ^ self inform: 'Can only perform loop unrolling from back jumps' ]. - unrollingFactor := UIManager default - request: 'Unrolling factor:' - initialAnswer: '2'. - (unrollingFactor ifNil: [ '' ]) ifEmpty: [ unrollingFactor := 2 ]. - self loop unroll: unrollingFactor asNumber -] - { #category : 'validation' } DRAbstractInstruction >> validate [ diff --git a/Druid/DRBasicBlock.class.st b/Druid/DRBasicBlock.class.st index 90209078..5c466546 100644 --- a/Druid/DRBasicBlock.class.st +++ b/Druid/DRBasicBlock.class.st @@ -601,13 +601,6 @@ DRBasicBlock >> initialize [ endInstruction basicBlock: self. ] -{ #category : 'initialization' } -DRBasicBlock >> initializeScope: aDRScope [ - - ^ self addInstruction: - (self instructionFactory initializeScope: aDRScope) -] - { #category : 'splitting' } DRBasicBlock >> insertPhisAndReplaceUsersBetween: myInstruction andAll: duplicatedInstructions withFrontier: frontier withUsers: users [ @@ -694,31 +687,6 @@ DRBasicBlock >> insertPhisAndReplaceUsersBetween: myInstruction andAll: instruct dominatedBlocks: dominatedBlocks ] -{ #category : 'inspection' } -DRBasicBlock >> inspectionInstructions: aBuilder [ - - - ^ aBuilder newList - display: [ :each | StObjectPrinter asTruncatedTextFrom: each prettyPrint ]; - items: self instructions; - yourself -] - -{ #category : 'inspection' } -DRBasicBlock >> inspectionSourceCode: builder [ - - - | sourceInterval | - sourceInterval := self sourceInterval. - ^ SpCodePresenter new - beForBehavior: self methodNode methodClass; - text: self source; - addTextSegmentDecoration: (SpTextPresenterDecorator forHighlight - interval: (sourceInterval first to: sourceInterval last + 1); - yourself); - yourself -] - { #category : 'enumerating instructions' } DRBasicBlock >> instructionAfter: anInstruction [ diff --git a/Druid/DRControlFlowGraph.class.st b/Druid/DRControlFlowGraph.class.st index 5efc1a5c..1f053235 100644 --- a/Druid/DRControlFlowGraph.class.st +++ b/Druid/DRControlFlowGraph.class.st @@ -143,15 +143,6 @@ DRControlFlowGraph >> argumentNames [ ^ (1 to: numArgs ) collect: [ :i | 'arg', i asString ] ] -{ #category : 'inspecting' } -DRControlFlowGraph >> asInspectorIn: view [ - - self configureVisualization: view. - ^ SpRoassal3InspectorPresenter new - canvas: view; - yourself -] - { #category : 'printing' } DRControlFlowGraph >> asciiLineFrom: initBlock to: lastBlock withDeferred: deferred index: index [ @@ -297,113 +288,6 @@ DRControlFlowGraph >> clearEdges [ deadBranches := nil ] -{ #category : 'inspecting' } -DRControlFlowGraph >> configureVisualization: view [ - - | blockViews controller | - blockViews := self blocks collect: [ :b | self createBlockView: b ]. - - view addAll: blockViews. - self showLines: blockViews in: view. - - "All the characters are displayed using a grid layout" - RSSugiyamaLayout new - horizontalGap: 50; - applyOn: blockViews. - - self showInfoIn: view. - - controller := RSCanvasController new - noLegend; - yourself. - - view @ controller -] - -{ #category : 'inspecting' } -DRControlFlowGraph >> createBlockView: aBlock [ - - | box label boxes composite labelBackground borderColor | - label := RSLabel new - text: aBlock id asString; - color: Color black; - fontSize: 4; - yourself. - labelBackground := RSCircle new - color: Color white; - border: (RSBorder new color: 'black'); - radius: (label extent x max: label extent y) - 2; - yourself. - borderColor := (markedBlocks includes: aBlock) - ifTrue: [ Color red ] - ifFalse: [ Color black ]. - box := RSBox new - noPaint; - border: (RSBorder new - width: 2; - color: borderColor; - yourself); - cornerRadius: 2; - yourself. - - boxes := aBlock instructions - collect: [ :inst | self createinstructionView: inst ] - as: RSGroup. - RSGridLayout on: boxes. - - box - position: boxes position; - extent: boxes extent + 10. - - composite := RSComposite new - add: box; - addAll: boxes; - draggable; - model: aBlock; - adjustToChildren; - @ (RSPopup text: [ :model | - String streamContents: [ :s | - (model instructions collect: #prettyPrint) - asStringOn: s - delimiter: String cr ] ]); - @ (RSMenuActivable new menuDo: [ :menu :element | - menu - add: 'Tail-duplicate' - target: element model - selector: #tailDuplicate ]); - yourself. - - RSLocation new - outer; - right; - top; - offset: -2 @ 2; - move: label on: boxes. - - labelBackground position: label position. - composite add: labelBackground. - composite add: label. - ^ composite -] - -{ #category : 'inspecting' } -DRControlFlowGraph >> createinstructionView: instruction [ - - ^ RSBox new - model: instruction; - color: (self instructionColor: instruction); - border: (RSBorder new - color: (instruction isStaged - ifTrue: [ Color green paler duller duller duller ] - ifFalse: [ Color black ]); - joinMiter); - @ (RSMenuActivable new menuDo: [ :menu :element | - menu - add: 'Inline' target: element model selector: #inline; - add: 'Unroll' target: element model selector: #uiUnroll ]); - yourself -] - { #category : 'dead-path' } DRControlFlowGraph >> deadBranches [ @@ -561,40 +445,12 @@ DRControlFlowGraph >> initialize [ ] -{ #category : 'inspecting' } -DRControlFlowGraph >> inspectionCFG: aBuilder [ - - - | view | - view := RSCanvas new. - ^ self asInspectorIn: view -] - { #category : 'accessing' } DRControlFlowGraph >> instructionByResultId: anInteger [ ^ self instructions detect: [ :i | i result hasId: anInteger ] ] -{ #category : 'inspecting' } -DRControlFlowGraph >> instructionColor: instruction [ - - instruction isJump ifTrue: [ - instruction isBackJump ifTrue: [ ^ Color purple muchLighter ]. - instruction isConditionalBranch ifTrue: [ ^ Color purple ]. - ^ Color purple muchDarker ]. - instruction isMandatoryInstruction ifTrue: [ ^ Color red ]. - instruction users isEmpty ifTrue: [ ^ Color gray ]. - instruction isPhiFunction ifTrue: [ ^ Color orange ]. - (instruction operands anySatisfy: [ :op | op isPhysicalRegister ]) - ifTrue: [ ^ Color red darker ]. - (instruction operands anySatisfy: [ :op | op isConstant ]) ifTrue: [ - ^ Color yellow darker ]. - instruction isCopy ifTrue: [ ^ Color blue muchLighter ]. - - ^ Color white -] - { #category : 'accessing' } DRControlFlowGraph >> instructionFactory [ @@ -839,76 +695,6 @@ DRControlFlowGraph >> reversePostOrderBlocks [ ^ blocks ] -{ #category : 'inspecting' } -DRControlFlowGraph >> showBranchConstraints: branchEdges [ - - ^ String streamContents: [ :s | - branchEdges - do: [ :e | - e constraints associationsDo: [ :assoc | - s << (assoc key asString , ' ' , assoc value asString , String cr) ] ] - separatedBy: [ - s << (String cr , '--o--o--o--o--o--o--o--' , String cr) ] ] -] - -{ #category : 'inspecting' } -DRControlFlowGraph >> showInfoIn: view [ - - | label instructions blocks paths info | - - label := [ :text | - RSLabel new - text: text; - color: Color black; - fontSize: 14; - bold; - yourself ]. - - - blocks := label value: self blocks size asString , ' blocks'. - instructions := label value: - self instructions size asString , ' instructions'. - paths := label value: self pathsSize asString , ' paths'. - info := { blocks . instructions . paths }. - - RSVerticalLineLayout new - alignLeft; - on: info. - info := info asShape. - - RSLocation new - below; - offset:( 0 @ 20); - move: info on: view. - - view add: info -] - -{ #category : 'inspecting' } -DRControlFlowGraph >> showLines: blockViews in: view [ - - | eb | - eb := RSLineBuilder arrowedLine. - eb canvas: view. - eb color: Color blue muchDarker. - eb width: 2. - eb withBorderAttachPoint. - eb shapes: blockViews. - eb connectToAll: #successors. - - view lines pushBack. - view lines do: [ :line | - | source destination | - source := line model key. - destination := line model value. - line model: (self edgesFrom: source to: destination). - line @ (RSPopup text: [ :edgs | self showBranchConstraints: edgs ]). - (self isAlmostDeadBranch: source to: destination) ifTrue: [ - line color: Color green muchDarker ]. - (self isDeadBranch: source to: destination) ifTrue: [ - line color: Color red muchDarker ] ] -] - { #category : 'accessing' } DRControlFlowGraph >> simplePathsBetween: sourceNode and: destinationNode [ | visited currentPath simplePaths depthFirstSearch | diff --git a/Druid/DRDominatorTree.class.st b/Druid/DRDominatorTree.class.st index c7a06ffd..30fa2acc 100644 --- a/Druid/DRDominatorTree.class.st +++ b/Druid/DRDominatorTree.class.st @@ -17,15 +17,6 @@ DRDominatorTree >> allChildrenOf: aBlock [ ^ (blockDictionary at: aBlock) allChildren collect: [ :e | e block ] ] -{ #category : 'inspection' } -DRDominatorTree >> asInspectorIn: view [ - - self configureVisualization: view. - ^ SpRoassal3InspectorPresenter new - canvas: view; - yourself -] - { #category : 'accessing' } DRDominatorTree >> blockDictionary [ ^ blockDictionary @@ -98,71 +89,6 @@ DRDominatorTree >> computeDominanceFrontier [ ^ dominanceFrontiers ] -{ #category : 'inspection' } -DRDominatorTree >> configureVisualization: view [ - - | blockViews controller | - blockViews := self blockDictionary values collect: [ :treeNode | self createBlockView: treeNode ]. - - view addAll: blockViews. - self showLines: blockViews in: view. - - "All the characters are displayed using a grid layout" - RSSugiyamaLayout new - horizontalGap: 50; - applyOn: blockViews. - - controller := RSCanvasController new - noLegend; - yourself. - - view @ controller -] - -{ #category : 'inspection' } -DRDominatorTree >> createBlockView: treeNode [ - - | box label composite labelBackground | - label := RSLabel new - text: treeNode block id asString; - color: Color black; - fontSize: 4; - yourself. - labelBackground := RSEllipse new - color: Color white; - border: (RSBorder new color: 'black'); - extent: label extent + 5; - yourself. - box := RSBox new - noPaint; - border: (RSBorder new - width: 2; - color: Color black; - yourself); - cornerRadius: 2; - yourself. - - " box - position: boxes position; - extent: boxes extent + 10." - composite := { box } asShape - draggable; - model: treeNode; - yourself. ",boxes" - - RSLocation new - outer; - right; - top; - offset: 3 @ -3. "; - move: label on: boxes" - - labelBackground position: label position. - composite add: labelBackground. - composite add: label. - ^ composite -] - { #category : 'querying' } DRDominatorTree >> dominanceFrontierOf: aBlock [ @@ -274,15 +200,6 @@ DRDominatorTree >> initialize: cfg startingFrom: initialBasicBlock iterating: aB workList addFirst: node ] ] ] ] -{ #category : 'inspection' } -DRDominatorTree >> inspectionDominatorTree [ - - - | view | - view := RSCanvas new. - ^ self asInspectorIn: view -] - { #category : 'testing' } DRDominatorTree >> isDominator: dominatorBlock of: dominatedBlock [ @@ -388,22 +305,3 @@ DRDominatorTree >> root [ ^ root ] - -{ #category : 'inspection' } -DRDominatorTree >> showLines: blockViews in: view [ - - | eb | - eb := RSLineBuilder arrowedLine. - eb canvas: view. - eb color: Color blue muchDarker. - eb width: 2. - eb withBorderAttachPoint. - eb shapes: blockViews. - eb connectToAll: [ :e | e children ]. - - view lines pushBack. - view lines do: [ :line | - | source destination | - source := line model key. - destination := line model value ] -] diff --git a/Druid/DRInstructionFactory.class.st b/Druid/DRInstructionFactory.class.st index 68b055a8..f6c8d26e 100644 --- a/Druid/DRInstructionFactory.class.st +++ b/Druid/DRInstructionFactory.class.st @@ -138,12 +138,6 @@ DRInstructionFactory >> initialize [ nextAvailableScopeId := 0 ] -{ #category : 'initialization' } -DRInstructionFactory >> initializeScope: aDRScope [ - - ^ DRInitializeScope scope: aDRScope -] - { #category : 'factory' } DRInstructionFactory >> intToFloat: operand1 [ diff --git a/Druid/DRJump.class.st b/Druid/DRJump.class.st index d7d1a162..cf8d3e03 100644 --- a/Druid/DRJump.class.st +++ b/Druid/DRJump.class.st @@ -85,15 +85,6 @@ DRJump >> initialize [ isBackJump := false ] -{ #category : 'inspecting' } -DRJump >> inspectionSource: aBuilder [ - - - ^ SpCodePresenter new - text: target asString; - yourself -] - { #category : 'testing' } DRJump >> isBackJump [ diff --git a/Druid/DRReturn.class.st b/Druid/DRReturn.class.st index 8221db77..eceb5ed4 100644 --- a/Druid/DRReturn.class.st +++ b/Druid/DRReturn.class.st @@ -19,15 +19,6 @@ DRReturn >> initialize [ result := DRNoRegister new ] -{ #category : 'inspecting' } -DRReturn >> inspectionSource: aBuilder [ - - - ^ SpCodePresenter new - text: result asString; - yourself -] - { #category : 'visiting' } DRReturn >> isMandatoryInstruction [ diff --git a/Druid/Symbol.extension.st b/Druid/Symbol.extension.st index ce944a1f..d1ef26d0 100644 --- a/Druid/Symbol.extension.st +++ b/Druid/Symbol.extension.st @@ -1,14 +1,5 @@ Extension { #name : 'Symbol' } -{ #category : '*Druid' } -Symbol >> matchArgumentsAgainst: aPragma [ - - aPragma - argumentNamed: self - ifNone: [ ^ false ]. - ^ true -] - { #category : '*Druid' } Symbol >> prettyPrint [