libre2c: renamed a couple of struct fields (cosmetic).

diff --git a/re2c/lib/regcomp.cc b/re2c/lib/regcomp.cc
index e6766c6f6c4f3c4ec21dca4448bae3a275554c8f..6da95a6cdef6fba017c362e39de962995e509a45 100644 (file)
--- a/re2c/lib/regcomp.cc
+++ b/re2c/lib/regcomp.cc
@@ -56,8 +56,8 @@ int regcomp(regex_t *preg, const char *pattern, int cflags)
         }
         if (!(cflags & REG_LEFTMOST) && !(cflags & REG_TRIE)) {
             const size_t sz = nfa->ncores * nfa->ncores;
-            preg->prec_buf1 = new int32_t[sz];
-            preg->prec_buf2 = new int32_t[sz];
+            preg->prectbl1 = new int32_t[sz];
+            preg->prectbl2 = new int32_t[sz];
         }
     }
     else {

diff --git a/re2c/lib/regex.h b/re2c/lib/regex.h
index e735745b28c7e0e55b2672021a11ddb2220496ee..8002ece69f84529248a6d530ea3d6ea5aacc80e3 100644 (file)
--- a/re2c/lib/regex.h
+++ b/re2c/lib/regex.h
@@ -44,8 +44,8 @@ struct regex_t
     regmatch_t *pmatch;
     regoff_t *regs;
     size_t *char2class;
-    int *prec_buf1;
-    int *prec_buf2;
+    int *prectbl1;
+    int *prectbl2;
     regoff_t *offsets1;
     regoff_t *offsets2;
     regoff_t *offsets3;

diff --git a/re2c/lib/regex_impl.h b/re2c/lib/regex_impl.h
index cd77e95bac1b4eddf3c9b3b073cb0ef8b240ac1e..d5f76dbbb8e5f179a2c6a855b1c2db8ea91fc985 100644 (file)
--- a/re2c/lib/regex_impl.h
+++ b/re2c/lib/regex_impl.h
@@ -71,21 +71,23 @@ struct simctx_t
     const nfa_t *nfa;
     confset_t reach;
     confset_t state;
-    int32_t *prec;
-    int32_t *prec_next;
     history_t hist;
     uint32_t hidx;
     uint32_t step;
     size_t rule;
     const char *cursor;
     const char *marker;
-    cache_t cache;
 
     regoff_t *offsets1;
     regoff_t *offsets2;
     regoff_t *offsets3;
+
     bool *done;
 
+    int32_t *prectbl1;
+    int32_t *prectbl2;
+    cache_t cache;
+
     const size_t nsub;
 
     simctx_t(const regex_t *preg, const char *string);

diff --git a/re2c/lib/regexec.cc b/re2c/lib/regexec.cc
index 6c49a421f1815ee252251ea85b9b767fc872973c..8ddfe2ff1d5e300d4a06e0a8f929eeaa10cd5819 100644 (file)
--- a/re2c/lib/regexec.cc
+++ b/re2c/lib/regexec.cc
@@ -71,19 +71,19 @@ simctx_t::simctx_t(const regex_t *preg, const char *string)
     : nfa(preg->nfa)
     , reach()
     , state()
-    , prec(preg->prec_buf1)
-    , prec_next(preg->prec_buf2)
     , hist(nfa->size, nfa->tags.size())
     , hidx(HROOT)
     , step(0)
     , rule(Rule::NONE)
     , cursor(string)
     , marker(string)
-    , cache()
     , offsets1(preg->offsets1)
     , offsets2(preg->offsets2)
     , offsets3(preg->offsets3)
     , done(preg->done)
+    , prectbl1(preg->prectbl1)
+    , prectbl2(preg->prectbl2)
+    , cache()
     , nsub(2 * (preg->re_nsub - 1))
 {
     state.reserve(nfa->size);

diff --git a/re2c/lib/regfree.cc b/re2c/lib/regfree.cc
index 97832f0d7b2a3fd9792899d236ce78fd781b9aed..a900a64b5d14323b1957a55b57efd10bb7c711e1 100644 (file)
--- a/re2c/lib/regfree.cc
+++ b/re2c/lib/regfree.cc
@@ -23,8 +23,8 @@ void regfree(regex_t *preg)
             delete[] preg->offsets3;
         }
         if (!(f & REG_LEFTMOST) && !(f & REG_TRIE)) {
-            delete[] preg->prec_buf1;
-            delete[] preg->prec_buf2;
+            delete[] preg->prectbl1;
+            delete[] preg->prectbl2;
         }
     }
     else {