[pkg-d-commits] [ldc] 148/211: Partial cherry-pick from DMD master to remove cycle. (#1886)

Matthias Klumpp mak at moszumanska.debian.org
Sun Apr 23 22:36:18 UTC 2017


This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit c693e2648308860d2d416f4e35735759877fbbec
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Wed Nov 16 09:58:25 2016 +0100

    Partial cherry-pick from DMD master to remove cycle. (#1886)
    
    Had to add a fwd reference to break the cycle.
    
    DMD commit hash: 1d0ab8b9c136e46bf449c506ca25d2c8a784f7b9
---
 .travis.yml        |  2 +-
 ddmd/aggregate.d   |  7 -------
 ddmd/aliasthis.d   |  3 ---
 ddmd/arraytypes.d  |  4 ----
 ddmd/attrib.d      |  2 --
 ddmd/clone.d       |  1 -
 ddmd/cond.d        |  2 --
 ddmd/constfold.d   |  2 --
 ddmd/cppmangle.d   |  2 --
 ddmd/ctfeexpr.d    |  6 ------
 ddmd/dcast.d       |  3 ---
 ddmd/dclass.d      |  3 ---
 ddmd/declaration.d | 10 ----------
 ddmd/denum.d       |  4 ----
 ddmd/dimport.d     |  1 -
 ddmd/dinifile.d    |  2 --
 ddmd/dmacro.d      |  1 -
 ddmd/dmangle.d     |  3 ---
 ddmd/expression.d  |  3 ++-
 ddmd/hdrgen.d      |  2 --
 ddmd/mars.d        |  3 ---
 ddmd/traits.d      |  5 -----
 22 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c59771a..10adaf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
       d: ldc-0.17.2
       env: LLVM_VERSION=3.6.2 OPTS="-DBUILD_SHARED_LIBS=ON"
     - os: linux
-      d: dmd-2.071.2
+      d: dmd
       env: LLVM_VERSION=3.5.2 OPTS="-DTEST_COVERAGE=ON"
     - os: osx
       d: ldc
diff --git a/ddmd/aggregate.d b/ddmd/aggregate.d
index 07f8bd8..77c50c3 100644
--- a/ddmd/aggregate.d
+++ b/ddmd/aggregate.d
@@ -9,13 +9,10 @@
 module ddmd.aggregate;
 
 import core.stdc.stdio;
-import ddmd.access;
 import ddmd.arraytypes;
 import ddmd.gluelayer;
-import ddmd.clone;
 import ddmd.dclass;
 import ddmd.declaration;
-import ddmd.doc;
 import ddmd.dscope;
 import ddmd.dstruct;
 import ddmd.dsymbol;
@@ -24,13 +21,9 @@ import ddmd.errors;
 import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
-import ddmd.hdrgen;
 import ddmd.id;
 import ddmd.identifier;
 import ddmd.mtype;
-import ddmd.opover;
-import ddmd.root.outbuffer;
-import ddmd.statement;
 import ddmd.tokens;
 import ddmd.visitor;
 
diff --git a/ddmd/aliasthis.d b/ddmd/aliasthis.d
index 1747db4..cda7085 100644
--- a/ddmd/aliasthis.d
+++ b/ddmd/aliasthis.d
@@ -15,13 +15,10 @@ import ddmd.dscope;
 import ddmd.dsymbol;
 import ddmd.errors;
 import ddmd.expression;
-import ddmd.func;
 import ddmd.globals;
-import ddmd.hdrgen;
 import ddmd.identifier;
 import ddmd.mtype;
 import ddmd.opover;
-import ddmd.root.outbuffer;
 import ddmd.tokens;
 import ddmd.visitor;
 
diff --git a/ddmd/arraytypes.d b/ddmd/arraytypes.d
index 036d7b8..dcb2907 100644
--- a/ddmd/arraytypes.d
+++ b/ddmd/arraytypes.d
@@ -8,8 +8,6 @@
 
 module ddmd.arraytypes;
 
-import ddmd.aggregate;
-import ddmd.gluelayer;
 import ddmd.dclass;
 import ddmd.declaration;
 import ddmd.dmodule;
@@ -17,12 +15,10 @@ import ddmd.dsymbol;
 import ddmd.dtemplate;
 import ddmd.expression;
 import ddmd.func;
-import ddmd.globals;
 import ddmd.identifier;
 import ddmd.init;
 import ddmd.mtype;
 import ddmd.root.array;
-import ddmd.root.file;
 import ddmd.root.rootobject;
 import ddmd.statement;
 
diff --git a/ddmd/attrib.d b/ddmd/attrib.d
index e566de9..5b16b06 100644
--- a/ddmd/attrib.d
+++ b/ddmd/attrib.d
@@ -13,12 +13,10 @@ import core.stdc.string;
 import ddmd.aggregate;
 import ddmd.arraytypes;
 import ddmd.cond;
-import ddmd.dclass;
 import ddmd.declaration;
 import ddmd.dinterpret;
 import ddmd.dmodule;
 import ddmd.dscope;
-import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
 import ddmd.errors;
diff --git a/ddmd/clone.d b/ddmd/clone.d
index a24faee..3bd6767 100644
--- a/ddmd/clone.d
+++ b/ddmd/clone.d
@@ -16,7 +16,6 @@ import ddmd.dscope;
 import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
-import ddmd.errors;
 import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
diff --git a/ddmd/cond.d b/ddmd/cond.d
index 3911b22..98afb18 100644
--- a/ddmd/cond.d
+++ b/ddmd/cond.d
@@ -11,13 +11,11 @@ module ddmd.cond;
 import core.stdc.string;
 import ddmd.arraytypes;
 import ddmd.dmodule;
-import ddmd.dmodule;
 import ddmd.dscope;
 import ddmd.dsymbol;
 import ddmd.errors;
 import ddmd.expression;
 import ddmd.globals;
-import ddmd.hdrgen;
 import ddmd.identifier;
 import ddmd.mars;
 import ddmd.mtype;
diff --git a/ddmd/constfold.d b/ddmd/constfold.d
index 69f0d9e..ff36cc2 100644
--- a/ddmd/constfold.d
+++ b/ddmd/constfold.d
@@ -11,14 +11,12 @@ module ddmd.constfold;
 import core.stdc.string;
 import core.stdc.stdio;
 import ddmd.arraytypes;
-import ddmd.builtin;
 import ddmd.complex;
 import ddmd.ctfeexpr;
 import ddmd.declaration;
 import ddmd.dstruct;
 import ddmd.errors;
 import ddmd.expression;
-import ddmd.func;
 import ddmd.globals;
 import ddmd.mtype;
 import ddmd.root.longdouble;
diff --git a/ddmd/cppmangle.d b/ddmd/cppmangle.d
index 2591b7a..a5a6ffd 100644
--- a/ddmd/cppmangle.d
+++ b/ddmd/cppmangle.d
@@ -14,7 +14,6 @@ import core.stdc.stdio;
 
 import ddmd.arraytypes;
 import ddmd.declaration;
-import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
 import ddmd.errors;
@@ -22,7 +21,6 @@ import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
 import ddmd.id;
-import ddmd.identifier;
 import ddmd.mtype;
 import ddmd.root.outbuffer;
 import ddmd.root.rootobject;
diff --git a/ddmd/ctfeexpr.d b/ddmd/ctfeexpr.d
index 84004ae..3071f70 100644
--- a/ddmd/ctfeexpr.d
+++ b/ddmd/ctfeexpr.d
@@ -10,7 +10,6 @@ module ddmd.ctfeexpr;
 
 import core.stdc.stdio;
 import core.stdc.string;
-import ddmd.aggregate;
 import ddmd.arraytypes;
 import ddmd.complex;
 import ddmd.constfold;
@@ -23,16 +22,11 @@ import ddmd.errors;
 import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
-import ddmd.hdrgen;
-import ddmd.id;
 import ddmd.mtype;
-import ddmd.root.longdouble;
-import ddmd.root.outbuffer;
 import ddmd.root.port;
 import ddmd.root.rmem;
 import ddmd.target;
 import ddmd.tokens;
-import ddmd.utf;
 import ddmd.visitor;
 
 /***********************************************************
diff --git a/ddmd/dcast.d b/ddmd/dcast.d
index 0ace1fb..a35a840 100644
--- a/ddmd/dcast.d
+++ b/ddmd/dcast.d
@@ -19,12 +19,10 @@ import ddmd.declaration;
 import ddmd.dscope;
 import ddmd.dstruct;
 import ddmd.dsymbol;
-import ddmd.dtemplate;
 import ddmd.errors;
 import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
-import ddmd.id;
 import ddmd.impcnvtab;
 import ddmd.init;
 import ddmd.intrange;
@@ -33,7 +31,6 @@ import ddmd.opover;
 import ddmd.root.longdouble;
 import ddmd.root.outbuffer;
 import ddmd.root.rmem;
-import ddmd.root.rootobject;
 import ddmd.tokens;
 import ddmd.utf;
 import ddmd.visitor;
diff --git a/ddmd/dclass.d b/ddmd/dclass.d
index 8fc473e..e7e07b7 100644
--- a/ddmd/dclass.d
+++ b/ddmd/dclass.d
@@ -17,7 +17,6 @@ import ddmd.gluelayer;
 import ddmd.clone;
 import ddmd.declaration;
 import ddmd.dmodule;
-import ddmd.doc;
 import ddmd.dscope;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
@@ -29,9 +28,7 @@ import ddmd.id;
 import ddmd.identifier;
 import ddmd.mtype;
 import ddmd.objc;
-import ddmd.root.outbuffer;
 import ddmd.root.rmem;
-import ddmd.root.rootobject;
 import ddmd.statement;
 import ddmd.target;
 import ddmd.visitor;
diff --git a/ddmd/declaration.d b/ddmd/declaration.d
index 5c0f3fb..76c0343 100644
--- a/ddmd/declaration.d
+++ b/ddmd/declaration.d
@@ -11,16 +11,9 @@ module ddmd.declaration;
 import core.stdc.stdio;
 import ddmd.aggregate;
 import ddmd.arraytypes;
-import ddmd.attrib;
-import ddmd.cppmangle;
-import ddmd.ctfeexpr;
 import ddmd.dcast;
 import ddmd.dclass;
-import ddmd.declaration;
 import ddmd.delegatize;
-import ddmd.dinterpret;
-import ddmd.dmangle;
-import ddmd.doc;
 import ddmd.dscope;
 import ddmd.dstruct;
 import ddmd.dsymbol;
@@ -33,13 +26,10 @@ import ddmd.hdrgen;
 import ddmd.id;
 import ddmd.identifier;
 import ddmd.init;
-import ddmd.inline;
 import ddmd.intrange;
 import ddmd.mtype;
-import ddmd.opover;
 import ddmd.root.outbuffer;
 import ddmd.root.rootobject;
-import ddmd.statement;
 import ddmd.target;
 import ddmd.tokens;
 import ddmd.visitor;
diff --git a/ddmd/denum.d b/ddmd/denum.d
index 30a4ba5..e80ff5f 100644
--- a/ddmd/denum.d
+++ b/ddmd/denum.d
@@ -9,22 +9,18 @@
 module ddmd.denum;
 
 import core.stdc.stdio;
-import ddmd.access;
 import ddmd.gluelayer;
 import ddmd.declaration;
 import ddmd.dmodule;
-import ddmd.doc;
 import ddmd.dscope;
 import ddmd.dsymbol;
 import ddmd.errors;
 import ddmd.expression;
 import ddmd.globals;
-import ddmd.hdrgen;
 import ddmd.id;
 import ddmd.identifier;
 import ddmd.init;
 import ddmd.mtype;
-import ddmd.root.outbuffer;
 import ddmd.tokens;
 import ddmd.visitor;
 
diff --git a/ddmd/dimport.d b/ddmd/dimport.d
index 64dba81..9a01049 100644
--- a/ddmd/dimport.d
+++ b/ddmd/dimport.d
@@ -12,7 +12,6 @@ import core.stdc.string;
 import core.stdc.stdio;
 
 import ddmd.arraytypes;
-import ddmd.attrib;
 import ddmd.declaration;
 import ddmd.dmodule;
 import ddmd.dscope;
diff --git a/ddmd/dinifile.d b/ddmd/dinifile.d
index 2a1bc6f..eae07ef 100644
--- a/ddmd/dinifile.d
+++ b/ddmd/dinifile.d
@@ -13,14 +13,12 @@
 module ddmd.dinifile;
 
 import core.stdc.ctype;
-import core.stdc.stdlib;
 import core.stdc.string;
 import core.sys.posix.stdlib;
 import core.sys.windows.windows;
 
 import ddmd.errors;
 import ddmd.globals;
-import ddmd.root.file;
 import ddmd.root.filename;
 import ddmd.root.outbuffer;
 import ddmd.root.port;
diff --git a/ddmd/dmacro.d b/ddmd/dmacro.d
index 191057e..4fc84c7 100644
--- a/ddmd/dmacro.d
+++ b/ddmd/dmacro.d
@@ -15,7 +15,6 @@ import ddmd.errors;
 import ddmd.globals;
 import ddmd.root.outbuffer;
 import ddmd.root.rmem;
-import ddmd.utf;
 
 struct Macro
 {
diff --git a/ddmd/dmangle.d b/ddmd/dmangle.d
index 90082c1..76b2500 100644
--- a/ddmd/dmangle.d
+++ b/ddmd/dmangle.d
@@ -19,16 +19,13 @@ import ddmd.cppmangle;
 import ddmd.dclass;
 import ddmd.declaration;
 import ddmd.dmodule;
-import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
-import ddmd.errors;
 import ddmd.expression;
 import ddmd.func;
 import ddmd.globals;
 import ddmd.id;
 import ddmd.mtype;
-import ddmd.root.longdouble;
 import ddmd.root.outbuffer;
 import ddmd.root.port;
 import ddmd.utf;
diff --git a/ddmd/expression.d b/ddmd/expression.d
index 456becc..ea6e239 100644
--- a/ddmd/expression.d
+++ b/ddmd/expression.d
@@ -66,7 +66,8 @@ import ddmd.sideeffect;
 import ddmd.statement;
 import ddmd.target;
 import ddmd.tokens;
-import ddmd.traits;
+// IN_LLVM Forward reference from ddmd.traits, to break import cycle. Should not be needed for 2.072 fe.
+extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc);
 // IN_LLVM import ddmd.typinf;
 import ddmd.utf;
 import ddmd.visitor;
diff --git a/ddmd/hdrgen.d b/ddmd/hdrgen.d
index 28e9c48..c72ae58 100644
--- a/ddmd/hdrgen.d
+++ b/ddmd/hdrgen.d
@@ -24,7 +24,6 @@ import ddmd.denum;
 import ddmd.dimport;
 import ddmd.dmodule;
 import ddmd.doc;
-import ddmd.dscope;
 import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
@@ -39,7 +38,6 @@ import ddmd.mars;
 import ddmd.mtype;
 import ddmd.nspace;
 import ddmd.parse;
-import ddmd.root.longdouble;
 import ddmd.root.outbuffer;
 import ddmd.root.port;
 import ddmd.root.rootobject;
diff --git a/ddmd/mars.d b/ddmd/mars.d
index 95c9227..76ef26f 100644
--- a/ddmd/mars.d
+++ b/ddmd/mars.d
@@ -18,7 +18,6 @@ module ddmd.mars;
 import core.stdc.ctype;
 import core.stdc.errno;
 import core.stdc.limits;
-import core.stdc.stdint;
 import core.stdc.stdio;
 import core.stdc.stdlib;
 import core.stdc.string;
@@ -40,7 +39,6 @@ import ddmd.id;
 import ddmd.identifier;
 import ddmd.inline;
 import ddmd.json;
-import ddmd.lexer;
 // IN_LLVM import ddmd.lib;
 // IN_LLVM import ddmd.link;
 import ddmd.mtype;
@@ -55,7 +53,6 @@ import ddmd.root.rmem;
 import ddmd.root.stringtable;
 import ddmd.target;
 import ddmd.tokens;
-import ddmd.traits;
 
 
 /**
diff --git a/ddmd/traits.d b/ddmd/traits.d
index cf95f45..2a7b1fd 100644
--- a/ddmd/traits.d
+++ b/ddmd/traits.d
@@ -12,14 +12,10 @@ import core.stdc.stdio;
 import core.stdc.string;
 import ddmd.aggregate;
 import ddmd.arraytypes;
-import ddmd.attrib;
 import ddmd.canthrow;
 import ddmd.dclass;
 import ddmd.declaration;
-import ddmd.denum;
-import ddmd.dimport;
 import ddmd.dscope;
-import ddmd.dstruct;
 import ddmd.dsymbol;
 import ddmd.dtemplate;
 import ddmd.errors;
@@ -33,7 +29,6 @@ import ddmd.identifier;
 import ddmd.mtype;
 import ddmd.nogc;
 import ddmd.root.array;
-import ddmd.root.rootobject;
 import ddmd.root.speller;
 import ddmd.root.stringtable;
 import ddmd.tokens;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git



More information about the pkg-d-commits mailing list