Make step honor "set different" setting...

Go over "set different" RsT doc

Author: rocky

command/set_sub/different.sh

@@ -21,7 +21,17 @@
 _Dbg_help_add_sub set different \
 '**set different** [**off**|**on**]
 
-Set to stop at a different line
+Set consecutive stops must be on different file/line positions.
+If no argument is given, different is set "off".
+
+One of the challenges of debugging is getting the granualarity of
+stepping comfortable. By setting different "on" you can set a more
+coarse-level of stepping which often still is small enough that you
+will not miss anything important.
+
+Note that the **step** and **next** debugger commands have **+** and
+**-** suffixes if you wan to override this setting on a per-command
+basis.
 
 See also:
 ---------

command/step.sh

@@ -94,11 +94,11 @@ _Dbg_do_step() {
   esac
 
   if [[ $count == [0-9]* ]] ; then
-    _Dbg_step_ignore=${count:-1}
+      _Dbg_step_ignore=${count:-1}
   else
-    _Dbg_errmsg "Argument ($count) should be a number or nothing."
-    _Dbg_step_ignore=-1
-    return 0
+      _Dbg_errmsg "Argument ($count) should be a number or nothing."
+      _Dbg_step_ignore=-1
+      return 0
   fi
 
   _Dbg_write_journal_eval "_Dbg_return_level=-1"

docs/commands/set/different.rst

@@ -7,19 +7,12 @@ Set Different (consecutive stops on different file/line positions)
 **set different** [ **on** | **off** ]
 
 Set consecutive stops must be on different file/line positions.
-
-By default, the debugger traces all events possible including line,
-exceptions, call and return events. Just this alone may mean that for
-any given source line several consecutive stops at a given line may
-occur. Independent of this, ksh allows one to put several commands in
-a single source line of code. When a programmer does this, it might be
-because the programmer thinks of the line as one unit.
+If no argument is given, different is set "off".
 
 One of the challenges of debugging is getting the granualarity of
-stepping comfortable. Because of the above, stepping all events can
-often be too fine-grained and annoying. By setting different on you can
-set a more coarse-level of stepping which often still is small enough
-that you won't miss anything important.
+stepping comfortable. By setting different "on" you can set a more
+coarse-level of stepping which often still is small enough that you
+won't miss anything important.
 
 Note that the `step` and `next` debugger commands have '+' and '-'
 suffixes if you wan to override this setting on a per-command basis.

lib/hook.sh

@@ -83,16 +83,6 @@ function _Dbg_trap_handler {
 	     .sh.level > _Dbg_return_level) ))
     # echo "${#funcfiletrace[@]} vs $_Dbg_return_level ; $_Dbg_skipping_fn"
 
-    # if in step mode, decrement counter
-    if ((_Dbg_step_ignore > 0)) ; then
-	if ((! _Dbg_skipping_fn )) ; then
-	    ((_Dbg_step_ignore--))
-	    _Dbg_write_journal "_Dbg_step_ignore=$_Dbg_step_ignore"
-	    # Can't return here because we may want to stop for another
-	    # reason.
-	fi
-    fi
-
     if ((_Dbg_skip_ignore > 0)) ; then
 	if ((! _Dbg_skipping_fn )) ; then
 	    ((_Dbg_skip_ignore--))
@@ -126,7 +116,7 @@ function _Dbg_trap_handler {
     fi
 
     # Check if step mode and number of steps to ignore.
-    if ((_Dbg_step_ignore == 0 && ! _Dbg_skipping_fn )); then
+    if ((_Dbg_step_ignore >= 0 && ! _Dbg_skipping_fn )); then
 
 	if ((_Dbg_step_force)) ; then
 	    typeset _Dbg_frame_previous_file="$_Dbg_frame_last_file"
@@ -137,6 +127,11 @@ function _Dbg_trap_handler {
 		_Dbg_set_to_return_from_debugger 1
 		return $_Dbg_rc
 	    fi
+	fi
+	((_Dbg_step_ignore--))
+	_Dbg_write_journal "_Dbg_step_ignore=$_Dbg_step_ignore"
+	if ((_Dbg_step_ignore > 0 )); then
+	    return $_Dbg_rc
 	else
 	    _Dbg_frame_save_frames 1
 	fi