From: gtsoul-tech <gtsoulkanakis@gmail.com>
Date: Mon, 13 May 2024 06:13:28 +0000 (+0300)
Subject: Merge branch 'develop' into bugFix/cppcheckError-noexplicitConstructor
X-Git-Tag: vectorscan/5.4.12^2~44^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5affdf3a1121ba5c0258b41eb328c816c1c31fa9;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into bugFix/cppcheckError-noexplicitConstructor
---

5affdf3a1121ba5c0258b41eb328c816c1c31fa9
diff --cc src/nfagraph/ng_util.cpp
index c5525cc7,da5187b4..8a05e95e
--- a/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 db837a53,86cdf5ae..6ae3854c
--- a/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_mask.cpp
index d764b6da,aa36ecd3..05f3a620
--- a/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_bytecode.cpp
index d2ef6f08,75b34084..740b4138
--- a/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