Merge pull request #13109 from sourabhxyz/develop

Fix commandline tests not detecting a snippet with a broken free function definition

Author: Marenz

docs/contracts/using-for.rst

@@ -87,7 +87,6 @@ instead of library functions.
     }
 
     function contains(Data storage self, uint value)
-        public
         view
         returns (bool)
     {

test/cmdlineTests.sh

@@ -517,15 +517,16 @@ SOLTMPDIR=$(mktemp -d)
         opts=()
         # We expect errors if explicitly stated, or if imports
         # are used (in the style guide)
-        if grep -E "This will not compile|import \"" "$f" >/dev/null
+        if grep -E "// This will not compile" "$f" >/dev/null ||
+            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
         then
             opts=(--expect-errors)
         fi
-        if grep "This will report a warning" "$f" >/dev/null
+        if grep "// This will report a warning" "$f" >/dev/null
         then
             opts+=(--expect-warnings)
         fi
-        if grep "This may report a warning" "$f" >/dev/null
+        if grep "// This may report a warning" "$f" >/dev/null
         then
             opts+=(--ignore-warnings)
         fi