7c8f7eaa75
gcc/c/ChangeLog: * c-decl.c (struct edit_distance_traits<cpp_hashnode *>): Move to spellcheck-tree.h (best_macro_match): Likewise, converting from a typedef to a subclass. (find_closest_macro_cpp_cb): Move to spellcheck-tree.c. (lookup_name_fuzzy): Update for change of best_macro_match to a subclass with a ctor that calls cpp_forall_identifiers. gcc/ChangeLog: * diagnostic-show-locus.c (diagnostic_show_locus): If this is the same location as last time, don't skip if we have fix-it hints. Clarify the skipping logic by converting it from one "if" clause to repeated "if" clauses. * spellcheck-tree.c: Include "cpplib.h". (find_closest_macro_cpp_cb): Move here from c/c-decl.c. (best_macro_match::best_macro_match): New constructor. * spellcheck-tree.h (struct edit_distance_traits<cpp_hashnode *>): Move here from c/c-decl.c. (class best_macro_match): Move here from c/c-decl.c, converting from a typedef to a subclass, gaining a ctor. From-SVN: r238522
78 lines
2.0 KiB
C++
78 lines
2.0 KiB
C++
/* Find near-matches for identifiers.
|
|
Copyright (C) 2015-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC 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, or (at your option) any later
|
|
version.
|
|
|
|
GCC 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 GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GCC_SPELLCHECK_TREE_H
|
|
#define GCC_SPELLCHECK_TREE_H
|
|
|
|
#include "spellcheck.h"
|
|
|
|
/* spellcheck-tree.c */
|
|
|
|
extern edit_distance_t
|
|
levenshtein_distance (tree ident_s, tree ident_t);
|
|
|
|
extern tree
|
|
find_closest_identifier (tree target, const auto_vec<tree> *candidates);
|
|
|
|
/* Specialization of edit_distance_traits for identifiers. */
|
|
|
|
template <>
|
|
struct edit_distance_traits<tree>
|
|
{
|
|
static size_t get_length (tree id)
|
|
{
|
|
gcc_assert (TREE_CODE (id) == IDENTIFIER_NODE);
|
|
return IDENTIFIER_LENGTH (id);
|
|
}
|
|
|
|
static const char *get_string (tree id)
|
|
{
|
|
gcc_assert (TREE_CODE (id) == IDENTIFIER_NODE);
|
|
return IDENTIFIER_POINTER (id);
|
|
}
|
|
};
|
|
|
|
/* Specialization of edit_distance_traits for preprocessor macros. */
|
|
|
|
template <>
|
|
struct edit_distance_traits<cpp_hashnode *>
|
|
{
|
|
static size_t get_length (cpp_hashnode *hashnode)
|
|
{
|
|
return hashnode->ident.len;
|
|
}
|
|
|
|
static const char *get_string (cpp_hashnode *hashnode)
|
|
{
|
|
return (const char *)hashnode->ident.str;
|
|
}
|
|
};
|
|
|
|
/* Specialization of best_match<> for finding the closest preprocessor
|
|
macro to a given identifier. */
|
|
|
|
class best_macro_match : public best_match<tree, cpp_hashnode *>
|
|
{
|
|
public:
|
|
best_macro_match (tree goal, edit_distance_t best_distance_so_far,
|
|
cpp_reader *reader);
|
|
};
|
|
|
|
#endif /* GCC_SPELLCHECK_TREE_H */
|