Merge branch 'develop' into bugFix/cppcheckError-noexplicitConstructor

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

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

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

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

diff --cc src/nfagraph/ng_util.cpp
index c5525cc7de86aaaf988e269de80523fa2852c1c9,da5187b42a453f0050d85cc6f2528d58ef8c4a4f..8a05e95e3d534893e03a3301d20283c84c096925
--- 1/src/nfagraph/ng_util.cpp
--- 2/src/nfagraph/ng_util.cpp
+++ b/src/nfagraph/ng_util.cpp
@@@ -719,8 -717,8 +719,8 @@@ u32 removeTrailingLiteralStates(NGHolde
      clear_in_edges(g.accept, g);
      clearReports(g);
  
-     for (auto v : pred) {
+     for (auto v : predv) {
 -        NFAEdge e = add_edge(v, g.accept, g);
 +        NFAEdge e = add_edge(v, g.accept, g).first;
          g[v].reports.insert(0);
          if (is_triggered(g) && v == g.start) {
              g[e].tops.insert(DEFAULT_TOP);

diff --cc src/nfagraph/ng_violet.cpp
index db837a534393d497442b265b4ef6ba9d7fa75f4a,86cdf5ae9cdc3027bab5ccc728bfa56bfe40f283..6ae3854c57f5f8ec5ca86b2ed15cd1b6dcca653c
--- 1/src/nfagraph/ng_violet.cpp
--- 2/src/nfagraph/ng_violet.cpp
+++ b/src/nfagraph/ng_violet.cpp
@@@ -1969,8 -1968,8 +1969,8 @@@ void restoreTrailingLiteralStates(NGHol
          prev = curr;
      }
  
-     for (auto v : preds) {
+     for (auto v : lpreds) {
 -        NFAEdge e = add_edge_if_not_present(v, prev, g);
 +        NFAEdge e = add_edge_if_not_present(v, prev, g).first;
          if (v == g.start && is_triggered(g)) {
              g[e].tops.insert(DEFAULT_TOP);
          }

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

diff --cc src/rose/rose_build_add_mask.cpp
index d764b6daf8e6f28dff273a55635442ca595f4f1b,aa36ecd3285ed0dd44c8817762c714e093475c0e..05f3a6209a07ba56fe71019565bd50bc21c57a6a
--- 1/src/rose/rose_build_add_mask.cpp
--- 2/src/rose/rose_build_add_mask.cpp
+++ b/src/rose/rose_build_add_mask.cpp
@@@ -578,11 -577,11 +577,11 @@@ unique_ptr<NGHolder> buildMaskRhs(cons
              h[u].reports.insert(reports.begin(), reports.end());
          }
          h[u].char_reach = mask[m_idx--];
-         add_edge(u, succ, h);
-         succ = u;
+         add_edge(u, asucc, h);
+         asucc = u;
      }
  
-     NFAEdge e = add_edge(h.start, succ, h).first;
 -    NFAEdge e = add_edge(h.start, asucc, h);
++    NFAEdge e = add_edge(h.start, asucc, h).first;
      h[e].tops.insert(DEFAULT_TOP);
  
      return rhs;

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

diff --cc src/rose/rose_build_bytecode.cpp
index d2ef6f087ba9724d6157bc8f079c3dc33eb2c633,75b3408479477a87a289dbe107d1f17157d232f8..740b4138108497dd75a3194d89cc0ad90e62712d
--- 1/src/rose/rose_build_bytecode.cpp
--- 2/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -1054,7 -1054,7 +1054,7 @@@ left_id updateLeftfixWithEager(RoseGrap
          DEBUG_PRINTF("added %u literal chars back, new lag %u\n", lag_adjust,
                       g[v].left.lag);
      }
-     left_id leftfix = left_id(left_id(g[succs[0]].left));
 -    left_id leftfix = g[vsuccs[0]].left;
++    left_id leftfix = left_id(left_id(g[vsuccs[0]].left));
  
      if (leftfix.graph()) {
          assert(leftfix.graph()->kind == NFA_PREFIX

diff --cc src/rose/rose_build_compile.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_role_aliasing.cpp
Simple merge