From: Tom de Vries Date: Tue, 8 Oct 2024 06:24:13 +0000 (+0200) Subject: [gdb/contrib] Add more separators in spellcheck.sh X-Git-Tag: gdb-16-branchpoint~708 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0576fe8146527d871558d82d3e4e99d85f2115a7;p=thirdparty%2Fbinutils-gdb.git [gdb/contrib] Add more separators in spellcheck.sh Add two more separators in spellcheck.sh: colon and comma. Doing so triggers the "inbetween->between" rule, which gives an incorrect result. Override this with "inbetween->between, in between, in-between" [1], in a new file gdb/contrib/common-misspellings.txt. Fix the following common misspellings: ... everytime -> every time sucess -> success thru -> through transfered -> transferred inbetween -> between, in between, in-between ... Verified with spellcheck.sh. Tested on x86_64-linux. [1] https://www.grammarly.com/blog/commonly-confused-words/in-between-or-inbetween/ --- diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index fa5d70e1e89..18175735c4f 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -228,7 +228,7 @@ cli_interp::exec (const char *command_str) interpreter which has a new ui_file for gdb_stdout, use that one instead of the default. - It is important that it gets reset everytime, since the user + It is important that it gets reset every time, since the user could set gdb to use a different interpreter. */ ui_file *old_stream = m_cli_uiout->set_stream (gdb_stdout); SCOPE_EXIT { m_cli_uiout->set_stream (old_stream); }; diff --git a/gdb/contrib/common-misspellings.txt b/gdb/contrib/common-misspellings.txt new file mode 100644 index 00000000000..7281ec085dd --- /dev/null +++ b/gdb/contrib/common-misspellings.txt @@ -0,0 +1,17 @@ +# Copyright (C) 2024 Free Software Foundation, Inc. +# This program 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 Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Common spelling mistakes. + +inbetween->between, in between, in-between diff --git a/gdb/contrib/spellcheck.sh b/gdb/contrib/spellcheck.sh index 343a43f054c..4203333b846 100755 --- a/gdb/contrib/spellcheck.sh +++ b/gdb/contrib/spellcheck.sh @@ -25,19 +25,24 @@ url=https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_mac cache_dir=$scriptdir/../../.git cache_file=wikipedia-common-misspellings.txt dictionary=$cache_dir/$cache_file +local_dictionary=$scriptdir/common-misspellings.txt -# Separators: space, slash, tab. +# Separators: space, slash, tab, colon, comma. declare -a grep_separators grep_separators=( " " "/" " " + ":" + "," ) declare -a sed_separators sed_separators=( " " "/" "\t" + ":" + "," ) join () @@ -149,13 +154,27 @@ get_dictionary () trap "" EXIT } +output_local_dictionary () +{ + # Filter out comments and empty lines. + grep -E -v \ + "^#|^$" \ + "$local_dictionary" +} + +output_dictionaries () +{ + output_local_dictionary + cat "$dictionary" +} + parse_dictionary () { # Parse dictionary. mapfile -t words \ - < <(awk -F '->' '{print $1}' "$dictionary") + < <(awk -F '->' '{print $1}' <(output_dictionaries)) mapfile -t replacements \ - < <(awk -F '->' '{print $2}' "$dictionary") + < <(awk -F '->' '{print $2}' <(output_dictionaries)) } find_files_matching_words () @@ -310,12 +329,20 @@ main () return fi + declare -A words_done local i word replacement i=0 for word in "${words[@]}"; do replacement=${replacements[$i]} i=$((i + 1)) + # Skip words that are already handled. This ensures that the local + # dictionary overrides the wiki dictionary. + if [ "${words_done[$word]}" == 1 ]; then + continue + fi + words_done[$word]=1 + replace_word_in_files \ "$word" \ "$replacement" \ diff --git a/gdb/exec.h b/gdb/exec.h index 0c1f60495d7..c08cb9f00ed 100644 --- a/gdb/exec.h +++ b/gdb/exec.h @@ -62,7 +62,7 @@ extern enum target_xfer_status noted above. See memory_xfer_partial_1() in target.c for an example. - Return the number of bytes actually transfered, or zero when no + Return the number of bytes actually transferred, or zero when no data is available for the requested range. This function is intended to be used from target_xfer_partial diff --git a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp index a59c6370a6a..55f437360ab 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-step-out-of-function-no-stmt.exp @@ -19,7 +19,7 @@ # # This sort of thing can occur in optimized code, f.i. here a slightly more # elaborate case with another is-stmt=no entry (the one with line number 12) -# inbetween: +# in between: # INDEX LINE ADDRESS IS-STMT # 12 13 0x00000000004003ed # 13 12 0x00000000004003f2 diff --git a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp index bb05754a5ba..89c1d06f5ba 100644 --- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp +++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp @@ -67,7 +67,7 @@ proc return_if_nonzero { result } { } } -# Do one iteration of "c -a& -> interrupt -a". Return zero on sucess, +# Do one iteration of "c -a& -> interrupt -a". Return zero on success, # and non-zero if some test fails. proc test_one_iteration {} { diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index d11c3f8a6be..ca6f616e3b9 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -671,7 +671,7 @@ validate_actionline (const char *line, tracepoint *t) p = strchr (p, ','); continue; } - /* else fall thru, treat p as an expression and parse it! */ + /* else fall through, treat p as an expression and parse it! */ } tmp_p = p; for (bp_location &loc : t->locations ()) diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 2c1e7cb15a7..69ffb722be7 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -1786,7 +1786,7 @@ struct qxfer the starting point. The ANNEX can be used to provide additional data-specific information to the target. - Return the number of bytes actually transfered, zero when no + Return the number of bytes actually transferred, zero when no further transfer is possible, -1 on error, -2 when the transfer is not supported, and -3 on a verbose error message that should be preserved. Return of a positive value smaller than LEN does