Changeset 408

Timestamp:

03/04/10 21:50:26 (2 years ago)

Author:

walter

Message:

add spell checking

Files:

• branches/dmd-1.x/src/dsymbol.c (modified) (3 diffs)
• branches/dmd-1.x/src/dsymbol.h (modified) (2 diffs)
• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• branches/dmd-1.x/src/module.c (modified) (2 diffs)
• branches/dmd-1.x/src/module.h (modified) (1 diff)
• branches/dmd-1.x/src/mtype.c (modified) (2 diffs)
• branches/dmd-1.x/src/root/speller.c (added)
• branches/dmd-1.x/src/root/speller.h (added)
• branches/dmd-1.x/src/scope.c (modified) (3 diffs)
• branches/dmd-1.x/src/scope.h (modified) (1 diff)
• branches/dmd-1.x/src/template.c (modified) (1 diff)
• branches/dmd-1.x/src/win32.mak (modified) (3 diffs)
• trunk/src/dsymbol.c (modified) (4 diffs)
• trunk/src/dsymbol.h (modified) (1 diff)
• trunk/src/expression.c (modified) (3 diffs)
• trunk/src/module.c (modified) (1 diff)
• trunk/src/module.h (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/root/speller.c (added)
• trunk/src/root/speller.h (added)
• trunk/src/scope.c (modified) (3 diffs)
• trunk/src/scope.h (modified) (1 diff)
• trunk/src/template.c (modified) (1 diff)
• trunk/src/win32.mak (modified) (4 diffs)

branches/dmd-1.x/src/dsymbol.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -14 +14 @@
-
-#include "rmem.h"
+#include "speller.h"
-
-#include "mars.h"
@@ -331 +332 @@
-    //printf("Dsymbol::search(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
-    return NULL;
+}
+
+/***************************************************
+ * Search for symbol with correct spelling.
+ */
+
+void *symbol_search_fp(void *arg, const char *seed)
+{
+    Dsymbol *s = (Dsymbol *)arg;
+    Identifier id(seed, 0);
+    Module::clearCache();
+    s = s->search(0, &id, 4|2);
+    return s;
+}
+
+Dsymbol *Dsymbol::search_correct(Identifier *ident)
+{
+    if (global.gag)
+    return NULL;        // don't do it for speculative compiles; too time consuming
+
+    return (Dsymbol *)speller(ident->toChars(), &symbol_search_fp, this, idchars);
-}
-

branches/dmd-1.x/src/dsymbol.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -148 +148 @@
-    virtual void inlineScan();
-    virtual Dsymbol *search(Loc loc, Identifier *ident, int flags);
+    Dsymbol *search_correct(Identifier *id);
-    Dsymbol *searchX(Loc loc, Scope *sc, Identifier *id);
-    virtual int overloadInsert(Dsymbol *s);

branches/dmd-1.x/src/expression.c

@@ -2092 +2092 @@
-    return e->semantic(sc);
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    type = Type::terror;
-    return this;

branches/dmd-1.x/src/module.c

