Merge branch 'develop' into wip-cppcheck271-part2

diff --cc examples/patbench.cc
Simple merge

diff --cc examples/pcapscan.cc
Simple merge

diff --cc src/compiler/asserts.cpp
Simple merge

diff --cc src/fdr/fdr_compile.cpp
Simple merge

diff --cc src/fdr/fdr_confirm_compile.cpp
Simple merge

diff --cc src/fdr/teddy_engine_description.cpp
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/nfagraph/ng_violet.cpp
index 635f9400bb2a8fafc8c53bc13bb73bd7ed920bf6,bf44d192565d226b69e22f345fb89cb19c444002..451376d9fe13d3ed863ad0802e0d5e1345084610
--- 1/src/nfagraph/ng_violet.cpp
--- 2/src/nfagraph/ng_violet.cpp
+++ b/src/nfagraph/ng_violet.cpp
@@@ -1813,9 -1793,8 +1801,9 @@@ void removeRedundantLiterals(RoseInGrap
  }
  
  static
- RoseInVertex getStart(RoseInGraph &vg) {
+ RoseInVertex getStart(const RoseInGraph &vg) {
      for (RoseInVertex v : vertices_range(vg)) {
 +        // cppcheck-suppress useStlAlgorithm
          if (vg[v].type == RIV_START || vg[v].type == RIV_ANCHORED_START) {
              return v;
          }

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

diff --cc src/parser/ComponentRepeat.cpp
index f4c7e3704960a4e3041d4b3d892c5bb34dd65586,3319f67b727119de531729f45bd60f7f1adfe225..05deec54d65705e02a44c8304e7150bb29d98f14
--- 1/src/parser/ComponentRepeat.cpp
--- 2/src/parser/ComponentRepeat.cpp
+++ b/src/parser/ComponentRepeat.cpp
@@@ -110,10 -110,9 +110,10 @@@ void addBase(Position base, vector<Posi
  }
  
  static
- void checkPositions(vector<PositionInfo> &v, const GlushkovBuildState &bs) {
+ void checkPositions(const vector<PositionInfo> &v, const GlushkovBuildState &bs) {
      const NFABuilder& builder = bs.getBuilder();
      for (const auto &e : v) {
 +        // cppcheck-suppress useStlAlgorithm
          if (builder.isSpecialState(e.pos)) {
              throw ParseError("Embedded anchors not supported.");
          }

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

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

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

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

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

diff --cc src/rose/rose_build_bytecode.cpp
index ef3f6fddd63172d048f8c4a0ae3f8623bff0ca02,f79817299e726723dadc99f56127b68124eadecd..7e3a9bab9d70377bba02ac8f6446930669dee94a
--- 1/src/rose/rose_build_bytecode.cpp
--- 2/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -989,8 -986,7 +989,8 @@@ bool checkSuitableForEager(bool is_pref
          return false;
      }
  
-     for (RoseVertex s : succs) {
 +    // cppcheck-suppress useStlAlgorithm
+     for (RoseVertex s : vsuccs) {
          if (build.isInETable(s)
              || contains(rg[s].literals, build.eod_event_literal_id)) {
              return false; /* Ignore EOD related prefixes */

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

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

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

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

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

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

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

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

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

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

diff --cc src/rose/rose_build_role_aliasing.cpp
index 0404a0c2296f30e55f8550d6726d7c5d4e096dbb,ae99c6261d600485c889efbbf163b1250e6b9b70..a762520d98f56b9158ae47284b9904770abba277
--- 1/src/rose/rose_build_role_aliasing.cpp
--- 2/src/rose/rose_build_role_aliasing.cpp
+++ b/src/rose/rose_build_role_aliasing.cpp
@@@ -258,10 -258,11 +258,12 @@@ bool samePredecessors(RoseVertex a, Ros
              return false;
          }
  
 +        // cppcheck-suppress useStlAlgorithm
          for (const auto &e_a : in_edges_range(a, g)) {
-             RoseEdge e = edge(source(e_a, g), b, g);
-             if (!e || g[e].rose_top != g[e_a].rose_top) {
+             auto edge_result = edge(source(e_a, g), b, g);
+             RoseEdge e = edge_result.first;
+             
+             if (!edge_result.second || g[e].rose_top != g[e_a].rose_top) {
                  DEBUG_PRINTF("bad tops\n");
                  return false;
              }
@@@ -274,9 -275,10 +276,11 @@@
  static
  bool hasCommonSuccWithBadBounds(RoseVertex a, RoseVertex b,
                                  const RoseGraph &g) {
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : out_edges_range(a, g)) {
-         if (RoseEdge e = edge(b, target(e_a, g), g)) {
+         auto edge_result = edge(b, target(e_a, g), g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              if (g[e_a].maxBound < g[e].minBound
                  || g[e].maxBound < g[e_a].minBound) {
                  return true;
@@@ -294,9 -296,10 +298,11 @@@
  static
  bool hasCommonPredWithBadBounds(RoseVertex a, RoseVertex b,
                                  const RoseGraph &g) {
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : in_edges_range(a, g)) {
-         if (RoseEdge e = edge(source(e_a, g), b, g)) {
+         auto edge_result = edge(source(e_a, g), b, g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              if (g[e_a].maxBound < g[e].minBound
                  || g[e].maxBound < g[e_a].minBound) {
                  return true;
@@@ -704,9 -705,10 +710,11 @@@ bool hasCommonPredWithDiffRoses(RoseVer
  
      const bool equal_roses = hasEqualLeftfixes(a, b, g);
  
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : in_edges_range(a, g)) {
-         if (RoseEdge e = edge(source(e_a, g), b, g)) {
+         auto edge_result = edge(source(e_a, g), b, g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              DEBUG_PRINTF("common pred, e_r=%d r_t %u,%u\n",
                           (int)equal_roses, g[e].rose_top, g[e_a].rose_top);
              if (!equal_roses) {

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

diff --cc src/smallwrite/smallwrite_build.cpp
Simple merge

diff --cc src/util/bitfield.h
Simple merge

diff --cc src/util/ue2_graph.h
Simple merge

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

diff --cc util/cross_compile.cpp
Simple merge

diff --cc util/ng_corpus_generator.cpp
Simple merge