Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 17 insertions, 0 deletions

diff --git a/test/libsolidity/ASTJSON/documentation.sol b/test/libsolidity/ASTJSON/documentation.sol
new file mode 100644
index 00000000..e65af9b4
--- /dev/null
+++ b/test/libsolidity/ASTJSON/documentation.sol
@@ -0,0 +1,17 @@
+// ---- SOURCE: a
+
+/**This contract is empty*/ contract C {}
+
+// ---- SOURCE: b
+
+/**This contract is empty
+ and has a line-breaking comment.*/
+contract C {}
+
+// ---- SOURCE: c
+
+contract C {
+  /** Some comment on Evt.*/ event Evt();
+  /** Some comment on mod.*/ modifier mod() { _; }
+  /** Some comment on fn.*/ function fn() public {}
+}