From 53db8bf9eee31c9e47ea866146db883c83dae61a Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 17 Mar 2019 06:21:00 +0100 Subject: [PATCH 1/3] upgrade dependencies --- .travis.yml | 1 + containers | 2 +- dsymbol | 2 +- dub.json | 6 +++--- libdparse | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 860ed04..a5ac3ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial sudo: false language: d d: diff --git a/containers b/containers index 836a0cc..257c041 160000 --- a/containers +++ b/containers @@ -1 +1 @@ -Subproject commit 836a0cc93a98815ac309294c45aab0ba98018073 +Subproject commit 257c0418f34709dd667f95b5dffabedc2b3099e4 diff --git a/dsymbol b/dsymbol index de7389b..ff8f1fe 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit de7389be5dda532ef7cd431d03efbfe6b9522687 +Subproject commit ff8f1feb456a24cb88b7a01fff709691e9b0d58d diff --git a/dub.json b/dub.json index 4ec3cda..17127d7 100644 --- a/dub.json +++ b/dub.json @@ -7,11 +7,11 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.6.0", - "libdparse": "~>0.11.2", + "dsymbol": "~>0.6.3", + "libdparse": "~>0.11.4", "msgpack-d": "~>1.0.0-beta.7", "stdx-allocator": "~>2.77.5", - "emsi_containers": "0.8.0-alpha.11" + "emsi_containers": "~>0.8.0-alpha.13" }, "stringImportPaths" : [ "bin" diff --git a/libdparse b/libdparse index 23b20de..aae3719 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 23b20de4ee48ed3f0e8729f6318405543cb3a611 +Subproject commit aae371931a99027465952cd6fdaede4eb4743e76 From 33a673836e3f8d66c03347a506856593d4ac4c82 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 28 Mar 2019 13:17:36 +0100 Subject: [PATCH 2/3] update dsymbol to fix #592, and to also to fix #593 --- dsymbol | 2 +- dub.json | 2 +- tests/tc010/expected1.txt | 1 + tests/tc010/expected2.txt | 1 + tests/tc_accesschain_type/expected.txt | 2 ++ tests/tc_accesschain_type/file.d | 1 + tests/tc_accesschain_type/run.sh | 5 +++++ tests/tc_anon_class/expected1.txt | 1 + tests/tc_anon_struct/expected.txt | 2 ++ tests/tc_anon_struct/file.d | 1 + tests/tc_anon_struct/run.sh | 5 +++++ 11 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 tests/tc_accesschain_type/expected.txt create mode 100644 tests/tc_accesschain_type/file.d create mode 100755 tests/tc_accesschain_type/run.sh create mode 100644 tests/tc_anon_struct/expected.txt create mode 100644 tests/tc_anon_struct/file.d create mode 100755 tests/tc_anon_struct/run.sh diff --git a/dsymbol b/dsymbol index ff8f1fe..5b7f06f 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit ff8f1feb456a24cb88b7a01fff709691e9b0d58d +Subproject commit 5b7f06ff005c63a2bf22db0736097ef35b9d36e7 diff --git a/dub.json b/dub.json index 17127d7..7cdd8a5 100644 --- a/dub.json +++ b/dub.json @@ -7,7 +7,7 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.6.3", + "dsymbol": "~>0.6.4", "libdparse": "~>0.11.4", "msgpack-d": "~>1.0.0-beta.7", "stdx-allocator": "~>2.77.5", diff --git a/tests/tc010/expected1.txt b/tests/tc010/expected1.txt index e5c7ec8..6e049e4 100644 --- a/tests/tc010/expected1.txt +++ b/tests/tc010/expected1.txt @@ -1,4 +1,5 @@ identifiers +Base l __monitor v __vptr v alignof k diff --git a/tests/tc010/expected2.txt b/tests/tc010/expected2.txt index c7562af..d888baa 100644 --- a/tests/tc010/expected2.txt +++ b/tests/tc010/expected2.txt @@ -1,4 +1,5 @@ identifiers +Base l __monitor v __vptr v alignof k diff --git a/tests/tc_accesschain_type/expected.txt b/tests/tc_accesschain_type/expected.txt new file mode 100644 index 0000000..0d36946 --- /dev/null +++ b/tests/tc_accesschain_type/expected.txt @@ -0,0 +1,2 @@ +identifiers +foo f diff --git a/tests/tc_accesschain_type/file.d b/tests/tc_accesschain_type/file.d new file mode 100644 index 0000000..a13be38 --- /dev/null +++ b/tests/tc_accesschain_type/file.d @@ -0,0 +1 @@ +interface Base {void foo();} class Derived : Base {int i; void foo(){}} void main(){Derived d; d.Base.f} diff --git a/tests/tc_accesschain_type/run.sh b/tests/tc_accesschain_type/run.sh new file mode 100755 index 0000000..3495fd8 --- /dev/null +++ b/tests/tc_accesschain_type/run.sh @@ -0,0 +1,5 @@ +set -e +set -u + +../../bin/dcd-client $1 file.d -c103 > actual.txt +diff actual.txt expected.txt diff --git a/tests/tc_anon_class/expected1.txt b/tests/tc_anon_class/expected1.txt index 587e116..85aa46f 100644 --- a/tests/tc_anon_class/expected1.txt +++ b/tests/tc_anon_class/expected1.txt @@ -1,4 +1,5 @@ identifiers +Bar l __monitor v __vptr v alignof k diff --git a/tests/tc_anon_struct/expected.txt b/tests/tc_anon_struct/expected.txt new file mode 100644 index 0000000..94aeb9b --- /dev/null +++ b/tests/tc_anon_struct/expected.txt @@ -0,0 +1,2 @@ +identifiers +avariable v diff --git a/tests/tc_anon_struct/file.d b/tests/tc_anon_struct/file.d new file mode 100644 index 0000000..4741f69 --- /dev/null +++ b/tests/tc_anon_struct/file.d @@ -0,0 +1 @@ +struct Foo { struct { int avariable; } } void main(){ Foo foo; foo.ava } diff --git a/tests/tc_anon_struct/run.sh b/tests/tc_anon_struct/run.sh new file mode 100755 index 0000000..06bbeb3 --- /dev/null +++ b/tests/tc_anon_struct/run.sh @@ -0,0 +1,5 @@ +set -e +set -u + +../../bin/dcd-client $1 file.d -c70 > actual.txt +diff actual.txt expected.txt From 26b1be49d6b4d11efc161b1008dad6317247898f Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sat, 30 Mar 2019 17:28:35 +0100 Subject: [PATCH 3/3] Add test case for empty modules fix was dlang-community/dsymbol#117 --- tests/tc_empty_module/expected.txt | 0 tests/tc_empty_module/file.d | 1 + tests/tc_empty_module/run.sh | 5 +++++ 3 files changed, 6 insertions(+) create mode 100644 tests/tc_empty_module/expected.txt create mode 100644 tests/tc_empty_module/file.d create mode 100755 tests/tc_empty_module/run.sh diff --git a/tests/tc_empty_module/expected.txt b/tests/tc_empty_module/expected.txt new file mode 100644 index 0000000..e69de29 diff --git a/tests/tc_empty_module/file.d b/tests/tc_empty_module/file.d new file mode 100644 index 0000000..44e2515 --- /dev/null +++ b/tests/tc_empty_module/file.d @@ -0,0 +1 @@ +import empty: diff --git a/tests/tc_empty_module/run.sh b/tests/tc_empty_module/run.sh new file mode 100755 index 0000000..e2b0ddb --- /dev/null +++ b/tests/tc_empty_module/run.sh @@ -0,0 +1,5 @@ +set -e +set -u + +../../bin/dcd-client $1 file.d --extended -c$(stat -c %s file.d) > actual.txt +diff actual.txt expected.txt