Merge pull request #18 from adri09070/changes-due-to-context-api-evolution

MarcusDenker · web-flow · commit 9fd179ec774d · 2022-05-24T16:35:01.000+02:00
Fixing tests and features by using `InstructionStream` instead of `Context`
diff --git a/Sindarin-Tests/SindarinDebuggerTest.class.st b/Sindarin-Tests/SindarinDebuggerTest.class.st
@@ -804,7 +804,7 @@ SindarinDebuggerTest >> testStepToReturnWithHalt [
 	dbg stepToMethodEntry.
 	dbg stepToReturn.
 	
-	self assert: dbg context willReturn.
+	self assert: dbg context instructionStream willReturn.
 	self assert: dbg node isReturn.
 	self assert: dbg topStack equals: 1
 ]
diff --git a/Sindarin/SindarinDebugger.class.st b/Sindarin/SindarinDebugger.class.st
@@ -645,7 +645,7 @@ SindarinDebugger >> stepThrough [
 
 { #category : #'stepping - steps' }
 SindarinDebugger >> stepToMethodEntry [
-	self stepUntil: [ self context willSend ].
+	self stepUntil: [ self context instructionStream willSend ].
 	process step: self context.
 	self debugSession updateContextTo: process suspendedContext
 ]
@@ -654,7 +654,7 @@ SindarinDebugger >> stepToMethodEntry [
 SindarinDebugger >> stepToReturn [
 
 	[ 
-	self context willReturn or: [ self hasSignalledUnhandledException ] ] 
+	self context instructionStream willReturn or: [ self hasSignalledUnhandledException ] ] 
 		whileFalse: [ self debugSession stepOver ]
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ SindarinDebuggerTest >> testStepToReturnWithHalt [`
`804`	`804`	`dbg stepToMethodEntry.`
`805`	`805`	`dbg stepToReturn.`
`806`	`806`
`807`		`- self assert: dbg context willReturn.`
	`807`	`+ self assert: dbg context instructionStream willReturn.`
`808`	`808`	`self assert: dbg node isReturn.`
`809`	`809`	`self assert: dbg topStack equals: 1`
`810`	`810`	`]`
Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ SindarinDebugger >> stepThrough [`
`645`	`645`
`646`	`646`	`{ #category : #'stepping - steps' }`
`647`	`647`	`SindarinDebugger >> stepToMethodEntry [`
`648`		`- self stepUntil: [ self context willSend ].`
	`648`	`+ self stepUntil: [ self context instructionStream willSend ].`
`649`	`649`	`process step: self context.`
`650`	`650`	`self debugSession updateContextTo: process suspendedContext`
`651`	`651`	`]`
`@@ -654,7 +654,7 @@ SindarinDebugger >> stepToMethodEntry [`
`654`	`654`	`SindarinDebugger >> stepToReturn [`
`655`	`655`
`656`	`656`	`[`
`657`		`- self context willReturn or: [ self hasSignalledUnhandledException ] ]`
	`657`	`+ self context instructionStream willReturn or: [ self hasSignalledUnhandledException ] ]`
`658`	`658`	`whileFalse: [ self debugSession stepOver ]`
`659`	`659`	`]`
`660`	`660`