Merge pull request #7386 from ethereum/060-strict-inline-assembly

Defaulting to strict inline assembly (instead of loose)

test/libsolidity/syntaxTests/inlineAssembly/function_call_to_label.sol

@@ -1,13 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      l:
-
-      l()
-    }
-  }
-}
-// ----
-// SyntaxError: (63-64): The use of labels is disallowed. Please use "if", "switch", "for" or function calls instead.
-// SyntaxError: (63-64): Jump instructions and labels are low-level EVM features that can lead to incorrect stack access. Because of that they are discouraged. Please consider using "switch", "if" or "for" statements instead.
-// TypeError: (73-74): Attempt to call label instead of function.

test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol

@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// TypeError: (86-87): Function k used without being called.
+// ParserError: (92-93): Call or assignment expected.

test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol

@@ -7,5 +7,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError: (75-82): The use of non-functional instructions is disallowed. Please use functional notation instead.
-// SyntaxError: (95-98): The use of non-functional instructions is disallowed. Please use functional notation instead.
+// ParserError: (95-98): Expected '(' but got identifier

test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError: (75-82): Jump instructions and labels are low-level EVM features that can lead to incorrect stack access. Because of that they are discouraged. Please consider using "switch", "if" or "for" statements instead.
+// DeclarationError: (75-79): Function not found.

test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_invalid_label.sol

@@ -1,10 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      jump(xy)
-    }
-  }
-}
-// ----
-// DeclarationError: (68-70): Identifier not found.
-// SyntaxError: (63-71): Jump instructions and labels are low-level EVM features that can lead to incorrect stack access. Because of that they are discouraged. Please consider using "switch", "if" or "for" statements instead.

test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol

@@ -6,5 +6,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError: (75-80): The use of labels is disallowed. Please use "if", "switch", "for" or function calls instead.
-// SyntaxError: (75-80): Jump instructions and labels are low-level EVM features that can lead to incorrect stack access. Because of that they are discouraged. Please consider using "switch", "if" or "for" statements instead.
+// ParserError: (80-81): Call or assignment expected.

test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_tack.sol

@@ -6,5 +6,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
-// DeclarationError: (61-93): Unbalanced stack at the end of a block: 1 surplus item(s).
+// TypeError: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.

test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol

@@ -6,5 +6,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError: (75-76): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
-// DeclarationError: (61-86): Unbalanced stack at the end of a block: 1 surplus item(s).
+// ParserError: (85-86): Call or assignment expected.

test/libsolidity/syntaxTests/inlineAssembly/invalid/no_identifier_assignment.sol

@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      return := 1
-    }
-  }
-}
-// ----
-// ParserError: (70-72): Variable name must precede ":=" in assignment.

test/libsolidity/syntaxTests/inlineAssembly/invalid/no_identifier_label.sol

@@ -1,9 +0,0 @@
-contract C {
-  function f() public pure {
-    assembly {
-      return : 1
-    }
-  }
-}
-// ----
-// ParserError: (70-71): Label name must precede ":".

test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol

@@ -6,5 +6,4 @@ contract test {
     }
 }
 // ----
-// SyntaxError: (73-76): The use of non-functional instructions is disallowed. Please use functional notation instead.
-// DeclarationError: (59-86): Unbalanced stack at the end of a block: 1 missing item(s).
+// ParserError: (85-86): Expected '(' but got '}'

test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol

@@ -6,5 +6,4 @@ contract test {
     }
 }
 // ----
-// SyntaxError: (73-74): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
-// DeclarationError: (59-84): Unbalanced stack at the end of a block: 1 surplus item(s).
+// ParserError: (83-84): Call or assignment expected.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol

@@ -1,9 +1,9 @@
 contract C {
     function f() public pure {
         assembly {
-            _offset
+            let x := _offset
         }
     }
 }
 // ----
-// DeclarationError: (75-82): In variable names _slot and _offset can only be used as a suffix.
+// DeclarationError: (84-91): In variable names _slot and _offset can only be used as a suffix.

test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol

@@ -1,9 +1,9 @@
 contract C {
     function f() public pure {
         assembly {
-            _slot
+            let x := _slot
         }
     }
 }
 // ----
-// DeclarationError: (75-80): In variable names _slot and _offset can only be used as a suffix.
+// DeclarationError: (84-89): In variable names _slot and _offset can only be used as a suffix.

test/libsolidity/syntaxTests/viewPureChecker/assembly.sol

@@ -9,7 +9,7 @@ contract C {
         assembly { x := 7 }
     }
     function g() view public {
-        assembly { for {} 1 { pop(sload(0)) } { } pop(gas) }
+        assembly { for {} 1 { pop(sload(0)) } { } pop(gas()) }
     }
     function h() view public {
         assembly { function g() { pop(blockhash(20)) } }
@@ -18,6 +18,6 @@ contract C {
         assembly { pop(call(0, 1, 2, 3, 4, 5, 6)) }
     }
     function k() public {
-        assembly { pop(call(gas, 1, 2, 3, 4, 5, 6)) }
+        assembly { pop(call(gas(), 1, 2, 3, 4, 5, 6)) }
     }
 }