diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index cadea09..0000000
Binary files a/src/.DS_Store and /dev/null differ
diff --git a/.properties b/src/.properties
similarity index 100%
rename from .properties
rename to src/.properties
diff --git a/src/BaselineOfSindarin/BaselineOfSindarin.class.st b/src/BaselineOfSindarin/BaselineOfSindarin.class.st
index 234ede0..aaea820 100644
--- a/src/BaselineOfSindarin/BaselineOfSindarin.class.st
+++ b/src/BaselineOfSindarin/BaselineOfSindarin.class.st
@@ -17,6 +17,6 @@ BaselineOfSindarin >> baseline: spec [
 				package: 'Sindarin-Experiments' ].
 			
 	spec 
-		group: 'default' with: #('Sindarin' 'Sindarin-Tests');
+		group: 'default' with: #( 'Sindarin' 'Sindarin-Tests');
 		group: 'experiments' with: #('default' 'Sindarin-Experiments')
 ]
diff --git a/src/Sindarin-Tests/SindarinDebuggerTest.class.st b/src/Sindarin-Tests/SindarinDebuggerTest.class.st
index a272616..2813bc5 100644
--- a/src/Sindarin-Tests/SindarinDebuggerTest.class.st
+++ b/src/Sindarin-Tests/SindarinDebuggerTest.class.st
@@ -302,12 +302,12 @@ SindarinDebuggerTest >> testChangingPcInTheMiddleOfStatementSkipsTheBeginningOfS
 		stepOver.
 	"pc of a := 5"
 
