Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 8 insertions, 0 deletions

diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol
new file mode 100644
index 00000000..7489aaf9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/conditional_with_assignment.sol
@@ -0,0 +1,8 @@
+contract A {
+    function f() public pure {
+        uint y = 1;
+        uint x = 3 < 0 ? y = 3 : 6;
+        true ? x = 3 : 4;
+    }
+}
+// ----