Changeset 408

Timestamp:

03/04/10 21:50:26 (6 months 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
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
@@ -11 +11 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "rmem.h"
+#include "speller.h"
-
-#include "mars.h"
-#include "dsymbol.h"
-#include "aggregate.h"
-#include "identifier.h"
@@ -328 +329 @@
-
-Dsymbol *Dsymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    //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);
-}
-
-/***************************************
- * Search for identifier id as a member of 'this'.
- * id may be a template instance.

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
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
@@ -145 +145 @@
-    virtual void semantic(Scope *sc);
-    virtual void semantic2(Scope *sc);
-    virtual void semantic3(Scope *sc);
-    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);
-#ifdef _DH
-    char *toHChars();
-    virtual void toHBuffer(OutBuffer *buf, HdrGenState *hgs);

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

@@ -2089 +2089 @@
-        }
-        e = new DsymbolExp(loc, s);
-    }
-    return e->semantic(sc);
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    type = Type::terror;
-    return this;
-}
-
-char *IdentifierExp::toChars()

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

@@ -862 +862 @@
- * for this Module.
- */
-
-int Module::needModuleInfo()
-{
+    //printf("needModuleInfo() %s, %d, %d\n", toChars(), needmoduleinfo, global.params.cov);
-    return needmoduleinfo || global.params.cov;
-}
-
-Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
-{
@@ -900 +901 @@
-{
-    searchCacheIdent = 0;   // symbol is inserted, so invalidate cache
-    return Package::symtabInsert(s);
-}
-
+void Module::clearCache()
+{
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *m = (Module *)amodules.data[i];
+    m->searchCacheIdent = NULL;
+    }
+}
-
-/*******************************************
- * Can't run semantic on s now, try again later.
- */
-

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

@@ -139 +139 @@
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    Dsymbol *symtabInsert(Dsymbol *s);
-    void deleteObjFile();
-    void addDeferredSemantic(Dsymbol *s);
-    static void runDeferredSemantic();
+    static void clearCache();
-    int imports(Module *m);
-
-    // Back end
-
-    int doppelganger;       // sub-module

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

@@ -590 +590 @@
-    e = new IntegerExp(loc, size(loc), Type::tsize_t);
-    }
-    else if (ident == Id::size)
-    {
-    error(loc, ".size property should be replaced with .sizeof");
-IntegerExp(loc, size(loc), Type::tsize_t
+ErrorExp(
-    }
-    else if (ident == Id::alignof)
-    {
-    e = new IntegerExp(loc, alignsize(), Type::tsize_t);
-    }
@@ -628 +628 @@
-    Scope sc;
-    e = e->semantic(&sc);
-    }
-    else
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    return e;
-}
-
-Expression *Type::dotExp(Scope *sc, Expression *e, Identifier *ident)

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

@@ -1 +1 @@
-
-05
+10
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
@@ -9 +9 @@
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "root.h"
+#include "speller.h"
-
-#include "mars.h"
-#include "init.h"
-#include "identifier.h"
-#include "scope.h"
@@ -357 +358 @@
-    //assert(!sc->enclosing || sc != sc->enclosing->enclosing);
-    //if (++i == 10)
-        //assert(0);
-    }
-}
+
+
+/************************************************
+ * 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

@@ -108 +108 @@
-    Scope *pop();
-
-    void mergeCallSuper(Loc loc, unsigned cs);
-
-    Dsymbol *search(Loc loc, Identifier *ident, Dsymbol **pscopesym);
+    Dsymbol *search_correct(Identifier *ident);
-    Dsymbol *insert(Dsymbol *s);
-
-    ClassDeclaration *getClassScope();
-    AggregateDeclaration *getStructClassScope();
-    void setNoFree();

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

@@ -3657 +3657 @@
-    int i;
-
-    id = name;
-    s = sc->search(loc, id, &scopesym);
-    if (!s)
-
+
+
+
+
+
+
-        return NULL;
-    }
-#if LOG
-    printf("It's an instance of '%s' kind '%s'\n", s->toChars(), s->kind());
-    if (s->parent)

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

@@ -94 +94 @@
-    bcomplex.obj iasm.obj ptrntab.obj aa.obj ti_achar.obj md5.obj
-
-# from ROOT
-
-ROOTOBJS= lstring.obj array.obj gnuc.obj man.obj rmem.obj port.obj root.obj \
-
+ speller.obj
-
-OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
-
-SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \
-    utf.c entity.c identifier.c mtype.c expression.c optimize.c \
@@ -147 +147 @@
-ROOTSRC= $(ROOT)\dchar.h $(ROOT)\dchar.c $(ROOT)\lstring.h \
-    $(ROOT)\lstring.c $(ROOT)\root.h $(ROOT)\root.c $(ROOT)\array.c \
-    $(ROOT)\rmem.h $(ROOT)\rmem.c $(ROOT)\port.h \
-    $(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
-
-#########################################
-
@@ -417 +418 @@
-root.obj : $(ROOT)\root.c
-    $(CC) -c $(CFLAGS) $(ROOT)\root.c
-
-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
-    $(CC) -c $(CFLAGS) $(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
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
@@ -11 +11 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "rmem.h"
+#include "speller.h"
-
-#include "mars.h"
-#include "dsymbol.h"
-#include "aggregate.h"
-#include "identifier.h"
@@ -328 +329 @@
-
-Dsymbol *Dsymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    //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);
-}
-
-/***************************************
- * Search for identifier id as a member of 'this'.
- * id may be a template instance.
@@ -1200 +1222 @@
-{
-#ifdef DEBUG
-    assert(ident);
-    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);
-}
-
-Dsymbol *DsymbolTable::insert(Dsymbol *s)

trunk/src/dsymbol.h

@@ -147 +147 @@
-    virtual void semantic(Scope *sc);
-    virtual void semantic2(Scope *sc);
-    virtual void semantic3(Scope *sc);
-    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);
-#ifdef _DH
-    char *toHChars();
-    virtual void toHBuffer(OutBuffer *buf, HdrGenState *hgs);

trunk/src/expression.c

@@ -2255 +2255 @@
-       VarDeclaration *vd = new VarDeclaration(loc, Type::tbool, Id::ctfe, NULL);
-       Expression *e = new VarExp(loc, vd);
-       e = e->semantic(sc);
-       return e;
-    }
-
+
+
+
+
+
+
-    type = Type::terror;
-    return this;
-}
-
-char *IdentifierExp::toChars()
@@ -5858 +5863 @@
-
-    /* Disable access to another module's private imports.
-     * The check for 'is sds our current module' is because
-     * the current module should have access to its own imports.
-     */
- //0);
+
-        (ie->sds->isModule() && ie->sds != sc->module) ? 1 : 0);
-    if (s)
-    {
-        s = s->toAlias();
-        checkDeprecated(sc, s);
@@ -10649 +10654 @@
-    (t2->ty == Tarray || t2->ty == Tsarray))
-    {   Type *t1n = t1->nextOf()->toBasetype();
-    Type *t2n = t2->nextOf()->toBasetype();
-    if (t1n->constOf() != t2n->constOf() &&
-        !((t1n->ty == Tchar || t1n->ty == Twchar || t1n->ty == Tdchar) &&
-
+
+
-       )
-    {   /* Rewrite as:
-         * _ArrayEq(e1, e2)
-         */
-        Expression *eq = new IdentifierExp(loc, Id::_ArrayEq);

trunk/src/module.c

@@ -910 +910 @@
-{
-    searchCacheIdent = 0;   // symbol is inserted, so invalidate cache
-    return Package::symtabInsert(s);
-}
-
+void Module::clearCache()
+{
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *m = (Module *)amodules.data[i];
+    m->searchCacheIdent = NULL;
+    }
+}
-
-/*******************************************
- * Can't run semantic on s now, try again later.
- */
-

trunk/src/module.h

@@ -142 +142 @@
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    Dsymbol *symtabInsert(Dsymbol *s);
-    void deleteObjFile();
-    void addDeferredSemantic(Dsymbol *s);
-    static void runDeferredSemantic();
+    static void clearCache();
-    int imports(Module *m);
-
-    // Back end
-
-    int doppelganger;       // sub-module

trunk/src/mtype.c

@@ -1644 +1644 @@
-    Scope sc;
-    e = e->semantic(&sc);
-    }
-    else
-    {
-
+
+
+
+
+
+
+
+
+
-    e = new ErrorExp();
-    }
-    return e;
-}
-

