@@ -1,5 +1,5 @@ # -*- shell-script -*- -# Copyright (C) 2008 Rocky Bernstein rocky@gnu.org +# Copyright (C) 2008, 2009 Rocky Bernstein rocky@gnu.org # # zshdb is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -44,6 +44,12 @@ if [[ -z $_Dbg_o_nx && -r $_Dbg_startup_cmdfile ]] ; then _Dbg_do_source $_Dbg_startup_cmdfile fi +# _Dbg_DEBUGGER_LEVEL is the number of times we are nested inside a debugger +# by virtue of running "debug" for example. +if [[ -z "${_Dbg_DEBUGGER_LEVEL}" ]] ; then + typeset -ix _Dbg_DEBUGGER_LEVEL=1 +fi + if ((Dbg_history_save)) ; then history -ap "$_Dbg_histfile" fi dbg-main.sh @@ -61,10 +61,18 @@ function _Dbg_process_commands { while (( ${#_Dbg_fd[@]} > 0 )) ; do _Dbg_fdi=${_Dbg_fd[-1]} - # Set up prompt to show shell and subshell levels. - typeset _Dbg_greater='>' - typeset _Dbg_less='<' + # Set up prompt to show shell and subshell levels. + typeset _Dbg_greater='' + typeset _Dbg_less='' + typeset result # Used by copies to return a value. + + if _Dbg_copies '>' $_Dbg_DEBUGGER_LEVEL ; then + _Dbg_greater=$result + _Dbg_copies '<' $_Dbg_DEBUGGER_LEVEL + _Dbg_less=$result + fi + if _Dbg_copies ')' $ZSH_SUBSHELL ; then _Dbg_greater="${result}${_Dbg_greater}" _Dbg_less="${_Dbg_less}${result//)/(}" lib/processor.sh 2a0bc9e820c525e68fc8f46fcdf2fdc000fc59d4 rocky rocky@sanchez.(none) http://github.com/rocky/zshdb/commit/b5ab94e920dd9a665ef9bf0d2a6fc7a8174a5bd0 b5ab94e920dd9a665ef9bf0d2a6fc7a8174a5bd0 2009-06-18T23:40:42-07:00 2009-06-18T23:40:42-07:00 Add _Dbg_DEBUGGER_LEVEL in advance of "debug" command. 9d6682835f7366a50a0fe3d4ff03475db21d5fde rocky rocky@sanchez.(none)