5.2: Avoid pollution with global variables (Trepan-Debuggers#40)

jansorg · web-flow · commit f5e83cc9ee08 · 2024-10-08T12:22:46.000-04:00
* Avoid pollution with global variables in info commands

* Don't pollute with global variable int_pat
This is a global search &amp; replace

* Don't pollute with global variable _resteglob
This is a global search &amp; replace

* Don't pollute with global variable _seteglob
This is a global search &amp; replace
diff --git a/command/break.sh b/command/break.sh
@@ -150,10 +150,10 @@ _Dbg_do_clear_brkpt() {
 # If $1 is given just list those associated for that line.
 _Dbg_do_list_brkpt() {
 
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     if (( $# != 0  )) ; then
 	typeset brkpt_num="$1"
-	if [[ $brkpt_num != $int_pat ]]; then
+	if [[ $brkpt_num != $_Dbg_int_pat ]]; then
 	    _Dbg_errmsg "Bad breakpoint number $brkpt_num."
 	elif [[ -z "${_Dbg_brkpt_file[$brkpt_num]}" ]] ; then
 	    _Dbg_errmsg "Breakpoint entry $brkpt_num is not set."
@@ -171,7 +171,7 @@ _Dbg_do_list_brkpt() {
 	    fi
 	    _Dbg_print_brkpt_count ${_Dbg_brkpt_count[$i]}
 	fi
-	eval "$_resteglob"
+	eval "$_Dbg_resteglob"
 	return 0
     elif (( ${#_Dbg_brkpt_line[@]} != 0 )); then
 	typeset -i i
diff --git a/command/commands.sh b/command/commands.sh
@@ -31,11 +31,11 @@ Type a line containing "end" to indicate the end of them.  Give
 output is printed when it is hit, except what the commands print.'
 
 _Dbg_do_commands() {
-  eval "$_seteglob"
+  eval "$_Dbg_seteglob"
   typeset num=$1
   typeset -i found=0
   case $num in
-      $int_pat )
+      $_Dbg_int_pat )
 	  if [[ -z "${_Dbg_brkpt_file[$num]}" ]] ; then
 	      _Dbg_errmsg "No breakpoint number $num."
 	      return 1
@@ -45,7 +45,7 @@ _Dbg_do_commands() {
       * )
 	_Dbg_errmsg "Invalid entry number skipped: $num"
   esac
-  eval "$_resteglob"
+  eval "$_Dbg_resteglob"
   if (( found )) ; then 
       _Dbg_brkpt_commands_defining=1
       _Dbg_brkpt_commands_current=$num
diff --git a/command/condition.sh b/command/condition.sh
@@ -52,13 +52,13 @@ function _Dbg_do_condition {
   typeset -r n=$1
   shift
 
-  eval "$_seteglob"
-  if [[ $n != $int_pat ]]; then
-    eval "$_resteglob"
+  eval "$_Dbg_seteglob"
+  if [[ $n != $_Dbg_int_pat ]]; then
+    eval "$_Dbg_resteglob"
     _Dbg_errmsg "condition: Bad breakpoint number: $n"
     return 2
   fi
-  eval "$_resteglob"
+  eval "$_Dbg_resteglob"
 
   if [[ -z "${_Dbg_brkpt_file[$n]}" ]] ; then
     _Dbg_msg "condition: Breakpoint entry $n is not set. Condition not changed."
diff --git a/command/debug.sh b/command/debug.sh
@@ -48,7 +48,7 @@ _Dbg_do_debug() {
 
     [[ -z $BASH ]] && BASH='bash'
 
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     # Add appropriate bash debugging options
     if (( ! _Dbg_script )) ; then
 	# Running "bash --debugger", so prepend "bash --debugger"
@@ -57,7 +57,7 @@ _Dbg_do_debug() {
 	# Running "bashdb", so prepend "bash bashdb .."
 	set_Dbg_debug_cmd="typeset _Dbg_debug_cmd=\"$BASH $_Dbg_orig_0 -q -L $_Dbg_libdir $script_cmd\"";
     fi
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     eval $set_Dbg_debug_cmd
 
     if (( _Dbg_set_basename )) ; then
diff --git a/command/delete.sh b/command/delete.sh
@@ -48,13 +48,13 @@ _Dbg_do_delete() {
       fi
   fi
 
-  eval "$_seteglob"
+  eval "$_Dbg_seteglob"
   for del in $to_go ; do
     case $del in
       $_Dbg_watch_pat )
           _Dbg_delete_watch_entry ${del:0:${#del}-1}
           ;;
-      $int_pat )
+      $_Dbg_int_pat )
           if _Dbg_delete_brkpt_entry $del ; then
 	      _Dbg_msg "Deleted breakpoint ${del}"
 	      ((tot_found++))
@@ -64,7 +64,7 @@ _Dbg_do_delete() {
         _Dbg_errmsg "Invalid entry number skipped: $del"
     esac
   done
-  eval "$_resteglob"
+  eval "$_Dbg_resteglob"
   return $tot_found
 }
 
diff --git a/command/handle.sh b/command/handle.sh
@@ -46,7 +46,7 @@ _Dbg_do_handle() {
     return 1
     fi
 
-    if [[ $sig == $int_pat ]]; then
+    if [[ $sig == $_Dbg_int_pat ]]; then
 	signame=$(_Dbg_signum2name $sig)
 	if (( $? != 0 )) ; then
 	    _Dbg_errmsg "Bad signal number: $sig"
diff --git a/command/history.sh b/command/history.sh
@@ -52,13 +52,13 @@ _Dbg_do_history() {
 # $2 is where to stop or 0 if not given.
 _Dbg_do_history_list() {
 
-  eval "$_seteglob"
-  if [[ $1 != $int_pat ]] && [[ $1 != -$int_pat ]] && [[ -n $1 ]] ; then
+  eval "$_Dbg_seteglob"
+  if [[ $1 != $_Dbg_int_pat ]] && [[ $1 != -$_Dbg_int_pat ]] && [[ -n $1 ]] ; then
     _Dbg_msg "Invalid history number: $1"
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     return 1
   fi
-  eval "$_resteglob"
+  eval "$_Dbg_resteglob"
 
   _Dbg_hi=${#_Dbg_history[@]}
   local -i n=${1:-$_Dbg_hi-1}
diff --git a/command/info.sh b/command/info.sh
@@ -36,32 +36,32 @@ _Dbg_complete_info() {
 _Dbg_do_info() {
 
   if (($# > 0)) ; then
-      typeset subcmd=$1
+      typeset _Dbg_subcmd=$1
       shift
 
-      typeset -i found=0
+      typeset -i _Dbg_found=0
 
-      if [[ -n ${_Dbg_debugger_info_commands[$subcmd]} ]] ; then
-          ${_Dbg_debugger_info_commands[$subcmd]} "$@"
+      if [[ -n ${_Dbg_debugger_info_commands[$_Dbg_subcmd]} ]] ; then
+          ${_Dbg_debugger_info_commands[$_Dbg_subcmd]} "$@"
           return $?
       else
           # Look for a unique abbreviation
-          typeset -i count=0
-          typeset list; list="${!_Dbg_debugger_info_commands[@]}"
-          for try in $list ; do
-              if [[ $try =~ ^$subcmd ]] ; then
-                  subcmd=$try
-                  ((count++))
+          typeset -i _Dbg_count=0
+          typeset _Dbg_list; _Dbg_list="${!_Dbg_debugger_info_commands[@]}"
+          for _Dbg_try in $_Dbg_list ; do
+              if [[ $_Dbg_try =~ ^$_Dbg_subcmd ]] ; then
+                  _Dbg_subcmd="$_Dbg_try"
+                  ((_Dbg_count++))
               fi
           done
-          ((found=(count==1)))
+          ((_Dbg_found=(_Dbg_count==1)))
       fi
-      if ((found)); then
-          ${_Dbg_debugger_info_commands[$subcmd]} "$@"
+      if ((_Dbg_found)); then
+          ${_Dbg_debugger_info_commands[$_Dbg_subcmd]} "$@"
           return $?
       fi
 
-      _Dbg_errmsg "Unknown info subcommand: $subcmd"
+      _Dbg_errmsg "Unknown info subcommand: $_Dbg_subcmd"
       msg=_Dbg_errmsg
   else
       msg=_Dbg_msg
diff --git a/command/info_sub/args.sh b/command/info_sub/args.sh
@@ -46,10 +46,10 @@ _Dbg_do_info_args() {
 
     typeset -r frame_start=${1:-0}
 
-    eval "$_seteglob"
-    if [[ $frame_start != $int_pat ]] ; then
+    eval "$_Dbg_seteglob"
+    if [[ $frame_start != $_Dbg_int_pat ]] ; then
 	_Dbg_errmsg "Bad integer parameter: $frame_start"
-	eval "$_resteglob"
+	eval "$_Dbg_resteglob"
 	return 1
     fi
 
diff --git a/command/search.sh b/command/search.sh
@@ -46,15 +46,15 @@ _Dbg_do_reverse() {
   typeset -i i
   for (( i=_Dbg_listline-1; i > 0 ; i-- )) ; do
     _Dbg_get_source_line $i "$_Dbg_frame_last_filename"
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     if [[ $_Dbg_source_line == *$_Dbg_last_search_pat* ]] ; then
-      eval "$_resteglob"
+      eval "$_Dbg_resteglob"
       _Dbg_do_list $i 1
       _Dbg_listline=$i
       _Dbg_last_cmd='search'
       return 0
     fi
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
   done
   _Dbg_msg "search pattern: $_Dbg_last_search_pat not found."
   return 1
@@ -91,15 +91,15 @@ _Dbg_do_search() {
   typeset -i i
   for (( i=_Dbg_listline+1; i < max_line ; i++ )) ; do
     _Dbg_get_source_line $i "$_Dbg_frame_last_filename"
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     if [[ $_Dbg_source_line == *$_Dbg_last_search_pat* ]] ; then
-      eval "$_resteglob"
+      eval "$_Dbg_resteglob"
       _Dbg_do_list $i 1
       _Dbg_listline=$i
       # _Dbg_last_cmd='/'
       return 0
     fi
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
   done
   _Dbg_errmsg "search pattern: $_Dbg_last_search_pat not found."
   return 1
diff --git a/command/set_sub/annotate.sh b/command/set_sub/annotate.sh
@@ -34,20 +34,20 @@ See also:
 ' 1
 
 _Dbg_do_set_annotate() {
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     if (( $# != 1 )) ; then
 	_Dbg_msg "A single argument is required (got $# arguments)."
-    elif [[ $1 == $int_pat ]] ; then
+    elif [[ $1 == $_Dbg_int_pat ]] ; then
 	if (( $1 > 3 )) ; then
 	    _Dbg_msg "Annotation level must be between 0 and 3. Got: ${1}."
 	else
 	    _Dbg_write_journal_eval "_Dbg_set_annotate=$1"
 	fi
     else
-	eval "$_resteglob"
+	eval "$_Dbg_resteglob"
 	_Dbg_msg "Integer argument expected; got: $1"
 	return 1
     fi
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     return 0
 }
diff --git a/command/set_sub/history.sh b/command/set_sub/history.sh
@@ -56,15 +56,15 @@ _Dbg_do_set_history() {
             esac
             ;;
         si | siz | size )
-            eval "$_seteglob"
+            eval "$_Dbg_seteglob"
             if [[ -z $2 ]] ; then
                 _Dbg_errmsg "Argument required (integer to set it to.)."
-            elif [[ $2 != $int_pat ]] ; then
+            elif [[ $2 != $_Dbg_int_pat ]] ; then
                 _Dbg_errmsg "Integer argument expected; got: $2"
-                eval "$_resteglob"
+                eval "$_Dbg_resteglob"
                 return 1
             fi
-            eval "$_resteglob"
+            eval "$_Dbg_resteglob"
             _Dbg_write_journal_eval "_Dbg_history_length=$2"
             ;;
         *)
diff --git a/command/set_sub/linetrace.sh b/command/set_sub/linetrace.sh
@@ -47,13 +47,13 @@ _Dbg_do_set_linetrace() {
 	    _Dbg_write_journal_eval "_Dbg_set_linetrace=0"
 	    ;;
 	d | de | del | dela | delay )
-	    eval "$_seteglob"
-	    if [[ $2 != $int_pat ]] ; then
+	    eval "$_Dbg_seteglob"
+	    if [[ $2 != $_Dbg_int_pat ]] ; then
 		_Dbg_msg "Bad int parameter: $2"
-		eval "$_resteglob"
+		eval "$_Dbg_resteglob"
 		return 1
 	    fi
-	    eval "$_resteglob"
+	    eval "$_Dbg_resteglob"
 	    _Dbg_write_journal_eval "_Dbg_linetrace_delay=$2"
 	    ;;
 	e | ex | exp | expa | expan | expand )
diff --git a/command/set_sub/listsize.sh b/command/set_sub/listsize.sh
@@ -41,14 +41,14 @@ See also:
 typeset -xi _Dbg_set_listsize=10
 
 _Dbg_do_set_listsize() {
-    eval "$_seteglob"
-    if [[ $1 == $int_pat ]] ; then
+    eval "$_Dbg_seteglob"
+    if [[ $1 == $_Dbg_int_pat ]] ; then
 	_Dbg_write_journal_eval "_Dbg_set_listsize=$1"
     else
-	eval "$_resteglob"
+	eval "$_Dbg_resteglob"
 	_Dbg_errmsg "Integer argument expected; got: $1"
 	return 1
     fi
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     return 0
 }
diff --git a/command/set_sub/width.sh b/command/set_sub/width.sh
@@ -35,7 +35,7 @@ Set maximum width of lines to *width*.
 typeset -i _Dbg_set_linewidth; _Dbg_set_linewidth=${COLUMNS:-80}
 
 _Dbg_do_set_width() {
-    if [[ $1 == $int_pat ]] ; then
+    if [[ $1 == $_Dbg_int_pat ]] ; then
 	_Dbg_write_journal_eval "_Dbg_set_linewidth=$1"
     else
 	_Dbg_errmsg "Integer argument expected; got: $1"
diff --git a/command/show_sub/commands.sh b/command/show_sub/commands.sh
@@ -36,18 +36,18 @@ _Dbg_do_show_commands() {
     if ((default_hi_start < 0)) ; then default_hi_start=0 ; fi
     typeset hi_start=${2:-$default_hi_start}
     
-    eval "$_seteglob"
+    eval "$_Dbg_seteglob"
     case $hi_start in
 	"+" )
 	    ((hi_start=_Dbg_hi_last_stop-1))
 	    ;;
-	$int_pat | -$int_pat)
+	$_Dbg_int_pat | -$_Dbg_int_pat)
             :
             ;;
 	* )
 	_Dbg_msg "Invalid parameter $hi_start. Need an integer or '+'"
     esac
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     
     typeset -i hi_stop=hi_start-10
     _Dbg_do_history_list $hi_start $hi_stop
diff --git a/command/signal.sh b/command/signal.sh
@@ -40,17 +40,17 @@ _Dbg_do_signal() {
     return 1
   fi
 
-  eval "$_seteglob"
-  if [[ $sig == $int_pat ]]; then
-    eval "$_resteglob"
+  eval "$_Dbg_seteglob"
+  if [[ $sig == $_Dbg_int_pat ]]; then
+    eval "$_Dbg_resteglob"
     signame=$(_Dbg_signum2name $sig)
     if (( $? != 0 )) ; then
       _Dbg_msg "Bad signal number: $sig"
       return 1
     fi
     signum=sig
   else
-    eval "$_resteglob"
+    eval "$_Dbg_resteglob"
     typeset signum;
     signum=$(_Dbg_name2signum $sig)
     if (( $? != 0 )) ; then
diff --git a/init/vars.sh b/init/vars.sh
@@ -47,10 +47,10 @@ typeset _Dbg_last_printe=''    # expression on last print expression command
 
 # strings to save and restore the setting of `extglob' in debugger functions
 # that need it
-typeset _seteglob='local __eopt=-u ; shopt -q extglob && __eopt=-s ; shopt -s extglob'
-typeset _resteglob='shopt $__eopt extglob'
+typeset _Dbg_seteglob='local __eopt=-u ; shopt -q extglob && __eopt=-s ; shopt -s extglob'
+typeset _Dbg_resteglob='shopt $__eopt extglob'
 
-typeset int_pat='[0-9]*([0-9])'
+typeset _Dbg_int_pat='[0-9]*([0-9])'
 typeset _Dbg_signed_int_pat='?([-+])+([0-9])'
 
 # Set tty to use for output.
diff --git a/lib/break.sh b/lib/break.sh
diff --git a/lib/display.sh b/lib/display.sh
diff --git a/lib/fns.sh b/lib/fns.sh
diff --git a/lib/frame.sh b/lib/frame.sh
diff --git a/lib/help.sh b/lib/help.sh
diff --git a/lib/hist.sh b/lib/hist.sh
diff --git a/lib/validate.sh b/lib/validate.sh
diff --git a/test/unit/test-fns.sh.in b/test/unit/test-fns.sh.in
