Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 10 insertions, 0 deletions

diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
new file mode 100644
index 00000000..705fbadf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
@@ -0,0 +1,10 @@
+contract A {
+    function f() public {
+        uint x = 3 > 0 ? 3 : 0;
+        uint y = (3 > 0) ? 3 : 0;
+    }
+}
+// ----
+// Warning: (47-53): Unused local variable.
+// Warning: (79-85): Unused local variable.
+// Warning: (17-110): Function state mutability can be restricted to pure