Merge pull request #512 from BBasile/issue-510

fix #510 - mixin template and alias merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
dlang-community · Jul 23, 2018 · 5a73968 · 5a73968
2 parents e5dc996 + 0e53e96
commit 5a73968
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 4 deletions.
diff --git a/dsymbol b/dsymbol
diff --git a/dub.json b/dub.json
@@ -7,8 +7,8 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "dsymbol": "~>0.3.10",
-    "libdparse": "~>0.8.7",
+    "dsymbol": "~>0.3.12",
+    "libdparse": "~>0.8.8",
     "msgpack-d": "~>1.0.0-beta.3",
     "stdx-allocator": "~>2.77.2"
   },

diff --git a/libdparse b/libdparse
diff --git a/tests/tc_named_mixin/expected1.txt b/tests/tc_named_mixin/expected1.txt
@@ -0,0 +1,9 @@
+identifiers
+alignof	k
+init	k
+mainCharacter	l
+mangleof	k
+sideCharacter	l
+sizeof	k
+stringof	k
+tupleof	k
diff --git a/tests/tc_named_mixin/expected2.txt b/tests/tc_named_mixin/expected2.txt
@@ -0,0 +1,8 @@
+identifiers
+a	v
+alignof	k
+init	k
+mangleof	k
+sizeof	k
+stringof	k
+tupleof	k
diff --git a/tests/tc_named_mixin/file1.d b/tests/tc_named_mixin/file1.d
@@ -0,0 +1,15 @@
+module tc_named_mixin;
+
+template person(){}
+
+struct nametester
+{
+    mixin person mainCharacter;
+    mixin person sideCharacter;
+}
+
+void main()
+{
+    nametester n;
+    n.
+}
diff --git a/tests/tc_named_mixin/file2.d b/tests/tc_named_mixin/file2.d
@@ -0,0 +1,20 @@
+module file2;
+
+struct Foo
+{
+    template Deep()
+    {
+        int a;
+    }
+}
+
+struct Bar
+{
+    mixin Foo.Deep d;
+}
+
+void main()
+{
+    Bar bar;
+    bar.d.
+}
diff --git a/tests/tc_named_mixin/run.sh b/tests/tc_named_mixin/run.sh
@@ -0,0 +1,8 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file1.d -c171 > actual1.txt
+diff actual1.txt expected1.txt
+
+../../bin/dcd-client $1 file2.d -c153 > actual2.txt
+diff actual2.txt expected2.txt