-	self assert: (scdbg temporaryNamed: #a) equals: 1.
+	self assert: (scdbg readVariableNamed: #a) equals: 1.
 
 	scdbg pc: newPc.
 	"It should skip the assignment a:=5 AND skip the beginning of the statement ('3' asInteger)"
 
-	self assert: (scdbg temporaryNamed: #a) equals: 1.
+	self assert: (scdbg readVariableNamed: #a) equals: 1.
 	self assert: scdbg node equals: newNode.
 	self assert: scdbg pc equals: newPc.
 	self deny: scdbg topStack equals: expectedStackTop.
@@ -331,11 +331,11 @@ SindarinDebuggerTest >> testChangingPcKeepsSameStateAndPushesCorrectElementsOnSt
 		stepOver;
 		stepOver.
 
-	self assert: (scdbg temporaryNamed: #a) equals: 5.
+	self assert: (scdbg readVariableNamed: #a) equals: 5.
 
 	scdbg pc: newPc.
 
-	self assert: (scdbg temporaryNamed: #a) equals: 5.
+	self assert: (scdbg readVariableNamed: #a) equals: 5.
 	self assert: scdbg node equals: newNode.
 	self assert: scdbg pc equals: newPc.
 	self assert: scdbg topStack equals: expectedStackTop
@@ -593,12 +593,12 @@ SindarinDebuggerTest >> testMoveToNodeInTheMiddleOfStatementSkipsTheBeginningOfS
 		stepOver.
 	"pc of a := 5"
 
-	self assert: (scdbg temporaryNamed: #a) equals: 1.
+	self assert: (scdbg readVariableNamed: #a) equals: 1.
 
 	scdbg moveToNode: newNode.
 	"It should skip the assignment a:=5 AND skip the beginning of the statement ('3' asInteger)"
 
-	self assert: (scdbg temporaryNamed: #a) equals: 1.
+	self assert: (scdbg readVariableNamed: #a) equals: 1.
 	self assert: scdbg node equals: newNode.
 	self assert: scdbg pc equals: newPc.
 	self deny: scdbg topStack equals: expectedStackTop.
@@ -622,11 +622,11 @@ SindarinDebuggerTest >> testMoveToNodeKeepsSameStateAndPushesCorrectElementsOnSt
 		stepOver;
 		stepOver.
 
-	self assert: (scdbg temporaryNamed: #a) equals: 5.
+	self assert: (scdbg readVariableNamed: #a) equals: 5.
 
 	scdbg moveToNode: newNode.
 
-	self assert: (scdbg temporaryNamed: #a) equals: 5.
+	self assert: (scdbg readVariableNamed: #a) equals: 5.
 	self assert: scdbg node equals: newNode.
 	self assert: scdbg pc equals: newPc.
 	self assert: scdbg topStack equals: expectedStackTop
@@ -756,11 +756,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedBlockToOuterContext [
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg context home identicalTo: oldContext.
 	self
@@ -770,7 +770,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedBlockToOuterContext [
 	sdbg stepOver.
 
 	"2 is going to be assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 2.
 
 	sdbg moveToNode: methodNode statements third.
@@ -780,7 +780,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedBlockToOuterContext [
 	"We went back to the home context"
 	self assert: sdbg context identicalTo: oldContext.
 	"2 has not been assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 1
 ]
 
@@ -805,11 +805,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToHomeConte
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg context home identicalTo: oldContext.
 	self
@@ -819,7 +819,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToHomeConte
 	sdbg stepOver.
 
 	"2 is going to be assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 2.
 
 	sdbg moveToNode: methodNode statements third.
@@ -829,7 +829,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToHomeConte
 	"We went back to the home context"
 	self assert: sdbg context identicalTo: oldContext.
 	"2 has not been assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 1
 ]
 
@@ -854,11 +854,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToNodeThatI
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg context home identicalTo: oldContext.
 	self
@@ -868,7 +868,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToNodeThatI
 	sdbg stepOver.
 
 	"2 is going to be assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 2.
 
 	oldNode := sdbg node.
@@ -883,7 +883,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenFromNonInlinedEmbeddedBlockToNodeThatI
 	"We went back to the home context"
 	self assert: sdbg context identicalTo: oldContext.
 	"2 has not been assigned to a"
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 	self assert: sdbg topStack equals: 2
 ]
 
@@ -911,11 +911,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInBlockThatCreatesContextAndBloc
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg node identicalTo: aimedNode.
 	self assert: sdbg context sender identicalTo: oldContext.
@@ -925,7 +925,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInBlockThatCreatesContextAndBloc
 		stepOver;
 		stepOver.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 2.
+	self assert: (sdbg readVariableNamed: #a) equals: 2.
 
 	"When you perform a stepOver, you quit the block and continue right where you were before moving to caret"
 	self assert: sdbg node identicalTo: sdbg methodNode statements third value.
@@ -956,11 +956,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInBlockThatCreatesContextAndBloc
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg node identicalTo: aimedNode.
 	self assert: sdbg context sender identicalTo: oldContext.
@@ -970,7 +970,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInBlockThatCreatesContextAndBloc
 		stepOver;
 		stepOver.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 2.
+	self assert: (sdbg readVariableNamed: #a) equals: 2.
 
 	"When you perform a stepOver, you quit the block and continue right where you were before moving to caret"
 	self assert: sdbg node identicalTo: oldNode value.
@@ -997,11 +997,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInIfTrueIfFalseBlock [
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
 	self assert: aimedPC isNotNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg node identicalTo: aimedNode.
 	self assert: sdbg pc identicalTo: aimedPC.
@@ -1009,11 +1009,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsInIfTrueIfFalseBlock [
 
 	sdbg stepOver.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 3.
+	self assert: (sdbg readVariableNamed: #a) equals: 3.
 
 	sdbg stepOver.
 	"When you perform a stepOver, you quit the block and continue just after the ifTrue: message"
-	self assert: (sdbg temporaryNamed: #a) equals: 4
+	self assert: (sdbg readVariableNamed: #a) equals: 4
 ]
 
 { #category : #tests }
@@ -1110,11 +1110,11 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsNonInlinedAndEmbeddedInNonInline
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 	
 	self assert: aimedPC isNil.
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	sdbg moveToNode: aimedNode.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 1.
+	self assert: (sdbg readVariableNamed: #a) equals: 1.
 
 	self assert: sdbg node identicalTo: aimedNode.
 	self assert: sdbg context home identicalTo: oldContext.
@@ -1125,7 +1125,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsNonInlinedAndEmbeddedInNonInline
 		stepOver;
 		stepOver.
 
-	self assert: (sdbg temporaryNamed: #a) equals: 2.
+	self assert: (sdbg readVariableNamed: #a) equals: 2.
 
 	"When you perform a stepOver, you quit the block and continue after the embedded block creation in the embedding block context"
 	self assert: sdbg methodNode identicalTo: methodNode statements second.
@@ -1137,7 +1137,7 @@ SindarinDebuggerTest >> testMoveToNodeWhenNodeIsNonInlinedAndEmbeddedInNonInline
 		stepOver;
 		stepOver.
 		
-	self assert: (sdbg temporaryNamed: #a) equals: 2.
+	self assert: (sdbg readVariableNamed: #a) equals: 2.
 
 	"When you perform stepOver again, you quit the embedding block and continue after the embedding block creation in the old context"
 	self assert: sdbg methodNode identicalTo: methodNode.
@@ -1357,7 +1357,7 @@ SindarinDebuggerTest >> testSkipThroughNode [
 		debug: [ self methodWithTwoAssignments  ].
 	dbg step; stepOver; stepOver.	
 	targetExecNode := dbg node.
-	realValueOfA := (dbg temporaryNamed: #a).	
+	realValueOfA := (dbg readVariableNamed: #a).	
 	dbg stepOver.
 	nodeAfterSkipThrough := dbg node.
 	realExecTopStack := dbg topStack.
@@ -1371,7 +1371,7 @@ SindarinDebuggerTest >> testSkipThroughNode [
 	self assert: dbg pc equals: realExecPC.
 	self assert: dbg node identicalTo: nodeAfterSkipThrough.
 	self assert: realValueOfA equals: 5.
-	self assert: (dbg temporaryNamed: #a) equals: 1.
+	self assert: (dbg readVariableNamed: #a) equals: 1.
 	self assert: realExecTopStack equals: 3.
 	self assert: dbg topStack equals: '3'
 ]
@@ -1385,7 +1385,7 @@ SindarinDebuggerTest >> testSkipToPC [
 	dbg step; stepOver; stepOver.
 	realExecPC := dbg pc.
 	realExecNode := dbg node.
-	realValueOfA := (dbg temporaryNamed: #a).
+	realValueOfA := (dbg readVariableNamed: #a).
 	realExecTopStack := dbg topStack.
 
 	dbg := SindarinDebugger
@@ -1395,7 +1395,7 @@ SindarinDebuggerTest >> testSkipToPC [
 	self assert: dbg pc equals: realExecPC.
 	self assert: dbg node equals: realExecNode.
 	self assert: realValueOfA equals: 5.
-	self assert: (dbg temporaryNamed: #a) equals: 1.
+	self assert: (dbg readVariableNamed: #a) equals: 1.
 	self assert: dbg topStack equals: realExecTopStack
 ]
 
@@ -1450,7 +1450,7 @@ SindarinDebuggerTest >> testSkipUpToIgnoresJumps [
 		             statements first.
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
-	a := sdbg temporaryNamed: #a.
+	a := sdbg readVariableNamed: #a.
 
 	self assert: a isNil.
 
@@ -1465,7 +1465,7 @@ SindarinDebuggerTest >> testSkipUpToIgnoresJumps [
 		             statements first.
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
-	a := sdbg temporaryNamed: #a.
+	a := sdbg readVariableNamed: #a.
 
 	self assert: a isNil.
 
@@ -1479,7 +1479,7 @@ SindarinDebuggerTest >> testSkipUpToIgnoresJumps [
 	aimedNode := sdbg methodNode statements third.
 	aimedPC := sdbg methodNode firstPcForNode: aimedNode.
 
-	a := sdbg temporaryNamed: #a.
+	a := sdbg readVariableNamed: #a.
 
 	self assert: a isNil.
 
@@ -1500,7 +1500,7 @@ SindarinDebuggerTest >> testSkipUpToNode [
 	dbg step; stepOver; stepOver.
 	realExecPC := dbg pc.
 	realExecNode := dbg node.
-	realValueOfA := (dbg temporaryNamed: #a).
+	realValueOfA := (dbg readVariableNamed: #a).
 	realExecTopStack := dbg topStack.
 	
 	dbg := SindarinDebugger
@@ -1510,7 +1510,7 @@ SindarinDebuggerTest >> testSkipUpToNode [
 	self assert: dbg pc equals: realExecPC.
 	self assert: dbg node identicalTo: realExecNode.
 	self assert: realValueOfA equals: 5.
-	self assert: (dbg temporaryNamed: #a) equals: 1.
+	self assert: (dbg readVariableNamed: #a) equals: 1.
 	self assert: dbg topStack equals: realExecTopStack
 ]
 
@@ -1546,7 +1546,7 @@ SindarinDebuggerTest >> testSkipUpToNodeInEvaluatedBlock [
 		stepOver;
 		stepOver;
 		stepThrough.
-	oldValueOfA := dbg temporaryNamed: #a.
+	oldValueOfA := dbg readVariableNamed: #a.
 	"after stepping, we stop on  b: = 3 + 2 assignment node"
 	dbg stepOver.
 
@@ -1571,12 +1571,12 @@ SindarinDebuggerTest >> testSkipUpToNodeInEvaluatedBlock [
 		skipUpToNode: realExecNode.
 	self assert: dbg pc equals: realExecPC.
 	self assert: dbg node identicalTo: realExecNode.
-	self assert: (dbg temporaryNamed: #a) equals: oldValueOfA.
+	self assert: (dbg readVariableNamed: #a) equals: oldValueOfA.
 	self assert: dbg topStack equals: valueOfBAfterSkipAndStep.
 
 	dbg stepOver.
 	"3 is on the stack so stepping over the assignment should put 3 into b"
-	self assert: (dbg temporaryNamed: #b) equals: valueOfBAfterSkipAndStep 
+	self assert: (dbg readVariableNamed: #b) equals: valueOfBAfterSkipAndStep 
 ]
 
 { #category : #'tests - skipping' }
@@ -1888,9 +1888,9 @@ SindarinDebuggerTest >> testTemporaryNamed [
 	| dbg |
 	dbg := SindarinDebugger debug: [ self methodWithOneAssignment ].
 	dbg step.
-	self assert: (dbg temporaryNamed: #a) equals: nil.
+	self assert: (dbg readVariableNamed: #a) equals: nil.
 	dbg step.
-	self assert: (dbg temporaryNamed: #a) equals: 5
+	self assert: (dbg readVariableNamed: #a) equals: 5
 ]
 
 { #category : #tests }
diff --git a/src/Sindarin/InstructionStream.extension.st b/src/Sindarin/InstructionStream.extension.st
index e819f3d..ba5b2e9 100644
--- a/src/Sindarin/InstructionStream.extension.st
+++ b/src/Sindarin/InstructionStream.extension.st
@@ -36,3 +36,13 @@ InstructionStream >> willSendOrReturnOrStoreOrCreateBlock [
 	^ self willSend or: [ 
 		  self willReturn or: [ self willStore or: [ self willCreateBlock ] ] ]
 ]
+
+{ #category : #'*Sindarin' }
+InstructionStream >> willStoreButNotPop [
+	"Answer whether the next bytecode is a store that are not store-pop"
+
+	| encoderClass byte |
+	encoderClass := self method encoderClass.
+	byte := encoderClass nonExtensionBytecodeAt: pc in: self method.
+	^ #( 243 244 245 252 ) includes: byte
+]
diff --git a/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st b/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st
index 3747182..7ae0a94 100644
--- a/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st
+++ b/src/Sindarin/RBBlockDefinitionSearchingVisitor.class.st
@@ -5,7 +5,7 @@ Class {
 		'blockToSearch',
 		'isBlockFound'
 	],
-	#category : #Sindarin
+	#category : #'Sindarin-Base'
 }
 
 { #category : #'instance creation' }
diff --git a/src/Sindarin/SindarinDebugSession.class.st b/src/Sindarin/SindarinDebugSession.class.st
index e338fea..a585445 100644
--- a/src/Sindarin/SindarinDebugSession.class.st
+++ b/src/Sindarin/SindarinDebugSession.class.st
@@ -11,7 +11,7 @@ Class {
 		'canBeTerminated',
 		'debugSession'
 	],
-	#category : #'Sindarin-Base'
+	#category : #'Sindarin-Core'
 }
 
 { #category : #'instance creation' }
diff --git a/src/Sindarin/SindarinDebugger.class.st b/src/Sindarin/SindarinDebugger.class.st
index ce84b83..fc78162 100644
--- a/src/Sindarin/SindarinDebugger.class.st
+++ b/src/Sindarin/SindarinDebugger.class.st
@@ -17,76 +17,17 @@ Virtual breakpoints were introduced because due to technical limitations, normal
 Class {
 	#name : #SindarinDebugger,
 	#superclass : #Object,
-	#traits : 'TDebugger',
-	#classTraits : 'TDebugger classTrait',
-	#instVars : [
-		'process',
-		'sindarinSession',
-		'blockToDebug'
-	],
+	#traits : 'TDebugger + TSindarin',
+	#classTraits : 'TDebugger classTrait + TSindarin classTrait',
 	#category : #'Sindarin-Base'
 }
 
-{ #category : #start }
-SindarinDebugger class >> attachTo: aDebugSession [
-	"Returns a new instance of ScriptableDebugger attached to aDebugSession"
-
-	^ self new attachTo: aDebugSession
-]
-
-{ #category : #actions }
-SindarinDebugger class >> closeAllDebuggers [
-	<script>
-	
-	self allInstances do: [ :dbg | dbg terminate ]
-]
-
-{ #category : #start }
-SindarinDebugger class >> debug: aBlock [
-	"Creates an execution of aBlock and returns an instance of ScriptableDebugger attached to this execution"
-
-	^ self new debug: aBlock
-]
-
-{ #category : #'instance creation' }
-SindarinDebugger class >> debugSession: aDebugSession [
-
-	| debugger exception sindarinPointCutExceptionClass |
-	debugger := self attachTo: aDebugSession.
-	
-	exception := aDebugSession exception.
-	sindarinPointCutExceptionClass := Smalltalk at: #SindarinPointcutException ifAbsent:[nil].
-	exception class == sindarinPointCutExceptionClass ifFalse: [ 
-		aDebugSession resume; clear.
-		^ self ].
-	
-	"Stepping to return to the context requesting the execution of a Sindarin script"
-	debugger step.
-	debugger step.
-	exception script executeWith: debugger.
-	aDebugSession resume; clear; terminate
-	
-]
-
-{ #category : #'graphical debugger' }
-SindarinDebugger >> activateAutoRefreshOfAttachedGraphicalDebugger [
-	sindarinSession activateEventTriggering.
-	self refreshAttachedGraphicalDebugger
-]
-
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> arguments [
-	"Returns the arguments of the current stack-frame."
-
-	^ self context arguments
-]
-
 { #category : #stackAccessHelpers }
 SindarinDebugger >> assignmentValue [
 	"Returns the value about to be assigned, if the current node is an assignment node. Otherwise, returns nil"
 
-	self node isAssignment
-		ifFalse: [ ^ nil	"Error signal: 'Not about to perform a assignment'" ].
+	self node isAssignment ifFalse: [
+		^ nil "Error signal: 'Not about to perform a assignment'" ].
 	^ self context at: self currentContextStackSize
 ]
 
@@ -94,127 +35,61 @@ SindarinDebugger >> assignmentValue [
 SindarinDebugger >> assignmentVariableName [
 	"Returns the variable name about to be assigned to, if the current node is an assignment node. Otherwise, returns nil"
 
-	self node isAssignment
-		ifFalse: [ ^ nil	"Error signal: 'Not about to perform a assignment'" ].
+	self node isAssignment ifFalse: [
+		^ nil "Error signal: 'Not about to perform a assignment'" ].
 	^ self node variable name
 ]
 
-{ #category : #start }
-SindarinDebugger >> attachTo: aDebugSession [
-	"Attaches this scriptable debugger to an already existing instance of DebugSession or SindarinDebugSession"
-
-	sindarinSession := aDebugSession asSindarinDebugSession.
-	process := aDebugSession interruptedProcess.
-	sindarinSession deactivateEventTriggering
-]
-
 { #category : #astAndAstMapping }
 SindarinDebugger >> bestNodeFor: anInterval [
-	^self node methodNode bestNodeFor: anInterval
+
+	^ self node methodNode bestNodeFor: anInterval
 ]
 
 { #category : #'ast manipulation' }
 SindarinDebugger >> canStillExecute: aProgramNode [
-
 	"returns true if the last pc mapped to aProgramNode is greater than `self pc` in the right context "
 
 	| lastPcForNode rightContext |
 	rightContext := self context.
 
-	[ 
-	rightContext == rightContext outerMostContext or: [ 
-		rightContext method ast allChildren identityIncludes: aProgramNode ] ] 
+	[
+	rightContext == rightContext outerMostContext or: [
+		rightContext method ast allChildren identityIncludes: aProgramNode ] ]
 		whileFalse: [ rightContext := rightContext sender ].
 
-	lastPcForNode := (rightContext method ast lastPcForNode: aProgramNode) 
+	lastPcForNode := (rightContext method ast lastPcForNode: aProgramNode)
 		                 ifNil: [ 0 ].
 
 	^ rightContext pc < lastPcForNode
 ]
 
-{ #category : #cleaning }
-SindarinDebugger >> cleanStack [
-
-	[ self context stackPtr > self context numTemps ] whileTrue: [ 
-		self context pop ]
-]
-
-{ #category : #stackAccess }
-SindarinDebugger >> context [
-	"Returns a reification of the current stack-frame."
-
-	^ self debugSession interruptedContext
-]
-
 { #category : #'execution predicates' }
 SindarinDebugger >> contextIsAboutToSignalException: aContext [
 	"Returns whether aContext is about to execute a message-send of selector #signal to an instance of the Exception class (or one of its subclasses)"
 
 	| node |
-	node := aContext method methodNode bcToASTCache nodeForPC: aContext pc.
-	node isMessage
-		ifFalse: [ ^ false ].
-	node selector = #signal
-		ifFalse: [ ^ false ].
-	aContext basicSize >= 1
-		ifFalse: [ ^ false ].
+	node := self node.
+	node isMessage ifFalse: [ ^ false ].
+	(#( #signal #signalIn: ) includes: node selector) ifFalse: [ ^ false ].
+	aContext basicSize >= 1 ifFalse: [ ^ false ].
 	(Exception allSubclasses includes: (aContext at: aContext basicSize))
-		ifTrue: [ ^ true ].	"#signal sent to a subclass of Exception"
-	(Exception allSubclasses
-		includes: (aContext at: aContext basicSize) class)
-		ifTrue: [ ^ true ].	"#signal sent to an instance of a subclass of Exception"
+		ifTrue: [ ^ true ]. "#signal sent to a subclass of Exception"
+	(Exception allSubclasses includes:
+		 (aContext at: aContext basicSize) class) ifTrue: [ ^ true ]. "#signal sent to an instance of a subclass of Exception"
 	^ false
 ]
 
-{ #category : #'stepping -  auto' }
+{ #category : #'stepping - auto' }
 SindarinDebugger >> continue [
 	"Steps the execution until it:
 	- is about to signal an exception.
 	- has finished"
-
+	self flag: 'What''s the difference between this and #resume?'.
 	[ self isExecutionFinished or: [ self isAboutToSignalException ] ]
 		whileFalse: [ self step ]
 ]
 
-{ #category : #accessing }
-SindarinDebugger >> currentBytecode [
-	^ self context method symbolicBytecodes
-]
-
-{ #category : #private }
-SindarinDebugger >> currentContextStackSize [
-	^ self context basicSize
-]
-
-{ #category : #process }
-SindarinDebugger >> currentProcess [
-	^process
-]
-
-{ #category : #'graphical debugger' }
-SindarinDebugger >> deactivateAutoRefreshOfAttachedGraphicalDebugger [
-	sindarinSession deactivateEventTriggering
-]
-
-{ #category : #start }
-SindarinDebugger >> debug: aBlock [
-	blockToDebug := aBlock.
-	process := aBlock newProcess name: 'ExecutionDebuggedByScriptableDebugger'.
-	sindarinSession := SindarinDebugSession
-		newWithName: 'ScriptableDebuggerDebugSession'
-		forProcess: process.
-	sindarinSession deactivateEventTriggering.
-	"Step the process until it enters the block for which a process was created"
-	[ self context closure == blockToDebug ] whileFalse: [ self step ]
-]
-
-{ #category : #accessing }
-SindarinDebugger >> debugSession [
-	"Returns the DebugSession representing the execution this ScriptableDebugger is debugging"
-
-	^ sindarinSession debugSession
-]
-
 { #category : #accessing }
 SindarinDebugger >> firstPCOfStatement: aStatementNode [
 
@@ -224,17 +99,9 @@ SindarinDebugger >> firstPCOfStatement: aStatementNode [
 { #category : #'execution predicates' }
 SindarinDebugger >> hasSignalledUnhandledException [
 	"Returns true if the debugged execution has signalled an exception that has not been handled by any on:do: (i.e. the #defaultAction of the exception is about to be executed. This default action typically leads to opening a debugger on the process that signalled the exception)"
-	^ (#(#defaultAction #signal) includes: self selector ) and: [ self receiver isKindOf: Exception ]
-]
 
-{ #category : #private }
-SindarinDebugger >> instanceCreationPrimitives [
-	"* 70 */ primitiveNew,
-	/* 71 */ primitiveNewWithArg,
-	/* 79 */ primitiveNewMethod,
-	/* 148 */ primitiveClone,
-	/* 160 */ primitiveAdoptInstance"
-	^#(70 71 79 148 160)
+	^ (#( #defaultAction #signal #signalIn: ) includes: self selector) and: [
+		  self receiver isKindOf: Exception ]
 ]
 
 { #category : #'execution predicates' }
@@ -255,16 +122,8 @@ SindarinDebugger >> isAboutToSignalException [
 	^ self contextIsAboutToSignalException: self context
 ]
 
-{ #category : #stackAccess }
-SindarinDebugger >> isExecutionFinished [
-	"Returns whether the debugged execution is finished"
-
-	^ process isTerminated
-]
-
 { #category : #'API - changes' }
 SindarinDebugger >> jumpIntoBlock: aBlockNode toNode: targetNode [
-
 	"Moves to targetNode that must be in aBlockNode, which should be a recursive child"
 
 	| blockClosure newContext firstPCForNode |
@@ -272,7 +131,7 @@ SindarinDebugger >> jumpIntoBlock: aBlockNode toNode: targetNode [
 	firstPCForNode := self methodNode firstPcForNode: aBlockNode.
 	self pc: firstPCForNode.
 	self stepBytecode.
-	blockClosure := self context top.
+	blockClosure := self topStack.
 	newContext := blockClosure asContextWithSender: self context.
 
 	"we need to change the suspended context and do the same in its debug session to see what we do in the debugger"
@@ -285,28 +144,16 @@ SindarinDebugger >> jumpIntoBlock: aBlockNode toNode: targetNode [
 SindarinDebugger >> message: aSelector [
 	"Returns whether the execution is about to send a message of selector @aSelector to any object"
 
-	| node |
-	node := self node.
-	node isMessage
-		ifFalse: [ ^ false ].
-	node selector = aSelector
-		ifFalse: [ ^ false ].
-	^ true
+	[ ^ self messageSelector = aSelector ]
+		on: Error
+		do: [ ^ false ]
 ]
 
 { #category : #stackAccessHelpers }
 SindarinDebugger >> message: aSelector to: anObject [
 	"Returns whether the execution is about to send a message of selector @aSelector to @anObject"
 
-	| node |
-	node := self node.
-	node isMessage
-		ifFalse: [ ^ false ].
-	node selector = aSelector
-		ifFalse: [ ^ false ].
-	self messageReceiver == anObject
-		ifFalse: [ ^ false ].
-	^ true
+	^ (self message: aSelector) and: [ self messageReceiver == anObject ]
 ]
 
 { #category : #stackAccessHelpers }
@@ -329,17 +176,15 @@ SindarinDebugger >> messageArguments [
 	"Returns the arguments of the message about to be sent, if the current node is a message node."
 
 	| argumentNumber arguments i |
-	self node isMessage
-		ifFalse: [ Error signal: 'Not about to send a message' ].
+	self node isMessage ifFalse: [
+		Error signal: 'Not about to send a message' ].
 	argumentNumber := self node arguments size.
 	arguments := OrderedCollection new.
 	i := 0.
-	[ i = argumentNumber ]
-		whileFalse: [ arguments
-				add:
-					(self context
-						at: self currentContextStackSize - argumentNumber + i + 1).
-			i := i + 1 ].
+	[ i = argumentNumber ] whileFalse: [
+		arguments add: (self context at:
+				 self currentContextStackSize - argumentNumber + i + 1).
+		i := i + 1 ].
 	^ arguments
 ]
 
@@ -362,19 +207,6 @@ SindarinDebugger >> messageSelector [
 	^ self node selector
 ]
 
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> method [
-	"Returns the method of the current stack-frame."
-
-	^ self context method
-]
-
-{ #category : #accessing }
-SindarinDebugger >> methodNode [ 
-
-	^ self method ast
-]
-
 { #category : #'API - changes' }
 SindarinDebugger >> moveToNode: aNode [
 
@@ -406,8 +238,8 @@ SindarinDebugger >> moveToNode: aNode [
 { #category : #'accessing - bytes' }
 SindarinDebugger >> nextBytecode [
 
-	^ self currentBytecode detect: [ :each | 
-		  each offset = self context pc ]
+	^ self symbolicBytecodesForCurrent detect: [ :each | 
+		  each offset = self pc ]
 ]
 
 { #category : #'API - changes' }
@@ -416,46 +248,7 @@ SindarinDebugger >> nextExecutedNodeAfter: aNode [
 	^ self methodNode nextExecutedNodeAfter: aNode
 ]
 
-{ #category : #astAndAstMapping }
-SindarinDebugger >> node [
-	"Returns the AST node about to be executed by the top context of the execution"
-
-	^ self context method sourceNodeForPC: self context pc
-]
-
-{ #category : #astAndAstMapping }
-SindarinDebugger >> nodeForContext: aContext [
-	"Returns the AST node about to be executed by the top context of the execution"
-
-	^ aContext method sourceNodeForPC: aContext pc
-]
-
-{ #category : #'graphical debugger' }
-SindarinDebugger >> openInGraphicalDebugger [
-	sindarinSession canBeTerminated: false.	"Prevents the graphical debugger from terminating the debug session when it's closed."
-	self
-		flag:
-			'Should be an extension of DebuggerSelector and handled by its sole instance'
-]
-
-{ #category : #'accessing - context' }
-SindarinDebugger >> outerMostContextOf: aContext [
-
-	| currentContext oldContext |
-	currentContext := aContext.
-	oldContext := nil.
-	[currentContext ~= oldContext] whileTrue: [ 
-		oldContext := currentContext.
-		currentContext := currentContext outerMostContext ].
-	^ currentContext
-]
-
-{ #category : #accessing }
-SindarinDebugger >> pc [
-	^ self context pc
-]
-
-{ #category : #accessing }
+{ #category : #'API - changes' }
 SindarinDebugger >> pc: anInteger [
 
 	"Allows to move to the first PC associated to the node to which anInteger is associated. anInteger must be a valid pc in the suspended context"
@@ -480,86 +273,58 @@ SindarinDebugger >> pc: anInteger [
 	self skipUpToNode: nextNode
 ]
 
-{ #category : #'stepping -  auto' }
+{ #category : #'stepping - auto' }
 SindarinDebugger >> proceed [
 	"alias of #continue"
 
 	^ self continue
 ]
 
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> receiver [
-	"Returns the receiver of the current stack-frame."
-
-	^ self context receiver
-]
-
-{ #category : #'graphical debugger' }
-SindarinDebugger >> refreshAttachedGraphicalDebugger [
-	sindarinSession refreshAttachedDebugger
-]
-
-{ #category : #stackAccess }
-SindarinDebugger >> restart [
-	"Resets this debugger on a new execution of the block passed as argument to the initial call to #debug:"
-	self initialize.
-	self debug: blockToDebug.
-]
-
-{ #category : #'stepping -  auto' }
-SindarinDebugger >> resume [
-
-	sindarinSession resumeAndClear
-]
-
 { #category : #scripts }
 SindarinDebugger >> run: aSindarinScript [
-	aSindarinScript executeWith: self
-]
-
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> selector [
-	"Returns the selector of the current stack-frame."
 
-	^ self context selector
+	aSindarinScript executeWith: self
 ]
 
 { #category : #asserting }
 SindarinDebugger >> shouldStepIntoInMethod: aRBMethodNode [
+	"used by #stpeToReturn to know if it should stepInto or stepOver. It should stepInto to get to non-local returns"
 
 	| messageNode childrenOfMessageNode |
 	messageNode := self node.
 	messageNode isMessage ifFalse: [ ^ false ].
 	childrenOfMessageNode := messageNode children.
 	childrenOfMessageNode := childrenOfMessageNode
-		                         select: [ :child | 
-			                         child isBlock or: [ 
-				                         child isVariable and: [ 
+		                         select: [ :child |
+			                         child isBlock or: [
+				                         child isVariable and: [
 					                         (child variableValueInContext:
 						                          self context) isBlock ] ] ]
-		                         thenCollect: [ :child | 
-			                         child isVariable ifTrue: [ 
+		                         thenCollect: [ :child |
+			                         child isVariable ifTrue: [
 				                         (child variableValueInContext:
 					                          self context) startpcOrOuterCode ast ] ].
-	^ childrenOfMessageNode anySatisfy: [ :child | 
+	^ childrenOfMessageNode anySatisfy: [ :child |
 		  (RBBlockDefinitionSearchingVisitor newToSearch: child) visitNode:
 			  aRBMethodNode ]
 ]
 
 { #category : #private }
 SindarinDebugger >> signalExceptionIfDebuggedExecutionHasSignalledUnhandledException [
+
 	| unhandledException |
-	(self hasSignalledUnhandledException)
-		ifTrue: [ 
-			unhandledException := self receiver.
-			UnhandledExceptionSignalledByADebuggedExecution
-				signalWithException: unhandledException.
-		]
-	
-		"ifTrue:
+	self hasSignalledUnhandledException ifFalse: [ ^ self ].
+
+	"The debugged execution signalled an exception, this exception was not handled and is about to cause a debugger to open. Signalling an exception **in the scriptable debugger's process** to inform the user of this"
+	unhandledException := self receiver.
+	UnhandledExceptionSignalledByADebuggedExecution signalWithException:
+		unhandledException
+
+
+	"ifTrue:
 			[" "The debugged execution signalled an exception, this exception was not handled and is about to cause a debugger to open."
-			"Signalling an exception **in the scriptable debugger's process** to inform the user of this"
-			"unhandledException := self messageArguments at: 1.
+	"Signalling an exception **in the scriptable debugger's process** to inform the user of this"
+	"unhandledException := self messageArguments at: 1.
 			UnhandledExceptionSignalledByADebuggedExecution
 				signalWithException: unhandledException ]"
 ]
@@ -567,22 +332,16 @@ SindarinDebugger >> signalExceptionIfDebuggedExecutionHasSignalledUnhandledExcep
 { #category : #private }
 SindarinDebugger >> signalExceptionIfDebuggedExecutionIsFinished [
 	"Signals an DebuggedExecutionIsFinished exception if the debugged execution is finished"
-	(self isExecutionFinished) ifTrue: [ 
-		DebuggedExecutionIsFinished signal.
-	].
-]
 
-{ #category : #accessing }
-SindarinDebugger >> sindarinSession: aSindarinDebugSession [
-
-	sindarinSession := aSindarinDebugSession
+	self isExecutionFinished ifTrue: [
+		DebuggedExecutionIsFinished signal ]
 ]
 
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skip [
 
 	| instructionStream |
-	instructionStream := self context instructionStream.
+	instructionStream := self instructionStream.
 
 	"We need to treat jumps before messages because if it is associated to a message node, it would pop the arguments of the message, that aren't on the stack if they are jumps"
 	instructionStream willJump ifTrue: [ ^ self skipJump ].
@@ -594,21 +353,17 @@ SindarinDebugger >> skip [
 
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skipAssignmentNodeCompletely [
-
-	| currentBytecode |
-	currentBytecode := self currentBytecode detect: [ :each | 
-		                   each offset = self context pc ].
-
+	
 	"Pop the value that will be assigned"
 	self context pop.
 
 	"If the assignment is a store bytecode and not a pop bytecode, we push the current value of the variable that was going to be assigned."
-	(#( 243 244 245 252 ) includes: currentBytecode bytes first) ifTrue: [ 
+	self willStoreButNotPop ifTrue: [
 		self context push:
 			(self node variable variableValueInContext: self context) ].
 
 	"Increase the pc to go over the assignment"
-	self context pc: self context pc + currentBytecode bytes size.
+	self skipPcToNextBytecode.
 	"Execute bytecodes the debugger usually executes without stopping the execution (for example popping the return value of the just executed message send if it is not used afterwards)"
 	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
 		self debugSession interruptedProcess
@@ -616,53 +371,49 @@ SindarinDebugger >> skipAssignmentNodeCompletely [
 
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skipAssignmentNodeWith: replacementValue [
-	self context pop.
+
 	"Pop the value to be assigned"
+	self context pop.
+	
 	"Push the replacement value on the context's value stack, to simulate that the assignment happened and had value nil"
 	self context push: replacementValue.
 	self step.
 	"Execute bytecodes the debugger usually executes without stopping the execution (for example popping the return value of the just executed message send if it is not used afterwards)"
-	self debugSession
-		stepToFirstInterestingBytecodeWithJumpIn: self debugSession interruptedProcess
+	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
+		self debugSession interruptedProcess
 ]
 
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skipBlockNode [
 
-	| nextBytecode |
-	nextBytecode := self currentBytecode detect: [ :bytecode | 
-		                bytecode offset = self pc ].
-
-	self context pc: self pc + nextBytecode bytes size.
+	self skipPcToNextBytecode.
 
 	self context push: nil.
-  
+
 	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
 		self debugSession interruptedProcess
 ]
 
-{ #category : #'stepping - skip' }
+{ #category : #'stepping -  skip' }
 SindarinDebugger >> skipJump [
 
-	| instructionStream nextBytecode |
-	instructionStream := self context instructionStream.
+	| instructionStream |
+	instructionStream := self instructionStream.
 	"If the next bytecode is a jumpTrue: or a jumpFalse: bytecode, then it expects one argument on the stack. As we skip the jump bytecode, we pop it."
-	(instructionStream willJumpIfFalse or: [ 
+	(instructionStream willJumpIfFalse or: [
 		 instructionStream willJumpIfTrue ]) ifTrue: [ self context pop ].
-	nextBytecode := self currentBytecode detect: [ :each | 
-		                each offset = self pc ].
-	self context pc: self context pc + nextBytecode bytes size.
+	self skipPcToNextBytecode.
 	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
 		self debugSession interruptedProcess
 ]
 
-{ #category : #'stepping - skip' }
+{ #category : #'stepping -  skip' }
 SindarinDebugger >> skipMessageNode [
 
 	self node arguments do: [ :arg | self context pop ]. "Pop the arguments of the message send from the context's value stack"
 
 	"Increase the pc to go over the message send"
-	self context pc: self context pc + self nextBytecode bytes size.
+	self skipPcToNextBytecode.
 	"Execute bytecodes the debugger usually executes without stopping the execution (for example popping the return value of the just executed message send if it is not used afterwards)"
 	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
 		self debugSession interruptedProcess
@@ -677,15 +428,16 @@ SindarinDebugger >> skipMessageNodeWith: replacementValue [
 	"Push the replacement value on the context's value stack, to simulate that the message send happened and returned nil"
 	self context push: replacementValue.
 	"Increase the pc to go over the message send"
-	self context pc: self context pc + self nextBytecode bytes size.
+	self skipPcToNextBytecode.
 	"Execute bytecodes the debugger usually executes without stopping the execution (for example popping the return value of the just executed message send if it is not used afterwards)"
 	self debugSession stepToFirstInterestingBytecodeWithJumpIn:
 		self debugSession interruptedProcess
 ]
 
-{ #category : #'stepping - skip' }
+{ #category : #'stepping -  skip' }
 SindarinDebugger >> skipReturnNode [
 
+	self flag: 'We should be able to skip a return node as long as it''s not the last one in the method'.
 	^ SindarinSkippingReturnWarning signal: 'Cannot skip a return node'
 ]
 
@@ -745,14 +497,7 @@ SindarinDebugger >> skipWith: replacementValue [
 		ifTrue: [ ^	self skipAssignmentNodeWith: replacementValue ]
 ]
 
-{ #category : #stackAccess }
-SindarinDebugger >> stack [
-	"Returns a list of context objects representing the current call stack."
-
-	^ self debugSession stack
-]
-
-{ #category : #API }
+{ #category : #'ast manipulation' }
 SindarinDebugger >> statementNodeContaining: aNode [
 
 	| method statementNode parentOfStatementNode |
@@ -775,7 +520,7 @@ SindarinDebugger >> step [
 
 	self signalExceptionIfDebuggedExecutionHasSignalledUnhandledException.
 	self signalExceptionIfDebuggedExecutionIsFinished.
-	self debugSession stepInto
+	self basicStep
 ]
 
 { #category : #'stepping - steps' }
@@ -785,17 +530,6 @@ SindarinDebugger >> step: anInt [
 	anInt timesRepeat: [ self step ]
 ]
 
-{ #category : #'stepping - echo' }
-SindarinDebugger >> stepBatchAndReturnNodeHashAndStackSize [
-	"For EchoDebugger"
-	| nodesHashAndStackSize count |
-	count := 0.
-	nodesHashAndStackSize := OrderedCollection new.
-	[ [ count <= 1000] whileTrue: [ count := count + 1. nodesHashAndStackSize add: {self node dictionaryRepresentation hash. self stack size}. self step ]] on: DebuggedExecutionException do: [ "when debugged execution is over or signals exception, stop and return the result data" ^ nodesHashAndStackSize ].
-	^ nodesHashAndStackSize
-	
-]
-
 { #category : #'stepping - steps' }
 SindarinDebugger >> stepBytecode [
 	"Executes the next bytecode"
@@ -809,6 +543,7 @@ SindarinDebugger >> stepBytecode [
 { #category : #'stepping - steps' }
 SindarinDebugger >> stepOver [
 	| startContext |
+	self flag: 'Why don''t we use the stepOver from the debug session? Do we really need to use the #step that performs exception check and termination check every time?'.
 	startContext := self context.
 	self step.
 	[ self context == startContext
@@ -829,12 +564,15 @@ SindarinDebugger >> stepThrough [
 	"Hacked for demonstration purposes to have a stepThrough"
 
 	self signalExceptionIfDebuggedExecutionHasSignalledUnhandledException.
-	self debugSession stepThrough
+	self basicStepThrough
 ]
 
 { #category : #'stepping - steps' }
 SindarinDebugger >> stepToMethodEntry [
-	self stepUntil: [ self context instructionStream willSend ].
+
+	self flag:
+		'Maybe all the instructionStream API should be in Sindarin, as helpers'.
+	self stepUntil: [ self instructionStream willSend ].
 	process step: self context.
 	self debugSession updateContextTo: process suspendedContext
 ]
@@ -846,16 +584,13 @@ SindarinDebugger >> stepToReturn [
 	oldContext := self outerMostContextOf: self context.
 	methodAST := self context method ast.
 
-	[ 
-	((self outerMostContextOf: self context) = oldContext and: [ 
-		 self context instructionStream willReturn ]) or: [ 
-		self hasSignalledUnhandledException ] ] whileFalse: [ 
+	[
+	((self outerMostContextOf: self context) = oldContext and: [
+		 self instructionStream willReturn ]) or: [
+		self hasSignalledUnhandledException ] ] whileFalse: [
 		(self shouldStepIntoInMethod: methodAST)
-			ifTrue: [ self debugSession stepInto ]
-			ifFalse: [ self debugSession stepOver ] ]
-	"[ 
-	self context instructionStream willReturn or: [ self hasSignalledUnhandledException ] ] 
-		whileFalse: [ self debugSession stepOver ]"
+			ifTrue: [ self basicStep ]
+			ifFalse: [ self basicStepOver ] ]
 ]
 
 { #category : #'stepping - steps' }
@@ -865,24 +600,8 @@ SindarinDebugger >> stepUntil: aBlock [
 	aBlock whileFalse: [ self step ]
 ]
 
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> temporaryNamed: aSymbol [
-	^self context tempNamed: aSymbol
-]
-
-{ #category : #process }
-SindarinDebugger >> terminate [
-	sindarinSession terminate
-]
-
-{ #category : #stackAccessHelpers }
-SindarinDebugger >> topStack [
-	^self context top
-]
-
 { #category : #'API - changes' }
 SindarinDebugger >> tryMoveToNodeInHomeContext: aNode [
-
 	"Moves to node aNode if aNode is in the lexical context. Otherwise, the program state goes back to how it was before trying and signals an error as the node is not in AST"
 
 	| oldContext |
@@ -891,8 +610,14 @@ SindarinDebugger >> tryMoveToNodeInHomeContext: aNode [
 	self debugSession suspendedContext: oldContext home.
 	[ self moveToNode: aNode ]
 		on: NodeNotInASTError
-		do: [ 
+		do: [
 			self currentProcess suspendedContext: oldContext.
 			self debugSession suspendedContext: oldContext.
 			^ NodeNotInASTError signal ]
 ]
+
+{ #category : #'execution predicates' }
+SindarinDebugger >> willStoreButNotPop [
+
+	^ self instructionStream willStoreButNotPop
+]
diff --git a/src/Sindarin/SindarinSkippingReturnWarning.class.st b/src/Sindarin/SindarinSkippingReturnWarning.class.st
index 4872f31..08b4082 100644
--- a/src/Sindarin/SindarinSkippingReturnWarning.class.st
+++ b/src/Sindarin/SindarinSkippingReturnWarning.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #SindarinSkippingReturnWarning,
 	#superclass : #Warning,
-	#category : #Sindarin
+	#category : #'Sindarin-Exceptions'
 }
diff --git a/src/Sindarin/TSindarin.trait.st b/src/Sindarin/TSindarin.trait.st
new file mode 100644
index 0000000..7ade0cb
--- /dev/null
+++ b/src/Sindarin/TSindarin.trait.st
@@ -0,0 +1,281 @@
+"
+I am a trait that contains the core API that a scriptable debugger should use
+"
+Trait {
+	#name : #TSindarin,
+	#instVars : [
+		'process',
+		'sindarinSession',
+		'blockToDebug'
+	],
+	#category : #'Sindarin-Core'
+}
+
+{ #category : #start }
+TSindarin classSide >> attachTo: aDebugSession [
+	"Returns a new instance of ScriptableDebugger attached to aDebugSession"
+
+	^ self new attachTo: aDebugSession
+]
+
+{ #category : #actions }
+TSindarin classSide >> closeAllDebuggers [
+	<script>
+	
+	self allInstances do: [ :dbg | dbg terminate ]
+]
+
+{ #category : #start }
+TSindarin classSide >> debug: aBlock [
+	"Creates an execution of aBlock and returns an instance of ScriptableDebugger attached to this execution"
+
+	^ self new debug: aBlock
+]
+
+{ #category : #'instance creation' }
+TSindarin classSide >> debugSession: aDebugSession [
+
+	| debugger exception sindarinPointCutExceptionClass |
+	debugger := self attachTo: aDebugSession.
+	
+	exception := aDebugSession exception.
+	sindarinPointCutExceptionClass := Smalltalk at: #SindarinPointcutException ifAbsent:[nil].
+	exception class == sindarinPointCutExceptionClass ifFalse: [ 
+		aDebugSession resume; clear.
+		^ self ].
+	
+	"Stepping to return to the context requesting the execution of a Sindarin script"
+	debugger step.
+	debugger step.
+	exception script executeWith: debugger.
+	aDebugSession resume; clear; terminate
+	
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> arguments [
+	"Returns the arguments of the current stack-frame."
+
+	^ self context arguments
+]
+
+{ #category : #start }
+TSindarin >> attachTo: aDebugSession [
+	"Attaches this scriptable debugger to an already existing instance of DebugSession or SindarinDebugSession"
+
+	sindarinSession := aDebugSession asSindarinDebugSession.
+	process := aDebugSession interruptedProcess.
+	sindarinSession deactivateEventTriggering
+]
+
+{ #category : #'debug - stepping' }
+TSindarin >> basicStep [
+
+	self debugSession stepInto
+]
+
+{ #category : #'debug - stepping' }
+TSindarin >> basicStepOver [
+
+	^ self debugSession stepOver
+]
+
+{ #category : #'debug - stepping' }
+TSindarin >> basicStepThrough [
+
+	self debugSession stepThrough
+]
+
+{ #category : #cleaning }
+TSindarin >> cleanStack [
+
+	[ self context stackPtr > self context numTemps ] whileTrue: [ 
+		self context pop ]
+]
+
+{ #category : #stackAccess }
+TSindarin >> context [
+	"Returns a reification of the current stack-frame."
+
+	^ self debugSession interruptedContext
+]
+
+{ #category : #private }
+TSindarin >> currentContextStackSize [
+
+	^ self context basicSize
+]
+
+{ #category : #process }
+TSindarin >> currentProcess [
+
+	^ process
+]
+
+{ #category : #start }
+TSindarin >> debug: aBlock [
+
+	blockToDebug := aBlock.
+	process := aBlock newProcess name:
+		           'ExecutionDebuggedByScriptableDebugger'.
+	sindarinSession := SindarinDebugSession
+		                   newWithName: 'ScriptableDebuggerDebugSession'
+		                   forProcess: process.
+	sindarinSession deactivateEventTriggering.
+	"Step the process until it enters the block for which a process was created"
+	[ self context closure == blockToDebug ] whileFalse: [ self step ]
+]
+
+{ #category : #accessing }
+TSindarin >> debugSession [
+	"Returns the DebugSession representing the execution this ScriptableDebugger is debugging"
+
+	^ sindarinSession debugSession
+]
+
+{ #category : #private }
+TSindarin >> instanceCreationPrimitives [
+	"* 70 */ primitiveNew,
+	/* 71 */ primitiveNewWithArg,
+	/* 79 */ primitiveNewMethod,
+	/* 148 */ primitiveClone,
+	/* 160 */ primitiveAdoptInstance"
+
+	self flag: 'These numbers may have changed. This is to be checked'.
+	^ #( 70 71 79 148 160 )
+]
+
+{ #category : #accessing }
+TSindarin >> instructionStream [
+
+	^ self context instructionStream
+]
+
+{ #category : #stackAccess }
+TSindarin >> isExecutionFinished [
+	"Returns whether the debugged execution is finished"
+
+	^ process isTerminated
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> method [
+	"Returns the method of the current stack-frame."
+
+	self flag:
+		'There is something bad here. Context>>#method returns a CompiledCode that can be a CompiledBlock. So the naming of the method is not completely correct. We should distinguish method and methodOrBlock'.
+	^ self context method
+]
+
+{ #category : #accessing }
+TSindarin >> methodNode [
+
+	self flag:
+		'There is something bad here. This method returns the node of the compiled code (so a block node for a block). We should distinguish methodNode and methodOrBlockNode. See flag in #method'.
+	^ self method ast
+]
+
+{ #category : #astAndAstMapping }
+TSindarin >> node [
+	"Returns the AST node about to be executed by the top context of the execution"
+
+	^ self nodeForContext: self context
+]
+
+{ #category : #astAndAstMapping }
+TSindarin >> nodeForContext: aContext [
+	"Returns the AST node about to be executed by the top context of the execution"
+
+	^ self method sourceNodeForPC: aContext pc
+]
+
+{ #category : #'accessing - context' }
+TSindarin >> outerMostContextOf: aContext [
+
+	| currentContext oldContext |
+	currentContext := aContext.
+	oldContext := nil.
+	[currentContext ~= oldContext] whileTrue: [ 
+		oldContext := currentContext.
+		currentContext := currentContext outerMostContext ].
+	^ currentContext
+]
+
+{ #category : #accessing }
+TSindarin >> pc [
+
+	^ self context pc
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> readVariableNamed: aSymbol [
+
+	^ self context readVariableNamed: aSymbol
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> receiver [
+	"Returns the receiver of the current stack-frame."
+
+	^ self context receiver
+]
+
+{ #category : #start }
+TSindarin >> restart [
+	"Resets this debugger on a new execution of the block passed as argument to the initial call to #debug:"
+
+	self initialize.
+	self debug: blockToDebug
+]
+
+{ #category : #'stepping - auto' }
+TSindarin >> resume [
+
+	sindarinSession resumeAndClear
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> selector [
+	"Returns the selector of the current stack-frame."
+
+	^ self context selector
+]
+
+{ #category : #accessing }
+TSindarin >> sindarinSession: aSindarinDebugSession [
+
+	sindarinSession := aSindarinDebugSession
+]
+
+{ #category : #'stepping -  skip' }
+TSindarin >> skipPcToNextBytecode [
+
+	| currentBytecode |
+	currentBytecode := self nextBytecode.
+	self context pc: self context pc + currentBytecode bytes size
+]
+
+{ #category : #stackAccess }
+TSindarin >> stack [
+	"Returns a list of context objects representing the current call stack."
+
+	^ self debugSession stack
+]
+
+{ #category : #accessing }
+TSindarin >> symbolicBytecodesForCurrent [
+
+	^ self method symbolicBytecodes
+]
+
+{ #category : #process }
+TSindarin >> terminate [
+
+	sindarinSession terminate
+]
+
+{ #category : #stackAccessHelpers }
+TSindarin >> topStack [
+
+	^ self context top
+]