Merge pull request #601 from Basile-z/issue-600

fix #600 - Wrong scope for parameter solving in nested funcs merged-on-behalf-of: Basile-z <Basile-z@users.noreply.github.com>
dlang-community · May 12, 2019 · 3bfab29 · 3bfab29
2 parents afb2113 + abd29bc
commit 3bfab29
Show file tree

Hide file tree

Showing 7 changed files with 40 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.7.0",
-    "libdparse": "~>0.11.4",
+    "dsymbol": "~>0.8.0",
+    "libdparse": "~>0.12.0",
     "msgpack-d": "~>1.0.0-beta.7",
     "stdx-allocator": "~>2.77.5",
     "emsi_containers": "~>0.8.0-alpha.15"

diff --git a/libdparse b/libdparse
diff --git a/tests/tc_erroneous_body_content/expected1.txt b/tests/tc_erroneous_body_content/expected1.txt
@@ -0,0 +1,8 @@
+identifiers
+alignof	k
+b	v
+init	k
+mangleof	k
+sizeof	k
+stringof	k
+tupleof	k
diff --git a/tests/tc_erroneous_body_content/expected2.txt b/tests/tc_erroneous_body_content/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_erroneous_body_content/file.d b/tests/tc_erroneous_body_content/file.d
@@ -0,0 +1,13 @@
+module runnable;
+
+struct A { int a; }
+struct B { int b; }
+
+void foo(A node)
+{
+    void bar(B node)
+    {
+        node.
+    }
+    node.
+}
diff --git a/tests/tc_erroneous_body_content/run.sh b/tests/tc_erroneous_body_content/run.sh
@@ -0,0 +1,7 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file.d -c 118 > actual1.txt
+diff actual1.txt expected1.txt
+../../bin/dcd-client $1 file.d -c 134 > actual2.txt
+diff actual2.txt expected2.txt
+1 −0		src/dparse/ast.d
+21 −5		src/dparse/formatter.d
+43 −8		src/dparse/parser.d
+15 −0		test/fail_files/dcd_tricks.d
+26 −0		test/pass_files/function_literals.d