Skip to content

39 skip doesnt skip method nodes #41

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
StevenCostiou merged 5 commits into from
Jul 26, 2022
Merged

39 skip doesnt skip method nodes #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
566f4ca
fixing skip so that it steps method nodes
adri09070 Jul 6, 2022
98f20a3
fixing skip so that it steps method nodes
adri09070 Jul 6, 2022
fc79f10
adding helper I forgot to commit for tests
adri09070 Jul 8, 2022
b38a02f
classifying method
adri09070 Jul 8, 2022
286c47e
Merge branch 'master' into 39-Skip-doesnt-skip-method-nodes
adri09070 Jul 19, 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
26 changes: 26 additions & 0 deletions Sindarin-Tests/SindarinDebuggerTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,32 @@ SindarinDebuggerTest >> testSkipDoesNotSkipReturn [
self should: [ scdbg skip ] raise: SindarinSkippingReturnWarning
]

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

| scdbg realExecNode realExecPc realTopStack |
scdbg := SindarinDebugger debug: [
self helperMethodWithBlockWithNoReturn ].

scdbg step.
scdbg stepOver.

realExecNode := scdbg node.
realExecPc := scdbg pc.
realTopStack := scdbg topStack.

scdbg := SindarinDebugger debug: [
self helperMethodWithBlockWithNoReturn ].

scdbg
step;
skip.

self assert: scdbg node identicalTo: realExecNode.
self assert: scdbg pc identicalTo: realExecPc.
self assert: scdbg topStack equals: realTopStack
]

{ #category : #'tests - skipping' }
SindarinDebuggerTest >> testSkipThroughNode [
| dbg realExecPC realValueOfA targetExecNode realExecTopStack nodeAfterSkipThrough |
Expand Down
3 changes: 2 additions & 1 deletion Sindarin/SindarinDebugger.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,11 +531,12 @@ SindarinDebugger >> sindarinSession: aSindarinDebugSession [

{ #category : #'stepping - skip' }
SindarinDebugger >> skip [

| nextBytecode |
"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 isMessage ifTrue: [ ^ self skipMessageNode ].
self node isMethod ifTrue: [ ^ self step ].
nextBytecode := self currentBytecode detect: [ :each |
each offset = self pc ].
(self node isReturn or: [
Expand Down