diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2018-06-12 18:28:37 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2018-06-12 18:28:37 +0000 |
| commit | b80a188beea98da44228d6030932af0769946f83 (patch) | |
| tree | 30899a1fa363ab017696f4a64c390302d401ce6b /gcc/spellcheck-tree.c | |
| parent | e3329a782fc0e51b9a4ddfc6938a484ec4b03084 (diff) | |
| download | gcc-b80a188beea98da44228d6030932af0769946f83.zip gcc-b80a188beea98da44228d6030932af0769946f83.tar.gz gcc-b80a188beea98da44228d6030932af0769946f83.tar.bz2 | |
spellcheck: support transpositions aka Damerau-Levenshtein (PR other/69968)
gcc/fortran/ChangeLog:
PR other/69968
* misc.c (gfc_closest_fuzzy_match): Update for renaming of
levenshtein_distance to get_edit_distance.
gcc/ChangeLog:
PR other/69968
* spellcheck-tree.c (levenshtein_distance): Rename to...
(get_edit_distance): ...this, and update for underlying renaming.
* spellcheck-tree.h (levenshtein_distance): Rename to...
(get_edit_distance): ...this.
* spellcheck.c (levenshtein_distance): Rename to...
(get_edit_distance): ...this. Convert from Levenshtein distance
to Damerau-Levenshtein distance by supporting transpositions of
adjacent characters. Rename "v1" to "v_next" and "v0" to
"v_one_ago".
(selftest::levenshtein_distance_unit_test_oneway): Rename to...
(selftest::test_edit_distance_unit_test_oneway): ...this, and
update for underlying renaming.
(selftest::levenshtein_distance_unit_test): Rename to...
(selftest::test_get_edit_distance_unit): ...this, and update for
underlying renaming.
(selftest::test_find_closest_string): Add example from PR 69968
where transposition helps
(selftest::test_metric_conditions): Update for renaming.
(selftest::test_metric_conditions): Likewise.
(selftest::spellcheck_c_tests): Likewise.
* spellcheck.h (levenshtein_distance): Rename both overloads to...
(get_edit_distance): ...this.
(best_match::consider): Update for renaming.
gcc/testsuite/ChangeLog:
PR other/69968
* gcc.dg/spellcheck-transposition.c: New test.
From-SVN: r261521
Diffstat (limited to 'gcc/spellcheck-tree.c')
| -rw-r--r-- | gcc/spellcheck-tree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/spellcheck-tree.c b/gcc/spellcheck-tree.c index 2a66649..596293e 100644 --- a/gcc/spellcheck-tree.c +++ b/gcc/spellcheck-tree.c @@ -27,18 +27,18 @@ along with GCC; see the file COPYING3. If not see #include "selftest.h" #include "stringpool.h" -/* Calculate Levenshtein distance between two identifiers. */ +/* Calculate edit distance between two identifiers. */ edit_distance_t -levenshtein_distance (tree ident_s, tree ident_t) +get_edit_distance (tree ident_s, tree ident_t) { gcc_assert (TREE_CODE (ident_s) == IDENTIFIER_NODE); gcc_assert (TREE_CODE (ident_t) == IDENTIFIER_NODE); - return levenshtein_distance (IDENTIFIER_POINTER (ident_s), - IDENTIFIER_LENGTH (ident_s), - IDENTIFIER_POINTER (ident_t), - IDENTIFIER_LENGTH (ident_t)); + return get_edit_distance (IDENTIFIER_POINTER (ident_s), + IDENTIFIER_LENGTH (ident_s), + IDENTIFIER_POINTER (ident_t), + IDENTIFIER_LENGTH (ident_t)); } /* Given TARGET, an identifier, and CANDIDATES, a vec of identifiers, |