Move Dsymbol::inlineScan into inline.c

dlang · Feb 1, 2014 · 7677d8b · 7677d8b
1 parent b17cf7d
commit 7677d8b
Show file tree

Hide file tree

Showing 17 changed files with 143 additions and 166 deletions.
diff --git a/src/aggregate.h b/src/aggregate.h
@@ -92,7 +92,6 @@ class AggregateDeclaration : public ScopeDsymbol
     void setScope(Scope *sc);
     void semantic2(Scope *sc);
     void semantic3(Scope *sc);
-    void inlineScan();
     unsigned size(Loc loc);
     static void alignmember(structalign_t salign, unsigned size, unsigned *poffset);
     static unsigned placeField(unsigned *nextoffset,

diff --git a/src/attrib.c b/src/attrib.c
@@ -190,20 +190,6 @@ void AttribDeclaration::semantic3(Scope *sc)
     }
 }
 
-void AttribDeclaration::inlineScan()
-{
-    Dsymbols *d = include(NULL, NULL);
-
-    if (d)
-    {
-        for (size_t i = 0; i < d->dim; i++)
-        {   Dsymbol *s = (*d)[i];
-            //printf("AttribDeclaration::inlineScan %s\n", s->toChars());
-            s->inlineScan();
-        }
-    }
-}
-
 void AttribDeclaration::addComment(const utf8_t *comment)
 {
     //printf("AttribDeclaration::addComment %s\n", comment);

diff --git a/src/attrib.h b/src/attrib.h
@@ -45,7 +45,6 @@ class AttribDeclaration : public Dsymbol
     void semantic(Scope *sc);
     void semantic2(Scope *sc);
     void semantic3(Scope *sc);
-    void inlineScan();
     void addComment(const utf8_t *comment);
     void emitComment(Scope *sc);
     const char *kind();

diff --git a/src/declaration.h b/src/declaration.h
@@ -24,7 +24,6 @@ class Statement;
 class LabelDsymbol;
 class Initializer;
 class Module;
-struct InlineScanState;
 class ForeachStatement;
 class FuncDeclaration;
 class ExpInitializer;
@@ -698,9 +697,7 @@ class FuncDeclaration : public Declaration
     virtual bool addPostInvariant();
     Expression *interpret(InterState *istate, Expressions *arguments, Expression *thisexp = NULL);
     void ctfeCompile();
-    void inlineScan();
     int canInline(int hasthis, int hdrscan, int statementsToo);
-    Expression *expandInline(InlineScanState *iss, Expression *eret, Expression *ethis, Expressions *arguments, Statement **ps);
     const char *kind();
     void toDocBuffer(OutBuffer *buf, Scope *sc);
     FuncDeclaration *isUnique();
@@ -913,7 +910,6 @@ class UnitTestDeclaration : public FuncDeclaration
     bool addPreInvariant();
     bool addPostInvariant();
     void emitComment(Scope *sc);
-    void inlineScan();
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
 
     UnitTestDeclaration *isUnitTestDeclaration() { return this; }

diff --git a/src/dsymbol.c b/src/dsymbol.c
@@ -383,15 +383,6 @@ void Dsymbol::semantic3(Scope *sc)
     // Most Dsymbols have no further semantic analysis needed
 }
 
-/*************************************
- * Look for function inlining possibilities.
- */
-
-void Dsymbol::inlineScan()
-{
-    // Most Dsymbols aren't functions
-}
-
 /*********************************************
  * Search for ident as member of s.
  * Input:

diff --git a/src/dsymbol.h b/src/dsymbol.h
@@ -178,7 +178,6 @@ class Dsymbol : public RootObject
     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 = IgnoreNone);
     Dsymbol *search_correct(Identifier *id);
     Dsymbol *searchX(Loc loc, Scope *sc, RootObject *id);

diff --git a/src/expression.h b/src/expression.h
@@ -33,7 +33,6 @@ class Import;
 class Module;
 class ScopeDsymbol;
 struct InlineDoState;
-struct InlineScanState;
 class Expression;
 class Declaration;
 class AggregateDeclaration;