@@ -865 +865 @@
-int Module::needModuleInfo()
-{
+    //printf("needModuleInfo() %s, %d, %d\n", toChars(), needmoduleinfo, global.params.cov);
-    return needmoduleinfo || global.params.cov;
-}
@@ -903 +904 @@
-}
-
+void Module::clearCache()
+{
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *m = (Module *)amodules.data[i];
+    m->searchCacheIdent = NULL;
+    }
+}
-
-/*******************************************

branches/dmd-1.x/src/module.h

@@ -142 +142 @@
-    void addDeferredSemantic(Dsymbol *s);
-    static void runDeferredSemantic();
+    static void clearCache();
-    int imports(Module *m);
-

branches/dmd-1.x/src/mtype.c

@@ -593 +593 @@
-    {
-    error(loc, ".size property should be replaced with .sizeof");
-IntegerExp(loc, size(loc), Type::tsize_t
+ErrorExp(
-    }
-    else if (ident == Id::alignof)
@@ -631 +631 @@
-    else
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    return e;

branches/dmd-1.x/src/scope.c

@@ -1 +1 @@
-
-05
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -12 +12 @@
-
-#include "root.h"
+#include "speller.h"
-
-#include "mars.h"
@@ -360 +361 @@
-    }
-}
+
+
+/************************************************
+ * Given the failed search attempt, try to find
+ * one with a close spelling.
+ */
+
+void *scope_search_fp(void *arg, const char *seed)
+{
+    //printf("scope_search_fp('%s')\n", seed);
+    Scope *sc = (Scope *)arg;
+    Identifier id(seed, 0);
+    Module::clearCache();
+    Dsymbol *s = sc->search(0, &id, NULL);
+    return s;
+}
+
+Dsymbol *Scope::search_correct(Identifier *ident)
+{
+    if (global.gag)
+    return NULL;        // don't do it for speculative compiles; too time consuming
+
+    return (Dsymbol *)speller(ident->toChars(), &scope_search_fp, this, idchars);
+}

branches/dmd-1.x/src/scope.h

@@ -111 +111 @@
-
-    Dsymbol *search(Loc loc, Identifier *ident, Dsymbol **pscopesym);
+    Dsymbol *search_correct(Identifier *ident);
-    Dsymbol *insert(Dsymbol *s);
-

branches/dmd-1.x/src/template.c

@@ -3660 +3660 @@
-    s = sc->search(loc, id, &scopesym);
-    if (!s)
-
+
+
+
+
+
+
-        return NULL;
-    }

branches/dmd-1.x/src/win32.mak

@@ -97 +97 @@
-
-ROOTOBJS= lstring.obj array.obj gnuc.obj man.obj rmem.obj port.obj root.obj \
-
+ speller.obj
-
-OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
@@ -150 +150 @@
-    $(ROOT)\stringtable.h $(ROOT)\stringtable.c \
-    $(ROOT)\gnuc.h $(ROOT)\gnuc.c $(ROOT)\man.c $(ROOT)\port.c \
-
+
+
-
-MAKEFILES=win32.mak linux.mak osx.mak freebsd.mak solaris.mak
@@ -420 +421 @@
-response.obj : $(ROOT)\response.c
-    $(CC) -c $(CFLAGS) $(ROOT)\response.c
+
+speller.obj : $(ROOT)\speller.h $(ROOT)\speller.c
+    $(CC) -c $(CFLAGS) $(ROOT)\speller.c
-
-stringtable.obj : $(ROOT)\stringtable.c

trunk/src/dsymbol.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -14 +14 @@
-
-#include "rmem.h"
+#include "speller.h"
-
-#include "mars.h"
@@ -331 +332 @@
-    //printf("Dsymbol::search(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
-    return NULL;
+}
+
+/***************************************************
+ * Search for symbol with correct spelling.
+ */
+
+void *symbol_search_fp(void *arg, const char *seed)
+{
+    Dsymbol *s = (Dsymbol *)arg;
+    Identifier id(seed, 0);
+    Module::clearCache();
+    s = s->search(0, &id, 4|2);
+    return s;
+}
+
+Dsymbol *Dsymbol::search_correct(Identifier *ident)
+{
+    if (global.gag)
+    return NULL;        // don't do it for speculative compiles; too time consuming
+
+    return (Dsymbol *)speller(ident->toChars(), &symbol_search_fp, this, idchars);
-}
-
@@ -1203 +1225 @@
-    assert(tab);
-#endif
+    //printf("DsymbolTable::lookup(%s)\n", (char*)ident->string);
-    StringValue *sv = tab->lookup((char*)ident->string, ident->len);
-    return (Dsymbol *)(sv ? sv->ptrvalue : NULL);

trunk/src/dsymbol.h

@@ -150 +150 @@
-    virtual void inlineScan();
-    virtual Dsymbol *search(Loc loc, Identifier *ident, int flags);
+    Dsymbol *search_correct(Identifier *id);
-    Dsymbol *searchX(Loc loc, Scope *sc, Identifier *id);
-    virtual int overloadInsert(Dsymbol *s);

