Showing with 10 additions and 10 deletions.

+3 −3 src/expression.d

+2 −2 src/expression.h

+1 −1 src/hdrgen.d

+1 −1 src/parse.d

+1 −1 src/visitor.d

+2 −2 src/visitor.h
diff --git a/src/expression.d b/src/expression.d
@@ -7653,19 +7653,19 @@ public:
 
 /***********************************************************
  */
-extern (C++) final class FileExp : UnaExp
+extern (C++) final class ImportExp : UnaExp
 {
 public:
     extern (D) this(Loc loc, Expression e)
     {
-        super(loc, TOKimport, __traits(classInstanceSize, FileExp), e);
+        super(loc, TOKimport, __traits(classInstanceSize, ImportExp), e);
     }
 
     override Expression semantic(Scope* sc)
     {
         static if (LOGSEMANTIC)
         {
-            printf("FileExp::semantic('%s')\n", toChars());
+            printf("ImportExp::semantic('%s')\n", toChars());
         }
         const(char)* name;
         char* namez;

diff --git a/src/expression.h b/src/expression.h
@@ -799,10 +799,10 @@ class CompileExp : public UnaExp
     void accept(Visitor *v) { v->visit(this); }
 };
 
-class FileExp : public UnaExp
+class ImportExp : public UnaExp
 {
 public:
-    FileExp(Loc loc, Expression *e);
+    ImportExp(Loc loc, Expression *e);
     Expression *semantic(Scope *sc);
     void accept(Visitor *v) { v->visit(this); }
 };

diff --git a/src/hdrgen.d b/src/hdrgen.d
@@ -2540,7 +2540,7 @@ public:
         buf.writeByte(')');
     }
 
-    override void visit(FileExp e)
+    override void visit(ImportExp e)
     {
         buf.writestring("import(");
         expToBuffer(e.e1, PREC_assign);

diff --git a/src/parse.d b/src/parse.d
@@ -6924,7 +6924,7 @@ public:
                 check(TOKlparen, "import");
                 e = parseAssignExp();
                 check(TOKrparen);
-                e = new FileExp(loc, e);
+                e = new ImportExp(loc, e);
                 break;
             }
         case TOKnew:

diff --git a/src/visitor.d b/src/visitor.d
@@ -933,7 +933,7 @@ public:
         visit(cast(UnaExp)e);
     }
 
-    void visit(FileExp e)
+    void visit(ImportExp e)
     {
         visit(cast(UnaExp)e);
     }

diff --git a/src/visitor.h b/src/visitor.h
@@ -204,7 +204,7 @@ class UnaExp;
 class BinExp;
 class BinAssignExp;
 class CompileExp;
-class FileExp;
+class ImportExp;
 class AssertExp;
 class DotIdExp;
 class DotTemplateExp;
@@ -490,7 +490,7 @@ class Visitor
     virtual void visit(BinExp *e) { visit((Expression *)e); }
     virtual void visit(BinAssignExp *e) { visit((BinExp *)e); }
     virtual void visit(CompileExp *e) { visit((UnaExp *)e); }
-    virtual void visit(FileExp *e) { visit((UnaExp *)e); }
+    virtual void visit(ImportExp *e) { visit((UnaExp *)e); }
     virtual void visit(AssertExp *e) { visit((UnaExp *)e); }
     virtual void visit(DotIdExp *e) { visit((UnaExp *)e); }
     virtual void visit(DotTemplateExp *e) { visit((UnaExp *)e); }