Move lexer's string table into Identifier and clean up imports

dlang · Jan 4, 2015 · 2d0115b · 2d0115b
1 parent e129e84
commit 2d0115b
Show file tree

Hide file tree

Showing 45 changed files with 426 additions and 425 deletions.
diff --git a/src/aliasthis.c b/src/aliasthis.c
@@ -20,6 +20,7 @@
 #include "dsymbol.h"
 #include "mtype.h"
 #include "declaration.h"
+#include "tokens.h"
 
 Expression *resolveAliasThis(Scope *sc, Expression *e)
 {

diff --git a/src/arrayop.c b/src/arrayop.c
@@ -25,6 +25,7 @@
 #include "id.h"
 #include "module.h"
 #include "init.h"
+#include "tokens.h"
 
 void buildArrayIdent(Expression *e, OutBuffer *buf, Expressions *arguments);
 Expression *buildArrayLoop(Expression *e, Parameters *fparams);
@@ -206,7 +207,7 @@ Expression *arrayOp(BinExp *e, Scope *sc)
     buf.writestring(e->type->toBasetype()->nextOf()->toBasetype()->mutableOf()->deco);
 
     char *name = buf.peekString();
-    Identifier *ident = Lexer::idPool(name);
+    Identifier *ident = Identifier::idPool(name);
 
     FuncDeclaration **pFd = (FuncDeclaration **)dmd_aaGet(&arrayfuncs, (void *)ident);
     FuncDeclaration *fd = *pFd;

diff --git a/src/builtin.c b/src/builtin.c
@@ -25,6 +25,7 @@
 #include "id.h"
 #include "module.h"
 #include "root/port.h"
+#include "tokens.h"
 
 StringTable builtins;
 

diff --git a/src/canthrow.c b/src/canthrow.c
@@ -23,6 +23,7 @@
 #include "aggregate.h"
 #include "scope.h"
 #include "attrib.h"
+#include "tokens.h"
 
 bool Dsymbol_canThrow(Dsymbol *s, FuncDeclaration *func, bool mustNotThrow);
 bool walkPostorder(Expression *e, StoppableVisitor *v);

diff --git a/src/cast.c b/src/cast.c
@@ -24,6 +24,7 @@
 #include "scope.h"
 #include "id.h"
 #include "init.h"
+#include "tokens.h"
 
 bool isCommutative(Expression *e);
 

diff --git a/src/clone.c b/src/clone.c
@@ -23,6 +23,7 @@
 #include "statement.h"
 #include "init.h"
 #include "template.h"
+#include "tokens.h"
 
 
 /*******************************************
@@ -250,7 +251,7 @@ FuncDeclaration *buildOpAssign(StructDeclaration *sd, Scope *sc)
          *    tmp = this; this = s; tmp.dtor();
          */
         //printf("\tswap copy\n");
-        Identifier *idtmp = Lexer::uniqueId("__swap");
+        Identifier *idtmp = Identifier::generateId("__swap");
         VarDeclaration *tmp = NULL;
         AssignExp *ec = NULL;
         if (sd->dtor)
@@ -494,7 +495,7 @@ FuncDeclaration *buildXopEquals(StructDeclaration *sd, Scope *sc)
     if (!sd->xerreq)
     {
         // object._xopEquals
-        Identifier *id = Lexer::idPool("_xopEquals");
+        Identifier *id = Identifier::idPool("_xopEquals");
         Expression *e = new IdentifierExp(sd->loc, Id::empty);
         e = new DotIdExp(sd->loc, e, Id::object);
         e = new DotIdExp(sd->loc, e, id);
@@ -620,7 +621,7 @@ FuncDeclaration *buildXopCmp(StructDeclaration *sd, Scope *sc)
     if (!sd->xerrcmp)
     {
         // object._xopCmp
-        Identifier *id = Lexer::idPool("_xopCmp");
+        Identifier *id = Identifier::idPool("_xopCmp");
         Expression *e = new IdentifierExp(sd->loc, Id::empty);
         e = new DotIdExp(sd->loc, e, Id::object);
         e = new DotIdExp(sd->loc, e, id);
@@ -857,7 +858,7 @@ FuncDeclaration *buildPostBlit(StructDeclaration *sd, Scope *sc)
     if (e || (stc & STCdisable))
     {
         //printf("Building __fieldPostBlit()\n");
-        PostBlitDeclaration *dd = new PostBlitDeclaration(declLoc, Loc(), stc, Lexer::idPool("__fieldPostBlit"));
+        PostBlitDeclaration *dd = new PostBlitDeclaration(declLoc, Loc(), stc, Identifier::idPool("__fieldPostBlit"));
         dd->fbody = new ExpStatement(loc, e);
         sd->postblits.shift(dd);
         sd->members->push(dd);
@@ -889,7 +890,7 @@ FuncDeclaration *buildPostBlit(StructDeclaration *sd, Scope *sc)
                 ex = new CallExp(loc, ex);
                 e = Expression::combine(e, ex);
             }
-            PostBlitDeclaration *dd = new PostBlitDeclaration(declLoc, Loc(), stc, Lexer::idPool("__aggrPostBlit"));
+            PostBlitDeclaration *dd = new PostBlitDeclaration(declLoc, Loc(), stc, Identifier::idPool("__aggrPostBlit"));
             dd->fbody = new ExpStatement(loc, e);
             sd->members->push(dd);
             dd->semantic(sc);
@@ -970,7 +971,7 @@ FuncDeclaration *buildDtor(AggregateDeclaration *ad, Scope *sc)
     if (e || (stc & STCdisable))
     {
         //printf("Building __fieldDtor()\n");
-        DtorDeclaration *dd = new DtorDeclaration(declLoc, Loc(), stc, Lexer::idPool("__fieldDtor"));
+        DtorDeclaration *dd = new DtorDeclaration(declLoc, Loc(), stc, Identifier::idPool("__fieldDtor"));
         dd->fbody = new ExpStatement(loc, e);
         ad->dtors.shift(dd);
         ad->members->push(dd);
@@ -1002,7 +1003,7 @@ FuncDeclaration *buildDtor(AggregateDeclaration *ad, Scope *sc)
                 ex = new CallExp(loc, ex);
                 e = Expression::combine(ex, e);
             }
-            DtorDeclaration *dd = new DtorDeclaration(declLoc, Loc(), stc, Lexer::idPool("__aggrDtor"));
+            DtorDeclaration *dd = new DtorDeclaration(declLoc, Loc(), stc, Identifier::idPool("__aggrDtor"));
             dd->fbody = new ExpStatement(loc, e);
             ad->members->push(dd);
             dd->semantic(sc);

diff --git a/src/cond.c b/src/cond.c
@@ -21,10 +21,10 @@
 #include "cond.h"
 #include "module.h"
 #include "template.h"
-#include "lexer.h"
 #include "mtype.h"
 #include "scope.h"
 #include "arraytypes.h"
+#include "tokens.h"
 
 int findCondition(Strings *ids, Identifier *ident)
 {
@@ -293,7 +293,7 @@ int VersionCondition::include(Scope *sc, ScopeDsymbol *sds)
         }
         else if (level <= global.params.versionlevel || level <= mod->versionlevel)
             inc = 1;
-        if (!definedInModule && (!ident || (!isPredefined(ident->toChars()) && ident != Lexer::idPool(Token::toChars(TOKunittest)) && ident != Lexer::idPool(Token::toChars(TOKassert)))))
+        if (!definedInModule && (!ident || (!isPredefined(ident->toChars()) && ident != Identifier::idPool(Token::toChars(TOKunittest)) && ident != Identifier::idPool(Token::toChars(TOKassert)))))
             printDepsConditional(sc, this, "depsVersion ");
     }
     return (inc == 1);

diff --git a/src/ctfe.h b/src/ctfe.h
@@ -17,6 +17,7 @@
 #endif /* __DMC__ */
 
 #include "arraytypes.h"
+#include "tokens.h"
 
 /**
    Global status of the CTFE engine. Mostly used for performance diagnostics

diff --git a/src/declaration.c b/src/declaration.c
@@ -953,7 +953,7 @@ void VarDeclaration::semantic(Scope *sc)
                 }
                 else if (isAliasThisTuple(e))
                 {
-                    Identifier *id = Lexer::uniqueId("__tup");
+                    Identifier *id = Identifier::generateId("__tup");
                     ExpInitializer *ei = new ExpInitializer(e->loc, e);
                     VarDeclaration *v = new VarDeclaration(loc, NULL, id, ei);
                     v->storage_class = STCtemp | STCctfe | STCref | STCforeach;
@@ -1024,7 +1024,7 @@ void VarDeclaration::semantic(Scope *sc)
             OutBuffer buf;
             buf.printf("__%s_field_%llu", ident->toChars(), (ulonglong)i);
             const char *name = buf.extractString();
-            Identifier *id = Lexer::idPool(name);
+            Identifier *id = Identifier::idPool(name);
 
             Initializer *ti;
             if (ie)

diff --git a/src/declaration.h b/src/declaration.h
@@ -17,7 +17,6 @@
 #endif /* __DMC__ */
 
 #include "dsymbol.h"
-#include "lexer.h"
 #include "mtype.h"
 
 class Expression;

diff --git a/src/delegatize.c b/src/delegatize.c
@@ -21,6 +21,7 @@
 #include "aggregate.h"
 #include "scope.h"
 #include "init.h"
+#include "tokens.h"
 
 /********************************************
  * Convert from expression to delegate that returns the expression,

diff --git a/src/doc.c b/src/doc.c
@@ -566,7 +566,7 @@ static void emitAnchor(OutBuffer *buf, Dsymbol *s, Scope *sc)
     {
         OutBuffer anc;
         emitAnchorName(&anc, s, skipNonQualScopes(sc));
-        ident = Lexer::idPool(anc.peekString());
+        ident = Identifier::idPool(anc.peekString());
     }
     size_t *count = (size_t*)dmd_aaGet(&sc->anchorCounts, (void *)ident);
     TemplateDeclaration *td = getEponymousParentTemplate(s);

diff --git a/src/dsymbol.c b/src/dsymbol.c
@@ -33,6 +33,7 @@
 #include "template.h"
 #include "attrib.h"
 #include "enum.h"
+#include "lexer.h"
 
 
 /****************************** Dsymbol ******************************/
@@ -423,11 +424,9 @@ void *symbol_search_fp(void *arg, const char *seed, int* cost)
     size_t len = strlen(seed);
     if (!len)
         return NULL;
-    StringValue *sv = Lexer::stringtable.lookup(seed, len);
-    if (!sv)
+    Identifier *id = Identifier::lookup(seed, len);
+    if (!id)
         return NULL;
-    Identifier *id = (Identifier *)sv->ptrvalue;
-    assert(id);
 
     *cost = 0;
     Dsymbol *s = (Dsymbol *)arg;

diff --git a/src/e2ir.c b/src/e2ir.c
@@ -16,7 +16,6 @@
 #include        "port.h"
 #include        "target.h"
 
-#include        "lexer.h"
 #include        "expression.h"
 #include        "mtype.h"
 #include        "dsymbol.h"

diff --git a/src/enum.h b/src/enum.h
@@ -18,6 +18,7 @@
 
 #include "root.h"
 #include "dsymbol.h"
+#include "tokens.h"
 
 class Identifier;
 class Type;