On Sat, 2015-12-05 at 20:53 +0100, Mikael Morin wrote:
> Hello,
>
> to get things moving again, a few comments on top of David Malcolm's:
>
> Le 01/12/2015 13:55, Bernhard Reutner-Fischer a écrit :
> >
> > David Malcolm nice Levenshtein distance spelling check helpers
> > were used in some parts of other frontends. This proposed patch adds
> > some spelling corrections to the fortran frontend.
> >
> > Suggestions are printed if we can find a suitable name, currently
> > perusing a very simple cutoff factor:
> > /* If more than half of the letters were misspelled, the suggestion is
> > likely to be meaningless. */
> > cutoff = MAX (strlen (typo), strlen (best_guess)) / 2;
> > which effectively skips names with less than 4 characters.
> > For e.g. structures, one could try to be much smarter in an attempt to
> > also provide suggestions for single-letter members/components.
> >
> > This patch covers (at least partly):
> > - user-defined operators
> > - structures (types and their components)
> > - functions
> > - symbols (variables)
> >
> > I do not immediately see how to handle subroutines. Ideas?
> >
> Not sure what you are looking for; I can get an error generated in
> gfc_procedure_use if using IMPLICIT NONE (EXTERNAL)
>
> > If anybody has a testcase where a spelling-suggestion would make sense
> > then please pass it along so we maybe can add support for GCC-7.
> >
>
>
> > diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
> > index 685e3f5..6e1f63c 100644
> > --- a/gcc/fortran/resolve.c
> > +++ b/gcc/fortran/resolve.c
> > @@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
> > #include "data.h"
> > #include "target-memory.h" /* for gfc_simplify_transfer */
> > #include "constructor.h"
> > +#include "spellcheck.h"
> >
> > /* Types used in equivalence statements. */
> >
> > @@ -2682,6 +2683,61 @@ resolve_specific_f (gfc_expr *expr)
> > return true;
> > }
> >
> > +/* Recursively append candidate SYM to CANDIDATES. */
> > +
> > +static void
> > +lookup_function_fuzzy_find_candidates (gfc_symtree *sym,
> > + vec *candidates)
> > +{
> > + gfc_symtree *p;
> > + for (p = sym->right; p; p = p->right)
> > +{
> > + lookup_function_fuzzy_find_candidates (p, candidates);
> > + if (p->n.sym->ts.type != BT_UNKNOWN)
> > + candidates->safe_push (p->name);
> > +}
> > + for (p = sym->left; p; p = p->left)
> > +{
> > + lookup_function_fuzzy_find_candidates (p, candidates);
> > + if (p->n.sym->ts.type != BT_UNKNOWN)
> > + candidates->safe_push (p->name);
> > +}
> > +}
>
> It seems you are considering some candidates more than once here.
> The first time through the recursive call you will consider say
> sym->right->right, and with the loop, you'll consider it again after
> returning from the recursive call.
> The usual way to traverse the whole tree is to handle the current
> pointer and recurse on left and right pointers. So without loop.
> There is gfc_traverse_ns that you might find handy to do that (no
> obligation).
>
> Same goes for the user operators below.
>
> > +
> > +
> > +/* Lookup function FN fuzzily, taking names in FUN into account. */
> > +
> > +const char*
> > +gfc_lookup_function_fuzzy (const char *fn, gfc_symtree *fun)
> > +{
> > + auto_vec candidates;
> > + lookup_function_fuzzy_find_candidates (fun, &candidates);
>
> You have to start the lookup with the current namespace's sym_root (not
> with fun), otherwise you'll miss some candidates.
> You may also want to query parent namespaces for host-associated symbols.
>
> > +
> > + /* Determine closest match. */
> > + int i;
> > + const char *name, *best = NULL;
> > + edit_distance_t best_distance = MAX_EDIT_DISTANCE;
> > +
>
> [...]
>
> > diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
> > index ff9aff9..212f7d8 100644
> > --- a/gcc/fortran/symbol.c
> > +++ b/gcc/fortran/symbol.c
> > @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
> > #include "parse.h"
> > #include "match.h"
> > #include "constructor.h"
> > +#include "spellcheck.h"
> >
> >
> > /* Strings for all symbol attributes. We use these for dumping the
> > @@ -235,6 +236,62 @@ gfc_get_default_type (const char *name, gfc_namespace
> > *ns)
> > }
> >
> >
> > +/* Recursively append candidate SYM to CANDIDATES. */
> > +
> > +static void
> > +lookup_symbol_fuzzy_find_candidates (gfc_symtree *sym,
> > + vec *candidates)
> > +{
> > + gfc_symtree *p;
> > + for (p = sym->right; p; p = p->right)
> > +{
> > + lookup_symbol_fuzzy_find_candidates (p, candidates);
> > + if (p->n.sym->ts.type != BT_UNKNOWN)
> > + candidates->safe_push (p->name);
> > +}
> > + for (p = sym->left; p; p = p->left)
> > +{
> > + lookup_symbol_fuzzy_find_candidates (p, candidates);
> > + if (p->n.sym->ts.type != BT_UNKNOWN)
> > + candidates->safe_push (p->name);
> > +
