mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 17:18:55 +00:00
[gdb/contrib] Handle dot in spellcheck.sh
Add handling of '.' in gdb/contrib/spellcheck.sh. While we're at, simplify the sed invocation by using a single s command instead of 3 s commands. Also introduce sed_join and grep_join. Fix the following common misspellings: ... bandwith -> bandwidth emmitted -> emitted immediatly -> immediately suprize -> surprise thru -> through transfered -> transferred ... Verified with shellcheck.
This commit is contained in:
@@ -73,8 +73,20 @@ join ()
|
||||
|
||||
grep_or="|"
|
||||
sed_or="\|"
|
||||
grep_separator=$(join $grep_or "${grep_separators[@]}")
|
||||
sed_separator=$(join $sed_or "${sed_separators[@]}")
|
||||
|
||||
grep_join ()
|
||||
{
|
||||
local res
|
||||
res=$(join $grep_or "$@")
|
||||
echo "($res)"
|
||||
}
|
||||
|
||||
sed_join ()
|
||||
{
|
||||
local res
|
||||
res=$(join $sed_or "$@")
|
||||
echo "\($res\)"
|
||||
}
|
||||
|
||||
usage ()
|
||||
{
|
||||
@@ -201,26 +213,24 @@ find_files_matching_words ()
|
||||
local patfile
|
||||
patfile="$cache_dir/$cache_file2".$cache_id
|
||||
|
||||
local pat
|
||||
if [ -f "$patfile" ]; then
|
||||
pat=$(cat "$patfile")
|
||||
else
|
||||
rm -f "$cache_dir/$cache_file2".*
|
||||
|
||||
local pat
|
||||
pat=""
|
||||
for word in "${words[@]}"; do
|
||||
if [ "$pat" = "" ]; then
|
||||
pat="$word"
|
||||
else
|
||||
pat="$pat|$word"
|
||||
fi
|
||||
done
|
||||
pat="($pat)"
|
||||
pat=$(grep_join "${words[@]}")
|
||||
|
||||
local sep
|
||||
sep=$grep_separator
|
||||
local before after
|
||||
before=$(grep_join \
|
||||
"^" \
|
||||
"${grep_separators[@]}")
|
||||
after=$(grep_join \
|
||||
"${grep_separators[@]}" \
|
||||
"\." \
|
||||
"$")
|
||||
|
||||
pat="(^|$sep)$pat($sep|$)"
|
||||
pat="$before$pat$after"
|
||||
|
||||
echo "$pat" \
|
||||
> "$patfile"
|
||||
@@ -238,10 +248,16 @@ find_files_matching_word ()
|
||||
pat="$1"
|
||||
shift
|
||||
|
||||
local sep
|
||||
sep=$grep_separator
|
||||
local before after
|
||||
before=$(grep_join \
|
||||
"^" \
|
||||
"${grep_separators[@]}")
|
||||
after=$(grep_join \
|
||||
"${grep_separators[@]}" \
|
||||
"\." \
|
||||
"$")
|
||||
|
||||
pat="(^|$sep)$pat($sep|$)"
|
||||
pat="$before$pat$after"
|
||||
|
||||
grep -E \
|
||||
-l \
|
||||
@@ -260,22 +276,20 @@ replace_word_in_file ()
|
||||
local file
|
||||
file="$3"
|
||||
|
||||
local sep
|
||||
sep=$sed_separator
|
||||
local before after
|
||||
before=$(sed_join \
|
||||
"^" \
|
||||
"${sed_separators[@]}")
|
||||
after=$(sed_join \
|
||||
"${sed_separators[@]}" \
|
||||
"\." \
|
||||
"$")
|
||||
|
||||
# Save separator.
|
||||
sep="\($sep\)"
|
||||
|
||||
local repl1 repl2 repl3
|
||||
|
||||
repl1="s%$sep$word$sep%\1$replacement\2%g"
|
||||
|
||||
repl2="s%^$word$sep%$replacement\1%"
|
||||
|
||||
repl3="s%$sep$word$%\1$replacement%"
|
||||
local repl
|
||||
repl="s%$before$word$after%\1$replacement\2%g"
|
||||
|
||||
sed -i \
|
||||
"$repl1;$repl2;$repl3" \
|
||||
"$repl" \
|
||||
"$file"
|
||||
}
|
||||
|
||||
|
||||
@@ -9501,7 +9501,7 @@ remote_target::remote_write_bytes_aux (const char *header, CORE_ADDR memaddr,
|
||||
strcat (rs->buf.data (), header);
|
||||
p = rs->buf.data () + strlen (header);
|
||||
|
||||
/* Compute a best guess of the number of bytes actually transfered. */
|
||||
/* Compute a best guess of the number of bytes actually transferred. */
|
||||
if (packet_format == 'X')
|
||||
{
|
||||
/* Best guess at number of bytes that will fit. */
|
||||
|
||||
@@ -25,7 +25,7 @@ require isnative
|
||||
# Can the system run this test (in particular support sparse
|
||||
# corefiles)? On systems that lack sparse corefile support this test
|
||||
# consumes too many resources - gigabytes worth of disk space and
|
||||
# I/O bandwith.
|
||||
# I/O bandwidth.
|
||||
|
||||
if { [istarget "*-*-*bsd*"]
|
||||
|| [istarget "*-*-solaris*"]
|
||||
|
||||
@@ -286,7 +286,7 @@ proc test_scalar_returns { } {
|
||||
}
|
||||
-re ".*${gdb_prompt} $" {
|
||||
if $return_value_unimplemented {
|
||||
# What a suprize. The architecture hasn't implemented
|
||||
# What a surprise. The architecture hasn't implemented
|
||||
# return_value, and hence has to fail.
|
||||
kfail "$test" gdb/1444
|
||||
} else {
|
||||
|
||||
@@ -376,7 +376,7 @@ proc test_struct_returns { n } {
|
||||
}
|
||||
-re ".*${gdb_prompt} $" {
|
||||
if $return_value_unimplemented {
|
||||
# What a suprize. The architecture hasn't implemented
|
||||
# What a surprise. The architecture hasn't implemented
|
||||
# return_value, and hence has to fail.
|
||||
kfail "$test" gdb/1444
|
||||
} else {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
# This test triggers the "separate debug info file has no debug info" warning by replacing
|
||||
# the build-id based .debug file with the stripped binary and then loading it to gdb.
|
||||
# It then also sets up local debuginfod server with the correct debug file to download
|
||||
# to make sure no warnings are emmitted.
|
||||
# to make sure no warnings are emitted.
|
||||
|
||||
|
||||
standard_testfile
|
||||
|
||||
@@ -44,11 +44,11 @@ mi_gdb_test "-var-create var_c * C" \
|
||||
|
||||
mi_gdb_test "-var-assign var_c 5" \
|
||||
"-var-assign var_c 5\r\n\\^done,value=\"5\"" \
|
||||
"change C thru. varobj"
|
||||
"change C through. varobj"
|
||||
|
||||
mi_gdb_test "-data-write-memory-bytes &C \"00\"" \
|
||||
{\^done} \
|
||||
"change C thru. -data-write-memory-bytes"
|
||||
"change C through. -data-write-memory-bytes"
|
||||
|
||||
# Modify code section also triggers MI notification.
|
||||
|
||||
|
||||
@@ -3735,7 +3735,7 @@ handle_status (char *own_buf)
|
||||
{
|
||||
for_each_thread (queue_stop_reply_callback);
|
||||
|
||||
/* The first is sent immediatly. OK is sent if there is no
|
||||
/* The first is sent immediately. OK is sent if there is no
|
||||
stopped thread, which is the same handling of the vStopped
|
||||
packet (by design). */
|
||||
notif_write_event (¬if_stop, cs.own_buf);
|
||||
|
||||
Reference in New Issue
Block a user