>From 6b157cd2d933950089ef52b02b8f278967403af4 Mon Sep 17 00:00:00 2001 From: Gwenael Casaccio Date: Wed, 4 Sep 2013 14:36:09 +0200 Subject: [PATCH] Remove Debugger extensions The code and logic behind those extensions are not good enough and worst not correct. For now GtkDebugger will rely on the Debugger logic and nothing else. --- packages/visualgst/ChangeLog | 5 ++++ packages/visualgst/Debugger/GtkDebugger.st | 13 +++------- packages/visualgst/Extensions.st | 39 ------------------------------ 3 files changed, 9 insertions(+), 48 deletions(-) diff --git a/packages/visualgst/ChangeLog b/packages/visualgst/ChangeLog index 0a24b05..c18725d 100644 --- a/packages/visualgst/ChangeLog +++ b/packages/visualgst/ChangeLog @@ -1,3 +1,8 @@ +2013-06-18 Gwenael Casaccio + + * Debugger/GtkDebugger.st: Don't use previous debugger extensions. + * Extensions.st: Remove the debugger extension. + 2013-06-18 Gwenael Casaccio * Debugger/Extensions.st: Added. diff --git a/packages/visualgst/Debugger/GtkDebugger.st b/packages/visualgst/Debugger/GtkDebugger.st index 5902491..f92dda2 100644 --- a/packages/visualgst/Debugger/GtkDebugger.st +++ b/packages/visualgst/Debugger/GtkDebugger.st @@ -225,8 +225,7 @@ GtkBrowsingTool subclass: GtkDebugger [ self initializeProcess: aProcess. - 3 timesRepeat: [ debugger step ]. - debugger myStepInto. + 4 timesRepeat: [ debugger step ]. self updateContextWidget ] @@ -276,25 +275,21 @@ GtkBrowsingTool subclass: GtkDebugger [ step [ - contextWidget isLastContextSelected - ifTrue: [ debugger myStep ] - ifFalse: [ debugger finish: contextWidget selectedContext ]. + debugger step. self updateContextWidget ] stepInto [ - contextWidget isLastContextSelected - ifTrue: [ debugger myStepInto ] - ifFalse: [ debugger finish: contextWidget selectedContext ]. + debugger step. self updateContextWidget ] stepOver [ - debugger step. + debugger finish. self updateContextWidget ] diff --git a/packages/visualgst/Extensions.st b/packages/visualgst/Extensions.st index 6821346..4153dd1 100644 --- a/packages/visualgst/Extensions.st +++ b/packages/visualgst/Extensions.st @@ -379,45 +379,6 @@ ContextPart extend [ ] ] -Debugger extend [ - - receiver [ - - - ^ self suspendedContext receiver - ] - - myStepInto [ - "Run to the end of the current line in the inferior process or to the - next message send." - - "TODO: Stop when affectation (get the current bytecode)" - - | context | - context := self suspendedContext. - - [ self stepBytecode. - self suspendedContext == context ] - whileTrue - ] - - myStep [ - "Run to the end of the current line in the inferior process, skipping - over message sends." - - "TODO: Stop when affectation (get the current bytecode)" - - | context | - context := self suspendedContext. - - [ self stepBytecode. - (self suspendedContext notNil and: [ self suspendedContext parentContext == context ]) - ifTrue: [ self finish: self suspendedContext. ^ self ]. - self suspendedContext == context ] - whileTrue - ] -] - VariableBinding extend [ hasLiterals [ -- 1.8.1.2