Fix #13550 Remove boostForeachError/checkboost.cpp

lib/tokenize.cpp

@@ -5500,10 +5500,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     // if MACRO
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "if|for|while|BOOST_FOREACH %name% (")) {
+        if (Token::Match(tok, "if|for|while %name% (")) {
             if (Token::simpleMatch(tok, "for each")) {
-                // 'for each ( )' -> 'asm ( )'
-                tok->str("asm");
+                // 'for each (x in y )' -> 'for (x : y)'
+                if (Token* in = Token::findsimplematch(tok->tokAt(2), "in", tok->linkAt(2)))
+                    in->str(":");
                 tok->deleteNext();
             } else if (tok->strAt(1) == "constexpr") {
                 tok->deleteNext();

test/cfg/boost.cpp

@@ -19,6 +19,10 @@
 #include <boost/thread/lock_guard.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/core/scoped_enum.hpp>
+#include <boost/foreach.hpp>
+
+#include <set>
+#include <vector>
 
 BOOST_FORCEINLINE void boost_forceinline_test()
 {}
@@ -108,6 +112,59 @@ void lock_guard_finiteLifetime(boost::mutex& m)
     boost::lock_guard<boost::mutex>{ m };
 }
 
+void test_BOOST_FOREACH_1()
+{
+    std::vector<int> data;
+    BOOST_FOREACH(int i, data) {
+        // cppcheck-suppress invalidContainerLoop
+        data.push_back(123);
+    }
+}
+
+void test_BOOST_FOREACH_2()
+{
+    std::set<int> data;
+    BOOST_FOREACH(int i, data) {
+        // cppcheck-suppress invalidContainerLoop
+        data.insert(123);
+    }
+}
+
+void test_BOOST_FOREACH_3()
+{
+    std::set<int> data;
+    BOOST_FOREACH(const int& i, data) {
+        // cppcheck-suppress invalidContainerLoop
+        data.erase(123);
+    }
+}
+
+// Check single line usage
+void test_BOOST_FOREACH_4()
+{
+    std::set<int> data;
+    BOOST_FOREACH(const int& i, data)
+        // cppcheck-suppress invalidContainerLoop
+        data.clear();
+}
+
+// Container returned as result of a function -> Be quiet
+void test_BOOST_FOREACH_5()
+{
+    BOOST_FOREACH(const int& i, get_data())
+        data.insert(i);
+}
+
+// Break after modification (#4788)
+void test_BOOST_FOREACH_6()
+{
+    std::vector<int> data;
+    BOOST_FOREACH(int i, data) {
+        data.push_back(123);
+        break;
+    }
+}
+
 BOOST_AUTO_TEST_SUITE(my_auto_test_suite)
 
 BOOST_AUTO_TEST_CASE(test_message_macros)
@@ -127,4 +184,4 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(my_tuple_test, T, test_types_w_tuples)
     BOOST_TEST(sizeof(T) == 4U);
 }
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()

test/testtokenize.cpp

@@ -918,9 +918,9 @@ class TestTokenizer : public TestFixture {
     void foreach () {
         // #3690,#5154
         const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }";
-        ASSERT_EQUALS("void f ( ) { asm ( \"char c in MyString\" ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code));
+        ASSERT_EQUALS("void f ( ) { for ( char c : MyString ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code));
         ASSERT_EQUALS(
-            "[test.cpp:1]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable c\n",
+            "[test.cpp:1]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable MyString\n",
             errout_str());
     }
 

test/testuninitvar.cpp

@@ -2145,7 +2145,7 @@ class TestUninitVar : public TestFixture {
                        "    static const struct ab {\n"
                        "        int a,b;\n"
                        "        int get_a() { return a; }"
-                       "    } = { 0, 0 };\n"
+                       "    } x = { 0, 0 };\n"
                        "}", true, false);
         ASSERT_EQUALS("", errout_str());