Skip to content

Integrating skipUpTo improvements #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adri09070 merged 6 commits into from
Oct 4, 2022
Merged

Integrating skipUpTo improvements #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
934be58
adding test for skipUpToNode in an already evaluated block. It's green
adri09070 Jun 28, 2022
b01d2d9
Improving skipUpToNode so that it doesn't skip anything if the node i…
adri09070 Sep 5, 2022
533c287
Improving skipToPC so that it stops when the user tries to skip beyon…
adri09070 Sep 5, 2022
dd9e64a
Merge 934be5875e9157ef181d77677fb2d4f5b3712fda
adri09070 Sep 5, 2022
b79d4f4
Fixing a failing functional test + adding its helper method that I fo…
adri09070 Sep 9, 2022
8837974
Merge pull request #48 from adri09070/28-Skip-through-and-skipUpTo-so…
MarcusDenker Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 241 additions & 53 deletions Sindarin-Tests/SindarinDebuggerTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,30 @@ SindarinDebuggerTest >> helperMethodWithBlockWithNoReturn [
^ 43
]

{ #category : #helpers }
SindarinDebuggerTest >> helperMethodWithEvaluatedBlock [

| a b block |
a := 1.
block := [ a := 2. b := 3 + 2 ].
block value.
^ 42

]

{ #category : #helpers }
SindarinDebuggerTest >> helperMethodWithSeveralInstructionsInBlock [

| a b block |
a := 3.
block := [
a := 1.
b := 2.
1 + 2 ].
b := block value.
^ 42
]

{ #category : #running }
SindarinDebuggerTest >> runCaseManaged [
^ self runCase
Expand Down Expand Up @@ -306,6 +330,62 @@ SindarinDebuggerTest >> testAssignmentVariableName [
self assert: scdbg assignmentVariableName equals: #a
]

{ #category : #tests }
SindarinDebuggerTest >> testCanStillExecuteWhenAimedNodePcIsAfterInAnyContext [

| sdbg aimedNodeInContext aimedNodeOutsideContext |
sdbg := SindarinDebugger debug: [
self helperMethodWithSeveralInstructionsInBlock ].
sdbg
step;
stepOver;
stepOver;
stepOver;
stepThrough;
stepOver.

aimedNodeInContext := sdbg methodNode body statements last.

self assert: sdbg pc
< (sdbg methodNode lastPcForNode: aimedNodeInContext).
self assert: (sdbg canStillExecute: aimedNodeInContext).

aimedNodeOutsideContext := sdbg node methodNode body statements last.

self assert: (sdbg outerMostContextOf: sdbg context) pc
< (sdbg node methodNode lastPcForNode:
aimedNodeOutsideContext).
self assert: (sdbg canStillExecute: aimedNodeOutsideContext)
]

{ #category : #tests }
SindarinDebuggerTest >> testCanStillExecuteWhenAimedNodePcIsBeforeInAnyContext [

| sdbg aimedNodeInContext aimedNodeOutsideContext |
sdbg := SindarinDebugger debug: [
self helperMethodWithSeveralInstructionsInBlock ].
sdbg
step;
stepOver;
stepOver;
stepOver;
stepThrough;
stepOver.

aimedNodeInContext := sdbg methodNode body statements first.

self deny: sdbg pc
< (sdbg methodNode lastPcForNode: aimedNodeInContext).
self deny: (sdbg canStillExecute: aimedNodeInContext).

aimedNodeOutsideContext := sdbg node methodNode body statements second.

self deny: (sdbg outerMostContextOf: sdbg context) pc
< (sdbg node methodNode lastPcForNode:
aimedNodeOutsideContext).
self deny: (sdbg canStillExecute: aimedNodeOutsideContext)
]

{ #category : #tests }
SindarinDebuggerTest >> testContext [
| scdbg |
Expand Down Expand Up @@ -606,6 +686,56 @@ SindarinDebuggerTest >> testSkipAssignmentWithStoreIntoBytecodePushesReplacement
self assert: a equals: aFormerValue
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipBlockNode [

| scdbg targetContext |
scdbg := SindarinDebugger debug: [ self helperMethodNonLocalReturn ].

scdbg
step;
step.

self assert: scdbg topStack isBlock.

scdbg stepUntil: [
scdbg node isMessage and: [ scdbg messageSelector = #value ] ].

targetContext := scdbg context sender.
scdbg stepOver.

self assert: scdbg context identicalTo: targetContext.
self assert: scdbg topStack equals: 42.

scdbg := SindarinDebugger debug: [ self helperMethodNonLocalReturn ].

scdbg
step;
skip.

self assert: scdbg topStack isNil.

scdbg stepUntil: [
scdbg node isMessage and: [ scdbg messageSelector = #value ] ].

targetContext := scdbg context.

scdbg stepOver.

self assert: scdbg context identicalTo: targetContext.
self assert: scdbg topStack equals: 43
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipDoesNotSkipReturn [

| a scdbg |
scdbg := SindarinDebugger debug: [ a := 1. ^ 42 ].

self shouldnt: [ scdbg skip ] raise: SindarinSkippingReturnWarning.
self should: [ scdbg skip ] raise: SindarinSkippingReturnWarning
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipSkipsMessagesByPuttingReceiverOnStack [

Expand Down Expand Up @@ -640,16 +770,6 @@ SindarinDebuggerTest >> testSkipSkipsSuperSendBytecodesCorrectly [
self assert: a equals: oldValueOfA
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipDoesNotSkipReturn [

| a scdbg |
scdbg := SindarinDebugger debug: [ a := 1. ^ 42 ].

self shouldnt: [ scdbg skip ] raise: SindarinSkippingReturnWarning.
self should: [ scdbg skip ] raise: SindarinSkippingReturnWarning
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipStepsMethodNodes [

Expand All @@ -676,46 +796,6 @@ SindarinDebuggerTest >> testSkipStepsMethodNodes [
self assert: scdbg topStack equals: realTopStack
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipBlockNode [

| scdbg targetContext |
scdbg := SindarinDebugger debug: [ self helperMethodNonLocalReturn ].

scdbg
step;
step.

self assert: scdbg topStack isBlock.

scdbg stepUntil: [
scdbg node isMessage and: [ scdbg messageSelector = #value ] ].

targetContext := scdbg context sender.
scdbg stepOver.

self assert: scdbg context identicalTo: targetContext.
self assert: scdbg topStack equals: 42.

scdbg := SindarinDebugger debug: [ self helperMethodNonLocalReturn ].

scdbg
step;
skip.

self assert: scdbg topStack isNil.

scdbg stepUntil: [
scdbg node isMessage and: [ scdbg messageSelector = #value ] ].

targetContext := scdbg context.

scdbg stepOver.

self assert: scdbg context identicalTo: targetContext.
self assert: scdbg topStack equals: 43
]

{ #category : #'tests - skipping' }
SindarinDebuggerTest >> testSkipThroughNode [
| dbg realExecPC realValueOfA targetExecNode realExecTopStack nodeAfterSkipThrough |
Expand Down Expand Up @@ -766,6 +846,45 @@ SindarinDebuggerTest >> testSkipToPC [
self assert: dbg topStack equals: realExecTopStack
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipToPcDoesNotLoopWhenAimedPcIsAfterEndPc [

| sdbg aimedPc pcBeforeSkip |
sdbg := SindarinDebugger debug: [
self helperMethodWithSeveralInstructionsInBlock ].
sdbg
step;
stepOver.

sdbg stepOver.
pcBeforeSkip := sdbg pc.
aimedPc := sdbg context endPC + 1.

sdbg skipToPC: aimedPc.

self assert: sdbg pc equals: sdbg context endPC.
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipToPcDoesNotLoopWhenAimedPcIsBeforeCurrentPc [

| sdbg aimedPc pcBeforeSkip |
sdbg := SindarinDebugger debug: [
self helperMethodWithSeveralInstructionsInBlock ].
sdbg
step;
stepOver.

aimedPc := sdbg pc.

sdbg stepOver.
pcBeforeSkip := sdbg pc.

sdbg skipToPC: aimedPc.

self assert: sdbg pc equals: pcBeforeSkip.
]

{ #category : #'tests - skipping' }
SindarinDebuggerTest >> testSkipUpToNode [
| dbg realExecPC realValueOfA realExecNode realExecTopStack |
Expand All @@ -789,8 +908,74 @@ SindarinDebuggerTest >> testSkipUpToNode [
self assert: dbg topStack equals: realExecTopStack
]

{ #category : #tests }
SindarinDebuggerTest >> testSkipUpToNodeDoesNotLoopWhenAimedNodeIsBeforeCurrentNode [

| sdbg aimedNode nodeBeforeSkip |
sdbg := SindarinDebugger debug: [
self helperMethodWithSeveralInstructionsInBlock ].
sdbg
step;
stepOver.

aimedNode := sdbg node.
sdbg stepOver.
nodeBeforeSkip := sdbg node.

sdbg skipUpToNode: aimedNode.

self assert: sdbg node identicalTo: nodeBeforeSkip
]

{ #category : #'tests - skipping' }
SindarinDebuggerTest >> testSkipUpToNodeInEvaluatedBlock [

| dbg realExecPC realExecNode realExecTopStack oldValueOfA valueOfBAfterSkipAndStep |
self skipOnPharoCITestingEnvironment.
dbg := SindarinDebugger debug: [ self helperMethodWithEvaluatedBlock ].
"after stepping, we stop at the beginning of the block"
dbg
step;
step;
stepOver;
stepOver;
stepOver;
stepThrough.
oldValueOfA := dbg temporaryNamed: #a.
"after stepping, we stop on b: = 3 + 2 assignment node"
dbg stepOver.

self assert: dbg node isMessage.
valueOfBAfterSkipAndStep := dbg node receiver value.

dbg stepOver.

realExecPC := dbg pc.
realExecNode := dbg node.
realExecTopStack := dbg topStack.

dbg := SindarinDebugger debug: [ self helperMethodWithEvaluatedBlock ].

dbg
step;
step;
stepOver;
stepOver;
stepOver;
stepThrough;
skipUpToNode: realExecNode.
self assert: dbg pc equals: realExecPC.
self assert: dbg node identicalTo: realExecNode.
self assert: (dbg temporaryNamed: #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
]

{ #category : #helpers }
SindarinDebuggerTest >> testSkipUpToNodeStopsOnImplicitReturn [
SindarinDebuggerTest >> testSkipUpToNodeStopsOnImplicitReturnIfAimedNodeCanStillBeExecuted [

| scdbg implicitReturnPc implicitReturnNode realExecPc realExecNode |
scdbg := SindarinDebugger debug: [
Expand Down Expand Up @@ -821,8 +1006,11 @@ SindarinDebuggerTest >> testSkipUpToNodeStopsOnImplicitReturn [
stepOver;
stepOver;
stepOver;
stepThrough;
skipUpToNode: realExecNode.
stepThrough.

self assert: (scdbg canStillExecute: realExecNode).

scdbg skipUpToNode: realExecNode.

self assert: scdbg pc equals: implicitReturnPc.
self assert: scdbg node identicalTo: implicitReturnNode
Expand Down
Loading