Merge pull request #33 from adri09070/31-fixing-skipping-message-that-puts-nil-on-stack

Fixing skip command so that it leaves the receiver on the stack instead of putting nil on the stack

Author: StevenCostiou

Sindarin-Tests/SindarinDebuggerTest.class.st

@@ -565,7 +565,22 @@ SindarinDebuggerTest >> testSkip [
 	self assert: a equals: 1.
 	scdbg skip.
 	scdbg step.
-	self assert: p equals: nil
+	self assert: p equals: Point
+]
+
+{ #category : #tests }
+SindarinDebuggerTest >> testSkipSkipsMessagesByPuttingReceiverOnStack [
+
+	| a scdbg |
+ 	a := 1.
+ 	scdbg := SindarinDebugger
+ 		debug: [ a := a + 2 ].
+ 	self assert: a equals: 1.
+
+ 	scdbg skip.
+ 	scdbg step.
+
+ 	self assert: a equals: 1
 ]
 
 { #category : #tests }
@@ -621,7 +636,7 @@ SindarinDebuggerTest >> testSkipThroughNode [
 	self assert: realValueOfA equals: 5.
 	self assert: (dbg temporaryNamed: #a) equals: 1.
 	self assert: realExecTopStack equals: 3.
-	self assert: dbg topStack equals: nil
+	self assert: dbg topStack equals: '3'
 ]
 
 { #category : #'tests - skipping' }
@@ -919,5 +934,5 @@ SindarinDebuggerTest >> testskipUpToNodeSkipTargetNode [
 	returnNode := (self class >> #helperMethod1) ast statements last.
 	dbg step; skipThroughNode: returnNode.
 	self assert: dbg node equals: returnNode.
-	self assert: dbg topStack equals: nil
+	self assert: dbg topStack equals: Point
 ]

Sindarin/SindarinDebugger.class.st

@@ -524,9 +524,11 @@ SindarinDebugger >> sindarinSession: aSindarinDebugSession [
 
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skip [
+
 	"If it is a message send or assignment, skips the execution of the current instruction, and puts nil on the execution stack."
-	self node isAssignment
-		ifTrue: [ ^ self skipAssignmentNodeCompletely ].
+
+	self node isAssignment ifTrue: [ ^ self skipAssignmentNodeCompletely ].
+	self node isMessage ifTrue: [ ^ self skipMessageNode ].
 	self skipWith: nil
 ]
 
@@ -564,18 +566,31 @@ SindarinDebugger >> skipAssignmentNodeWith: replacementValue [
 		stepToFirstInterestingBytecodeIn: self debugSession interruptedProcess
 ]
 
+{ #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 + 1.
+	"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 stepToFirstInterestingBytecodeIn:
+		self debugSession interruptedProcess
+]
+
 { #category : #'stepping -  skip' }
 SindarinDebugger >> skipMessageNodeWith: replacementValue [
-	self node arguments do: [ :arg | self context pop ].	"Pop the arguments of the message send from the context's value stack"
+
+	self node arguments do: [ :arg | self context pop ]. "Pop the arguments of the message send from the context's value stack"
 	"Pop the receiver from the context's value stack"
 	self context pop.
 	"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 + 1.
 	"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
-		stepToFirstInterestingBytecodeIn: self debugSession interruptedProcess
+	self debugSession stepToFirstInterestingBytecodeIn:
+		self debugSession interruptedProcess
 ]
 
 { #category : #'stepping -  skip' }