trunk/src/expression.c

@@ -2258 +2258 @@
-       return e;
-    }
-
+
+
+
+
+
+
-    type = Type::terror;
-    return this;
@@ -5861 +5866 @@
-     * the current module should have access to its own imports.
-     */
- //0);
+
-        (ie->sds->isModule() && ie->sds != sc->module) ? 1 : 0);
-    if (s)
@@ -10652 +10657 @@
-    if (t1n->constOf() != t2n->constOf() &&
-        !((t1n->ty == Tchar || t1n->ty == Twchar || t1n->ty == Tdchar) &&
-
+
+
-       )
-    {   /* Rewrite as:

trunk/src/module.c

@@ -913 +913 @@
-}
-
+void Module::clearCache()
+{
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *m = (Module *)amodules.data[i];
+    m->searchCacheIdent = NULL;
+    }
+}
-
-/*******************************************

trunk/src/module.h

@@ -145 +145 @@
-    void addDeferredSemantic(Dsymbol *s);
-    static void runDeferredSemantic();
+    static void clearCache();
-    int imports(Module *m);
-

trunk/src/mtype.c

@@ -1647 +1647 @@
-    else
-    {
-
+
+
+
+
+
+
+
+
+
-    e = new ErrorExp();
-    }

trunk/src/scope.c

@@ -1 +1 @@
-
-05
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -12 +12 @@
-
-#include "root.h"
+#include "speller.h"
-
-#include "mars.h"
@@ -360 +361 @@
-    }
-}
+
+
+/************************************************
+ * Given the failed search attempt, try to find
+ * one with a close spelling.
+ */
+
+void *scope_search_fp(void *arg, const char *seed)
+{
+    //printf("scope_search_fp('%s')\n", seed);
+    Scope *sc = (Scope *)arg;
+    Identifier id(seed, 0);
+    Module::clearCache();
+    Dsymbol *s = sc->search(0, &id, NULL);
+    return s;
+}
+
+Dsymbol *Scope::search_correct(Identifier *ident)
+{
+    if (global.gag)
+    return NULL;        // don't do it for speculative compiles; too time consuming
+
+    return (Dsymbol *)speller(ident->toChars(), &scope_search_fp, this, idchars);
+}

trunk/src/scope.h

@@ -111 +111 @@
-
-    Dsymbol *search(Loc loc, Identifier *ident, Dsymbol **pscopesym);
+    Dsymbol *search_correct(Identifier *ident);
-    Dsymbol *insert(Dsymbol *s);
-

trunk/src/template.c

@@ -4044 +4044 @@
-    s = sc->search(loc, id, &scopesym);
-    if (!s)
-
+
+
+
+
+
+
-        return NULL;
-    }

trunk/src/win32.mak

@@ -7 +7 @@
-D=
-DMDSVN=\svnproj\dmd\trunk\src
+#DMDSVN=\svnproj\dmd\branches\dmd-1.x\src
-SCROOT=$D\dm
-INCLUDE=$(SCROOT)\include
@@ -96 +97 @@
-
-ROOTOBJS= lstring.obj array.obj gnuc.obj man.obj rmem.obj port.obj root.obj \
-
+ speller.obj
-
-OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
@@ -149 +150 @@
-    $(ROOT)\stringtable.h $(ROOT)\stringtable.c \
-    $(ROOT)\gnuc.h $(ROOT)\gnuc.c $(ROOT)\man.c $(ROOT)\port.c \
-
+
+
-
-MAKEFILES=win32.mak linux.mak osx.mak freebsd.mak solaris.mak
@@ -419 +421 @@
-response.obj : $(ROOT)\response.c
-    $(CC) -c $(CFLAGS) $(ROOT)\response.c
+
+speller.obj : $(ROOT)\speller.h $(ROOT)\speller.c
+    $(CC) -c $(CFLAGS) $(ROOT)\speller.c
-
-stringtable.obj : $(ROOT)\stringtable.c