Changeset 9697

Timestamp:

12/14/09 10:11:18 (2 years ago)

Author:

szabgab

Message:

add step_out, step_over, show_stack_trace to debugger

Location:

trunk/Padre/lib/Padre

Files:

• Action/Run.pm (modified) (3 diffs)
• Wx/Main.pm (modified) (1 diff)
• Wx/Menu/Run.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Action/Run.pm

@@ -161 +161 @@
         need_runable => 1,
         need_file    => 1,
-        label        => Wx::gettext('Debugger Step In'),
+        label        => Wx::gettext('Step In'),
         comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
         #shortcut     => 'Shift-F5',
@@ -171 +171 @@
 
     Padre::Action->new(
+        name         => 'debug.step_over',
+        need_editor  => 1,
+        need_runable => 1,
+        need_file    => 1,
+        label        => Wx::gettext('Step Over'),
+        comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
+        #shortcut     => 'Shift-F5',
+        need_editor  => 1,
+        menu_event   => sub {
+            $_[0]->debug_perl_step_over;
+        },
+    );
+
+
+    Padre::Action->new(
+        name         => 'debug.step_out',
+        need_editor  => 1,
+        need_runable => 1,
+        need_file    => 1,
+        label        => Wx::gettext('Step Out'),
+        comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
+        #shortcut     => 'Shift-F5',
+        need_editor  => 1,
+        menu_event   => sub {
+            $_[0]->debug_perl_step_out;
+        },
+    );
+
+
+    Padre::Action->new(
+        name         => 'debug.show_stack_trace',
+        need_editor  => 1,
+        need_runable => 1,
+        need_file    => 1,
+        label        => Wx::gettext('Show Stack Trace'),
+        comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
+        #shortcut     => 'Shift-F5',
+        need_editor  => 1,
+        menu_event   => sub {
+            $_[0]->debug_perl_show_stack_trace;
+        },
+    );
+
+    Padre::Action->new(
         name         => 'debug.show_value',
         need_editor  => 1,
         need_runable => 1,
         need_file    => 1,
-        label        => Wx::gettext('Debugger Show Value'),
+        label        => Wx::gettext('Show Value'),
         comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
         #shortcut     => 'Shift-F5',
@@ -189 +233 @@
         need_runable => 1,
         need_file    => 1,
-        label        => Wx::gettext('Debugger Evaluate Expression'),
+        label        => Wx::gettext('Evaluate Expression'),
         comment      => Wx::gettext( 'Run the current document through the Debug::Client.' ),
         #shortcut     => 'Shift-F5',

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -1959 +1959 @@
 }
 
+sub debug_perl_step_over {
+    my $self     = shift;
+    return if not $self->{_debugger_};
+    
+    print scalar $self->{_debugger_}->step_over;
+
+    return;
+}
+
+sub debug_perl_step_out {
+    my $self     = shift;
+    return if not $self->{_debugger_};
+    
+    print scalar $self->{_debugger_}->step_out;
+
+    return;
+}
+
+
+sub debug_perl_show_stack_trace {
+    my $self     = shift;
+    return if not $self->{_debugger_};
+    
+    my ($prompt, $trace) = $self->{_debugger_}->get_stack_trace;
+    my $str = $trace;
+    if (ref($trace) and ref($trace) eq 'ARRAY') {
+        $str = join "\n", @$trace;
+    }
+    $self->message($str);
+
+    return; 
+}   
+
+
 sub debug_perl_show_value {
     my $self     = shift;

trunk/Padre/lib/Padre/Wx/Menu/Run.pm

@@ -67 +67 @@
         'debug.run_document',
     );
+
     $self->{debug_step_in} = $self->add_menu_action(
         $self,
@@ -72 +73 @@
     );
 
-    $self->{debug_step_in} = $self->add_menu_action(
+    $self->{debug_step_over} = $self->add_menu_action(
+        $self,
+        'debug.step_over',
+    );
+
+    $self->{debug_step_out} = $self->add_menu_action(
+        $self,
+        'debug.step_out',
+    );
+
+    $self->{debug_show_stack_trace} = $self->add_menu_action(
+        $self,
+        'debug.show_stack_trace',
+    );
+
+    $self->{debug_show_value} = $self->add_menu_action(
         $self,
         'debug.show_value',
     );
 
-    $self->{debug_step_in} = $self->add_menu_action(
+    $self->{debug_evaluate_expression} = $self->add_menu_action(
         $self,
         'debug.evaluate_expression',