Merge branch 'develop' into externalFunctionsInLibraries

2 files changed, 20 insertions, 0 deletions

diff --git a/test/libsolidity/syntaxTests/docstring_empty_description.sol b/test/libsolidity/syntaxTests/docstring_empty_description.sol
new file mode 100644
index 00000000..0caa1b23
--- /dev/null
+++ b/test/libsolidity/syntaxTests/docstring_empty_description.sol
@@ -0,0 +1,6 @@
+contract C {
+    /// @param id
+    function vote(uint id) public;
+}
+// ----
+// DocstringParsingError: No description given for param id
diff --git a/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol b/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol
new file mode 100644
index 00000000..b033fd0c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/virtualLookup/modifiers_in_libraries.sol
@@ -0,0 +1,14 @@
+library WithModifier {
+    modifier mod() { require(msg.value > 10 ether); _; }
+    function withMod(uint self) mod() internal view { require(self > 0); }
+}
+
+contract Test {
+    using WithModifier for *;
+
+    function f(uint _value) public payable {
+        _value.withMod();
+        WithModifier.withMod(_value);
+    }
+}
+// ----