Merge branch 'develop' into wip-isildur-g-cppcheck-47-48-58

diff --cc benchmarks/benchmarks.cpp
index 489dfeb5ab18e718602846daa8e4fde15a10933f,1cf31c5f9f16e1ae6d4b5b7d2849f5fe6f19f8f0..b9f8d8cb6ab5412d8f87c7b82549e0a29a48d3c1
--- 1/benchmarks/benchmarks.cpp
--- 2/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@@ -128,12 -129,15 +129,15 @@@ static void run_benchmarks(int size, in
      }
  }
  
 -int main() {
 -    int matches[] = {0, MAX_MATCHES};
 +int main(){
 +    const int matches[] = {0, MAX_MATCHES};
      std::vector<size_t> sizes;
-     for (size_t i = 0; i < N; i++) sizes.push_back(16000 << i*2);
-     const char charset[] = "aAaAaAaAAAaaaaAAAAaaaaAAAAAAaaaAAaaa"; 
-   
+     for (size_t i = 0; i < N; i++)
+         sizes.push_back(16000 << i * 2);
+     const char charset[] = "aAaAaAaAAAaaaaAAAAaaaaAAAAAAaaaAAaaa";
+     printf("%-18s, %-12s, %-10s, %-6s, %-10s, %-9s, %-8s, %-7s\n", "Matcher",
+            "max_matches", "size", "loops", "total_sec", "avg_time", "max_bw",
+            "avg_bw");
      for (int m = 0; m < 2; m++) {
          for (size_t i = 0; i < std::size(sizes); i++) {
              MicroBenchmark bench("Shufti", sizes[i]);

diff --cc examples/patbench.cc
Simple merge

diff --cc src/nfa/shengcompile.cpp
Simple merge

diff --cc src/nfagraph/ng.cpp
Simple merge

diff --cc src/nfagraph/ng_anchored_dots.cpp
Simple merge

diff --cc src/nfagraph/ng_redundancy.cpp
Simple merge

diff --cc src/nfagraph/ng_som.cpp
Simple merge

diff --cc src/nfagraph/ng_violet.cpp
Simple merge

diff --cc src/parser/ComponentRepeat.cpp
Simple merge

diff --cc src/rose/rose_build_bytecode.cpp
index 0283b4d1c0e0bdcd8d157034acae0c9d1ed3e259,639edddcd8c9e943fbda17fd494cbd318030be54..0d3d035286cb8888ecc32cab21329956b07610bc
--- 1/src/rose/rose_build_bytecode.cpp
--- 2/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -2973,9 -2972,10 +2972,10 @@@ void buildFragmentPrograms(const RoseBu
                                              pfrag.lit_ids, lit_edge_map);
          if (pfrag.included_frag_id != INVALID_FRAG_ID &&
              !lit_prog.empty()) {
 -            auto &cfrag = fragments[pfrag.included_frag_id];
 +            const auto &cfrag = fragments[pfrag.included_frag_id];
              assert(pfrag.s.length() >= cfrag.s.length() &&
-                    !pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
+                    !pfrag.s.any_nocase() == !cfrag.s.any_nocase());
+                    /** !pfrag.s.any_nocase() >= !cfrag.s.any_nocase()); **/
              u32 child_offset = cfrag.lit_program_offset;
              DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,
                           child_offset);
@@@ -2992,8 -2992,9 +2992,8 @@@
                                                      pfrag.lit_ids);
          if (pfrag.included_delay_frag_id != INVALID_FRAG_ID &&
              !rebuild_prog.empty()) {
-             const auto &cfrag = fragments[pfrag.included_delay_frag_id];
-             assert(pfrag.s.length() >= cfrag.s.length() &&
 -            auto &cfrag = fragments[pfrag.included_delay_frag_id];
+             /** assert(pfrag.s.length() >= cfrag.s.length() && **/
+             assert(pfrag.s.length() == cfrag.s.length() &&
                     !pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
              u32 child_offset = cfrag.delay_program_offset;
              DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,

diff --cc src/rose/rose_build_merge.cpp
Simple merge

diff --cc tools/hsbench/engine_hyperscan.cpp
Simple merge