trunk/src/scope.c

@@ -1 +1 @@
-
-05
+10
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
@@ -9 +9 @@
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "root.h"
+#include "speller.h"
-
-#include "mars.h"
-#include "init.h"
-#include "identifier.h"
-#include "scope.h"
@@ -357 +358 @@
-    //assert(!sc->enclosing || sc != sc->enclosing->enclosing);
-    //if (++i == 10)
-        //assert(0);
-    }
-}
+
+
+/************************************************
+ * 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

@@ -108 +108 @@
-    Scope *pop();
-
-    void mergeCallSuper(Loc loc, unsigned cs);
-
-    Dsymbol *search(Loc loc, Identifier *ident, Dsymbol **pscopesym);
+    Dsymbol *search_correct(Identifier *ident);
-    Dsymbol *insert(Dsymbol *s);
-
-    ClassDeclaration *getClassScope();
-    AggregateDeclaration *getStructClassScope();
-    void setNoFree();

trunk/src/template.c

@@ -4041 +4041 @@
-    int i;
-
-    id = name;
-    s = sc->search(loc, id, &scopesym);
-    if (!s)
-
+
+
+
+
+
+
-        return NULL;
-    }
-
-    /* If an OverloadSet, look for a unique member that is a template declaration
-     */

trunk/src/win32.mak

@@ -4 +4 @@
-# All Rights Reserved
-# Build dmd with Digital Mars C++ compiler
-
-D=
-DMDSVN=\svnproj\dmd\trunk\src
+#DMDSVN=\svnproj\dmd\branches\dmd-1.x\src
-SCROOT=$D\dm
-INCLUDE=$(SCROOT)\include
-CC=\dm\bin\dmc
-LIBNT=$(SCROOT)\lib
-SNN=$(SCROOT)\lib\snn
@@ -93 +94 @@
-    bcomplex.obj iasm.obj ptrntab.obj aa.obj ti_achar.obj md5.obj
-
-# from ROOT
-
-ROOTOBJS= lstring.obj array.obj gnuc.obj man.obj rmem.obj port.obj root.obj \
-
+ speller.obj
-
-OBJS= $(OBJ1) $(OBJ8) $(ROOTOBJS)
-
-SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \
-    utf.c entity.c identifier.c mtype.c expression.c optimize.c \
@@ -146 +147 @@
-ROOTSRC= $(ROOT)\dchar.h $(ROOT)\dchar.c $(ROOT)\lstring.h \
-    $(ROOT)\lstring.c $(ROOT)\root.h $(ROOT)\root.c $(ROOT)\array.c \
-    $(ROOT)\rmem.h $(ROOT)\rmem.c $(ROOT)\port.h \
-    $(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
-
-#########################################
-
@@ -416 +418 @@
-root.obj : $(ROOT)\root.c
-    $(CC) -c $(CFLAGS) $(ROOT)\root.c
-
-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
-    $(CC) -c $(CFLAGS) $(ROOT)\stringtable.c
-
-