Fix jeremy-rifkin#26

src/assert.cpp

@@ -1037,6 +1037,10 @@ namespace libassert::detail {
         return type;
     }
 
+    // forward declaration so this can be used in some printbugging
+    LIBASSERT_ATTR_COLD
+    std::string highlight(const std::string& expression);
+
     class analysis {
         enum class token_e {
             keyword,
@@ -1587,8 +1591,9 @@ namespace libassert::detail {
                 std::vector<std::string> right_strings;
                 for(size_t i = 0; i < m; i++) left_strings.push_back(tokens[i].str);
                 for(size_t i = m + 1; i < tokens.size(); i++) right_strings.push_back(tokens[i].str);
-                fprintf(stderr, "left:  %s\n", highlight(std::string(trim(join(left_strings, "")))).c_str());
-                fprintf(stderr, "right: %s\n", highlight(std::string(trim(join(right_strings, "")))).c_str());
+                fprintf(stderr, "left:  %s\n", libassert::detail::highlight(std::string(trim(join(left_strings, "")))).c_str());
+                fprintf(stderr, "right: %s\n", libassert::detail::highlight(std::string(trim(join(right_strings, "")))).c_str());
+                fprintf(stderr, "target_op: %s\n", target_op.data()); // should be null terminated
                 fprintf(stderr, "---\n");
             }
             #endif
@@ -1599,7 +1604,8 @@ namespace libassert::detail {
                 for(size_t i = 0; i < m; i++) {
                     left_strings.push_back(tokens[i].str);
                 }
-                for(size_t i = m + 1; i < tokens.size(); i++) {
+                // >> is decomposed and requires special handling (m will be the index of the first > token)
+                for(size_t i = m + 1 + (target_op == ">>" ? 1 : 0); i < tokens.size(); i++) {
                     right_strings.push_back(tokens[i].str);
                 }
                 return {

tests/integration/expected/clang.txt

@@ -656,6 +656,20 @@ Stack trace:
       at integration.cpp:402
 
 
+Assertion failed at integration/integration.cpp:2116: void test_class<int>::something_else() [T = int]:
+    assert(a >> 1);
+    Where:
+        a => 1
+
+Stack trace:
+# 1 test_class<int>::something_else()
+      at integration.cpp:2116
+# 2 void test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 3 main
+      at integration.cpp:402
+
+
 ===================== [ensure values are only computed once] =====================
 foo() called
 bar() called

tests/integration/expected/clang_windows.txt

@@ -656,6 +656,20 @@ Stack trace:
       at integration.cpp:403
 
 
+Assertion failed at integration/integration.cpp:2116: void test_class<int>::something_else() [T = int]:
+    assert(a >> 1);
+    Where:
+        a => 1
+
+Stack trace:
+# 1 test_class<int>::something_else()
+      at integration.cpp:2116
+# 2 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1005
+# 3 main()
+      at integration.cpp:403
+
+
 ===================== [ensure values are only computed once] =====================
 foo() called
 bar() called

tests/integration/expected/gcc.txt

@@ -656,6 +656,20 @@ Stack trace:
       at integration.cpp:403
 
 
+Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
+    assert(a >> 1);
+    Where:
+        a => 1
+
+Stack trace:
+# 1 test_class<int>::something_else()
+      at integration.cpp:2116
+# 2 void test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1005
+# 3 main
+      at integration.cpp:403
+
+
 ===================== [ensure values are only computed once] =====================
 bar() called
 foo() called

tests/integration/expected/gcc_windows.txt

@@ -656,6 +656,20 @@ Stack trace:
       at integration.cpp:403
 
 
+Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
+    assert(a >> 1);
+    Where:
+        a => 1
+
+Stack trace:
+# 1 test_class<int>::something_else()
+      at integration.cpp:2116
+# 2 void test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1005
+# 3 main
+      at integration.cpp:403
+
+
 ===================== [ensure values are only computed once] =====================
 bar() called
 foo() called

tests/integration/expected/msvc.txt

@@ -649,7 +649,21 @@ Assertion failed at integration/integration.cpp:2114: void __cdecl test_class<in
 
 Stack trace:
 # 1 test_class<int>::something_else()
-      at integration.cpp:2117
+      at integration.cpp:2115
+# 2 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1005
+# 3 main()
+      at integration.cpp:403
+
+
+Assertion failed at integration/integration.cpp:2116: void __cdecl test_class<int>::something_else(void):
+    assert(a >> 1);
+    Where:
+        a => 1
+
+Stack trace:
+# 1 test_class<int>::something_else()
+      at integration.cpp:2119
 # 2 test_class<int>::something<N>(std::pair<N, int>)
       at integration.cpp:1005
 # 3 main()

tests/integration/integration.cpp

@@ -274,6 +274,8 @@ class test_class {
             x = 2;
             assert(x -= x -= x -= 1); // TODO: double check....
             assert(true ? false : true, "pffft"); // NOLINT(readability-simplify-boolean-expr)
+            int a = 1; // regression test for #26
+            assert(a >> 1);
         }
         // ensure values are only computed once
         SECTION("ensure values are only computed once");