From 4769678112f2cad98b92f54583d96a0786d43e20 Mon Sep 17 00:00:00 2001 From: Ulya Trofimovich Date: Fri, 1 Jan 2016 10:11:56 +0000 Subject: [PATCH] Renamed files and function. --- re2c/Makefile.am | 4 ++-- re2c/src/ir/compile.cc | 2 +- re2c/src/ir/dfa/{dfa.cc => determinization.cc} | 0 re2c/src/ir/dfa/dfa.h | 6 +++--- re2c/src/ir/dfa/{minimize.cc => minimization.cc} | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) rename re2c/src/ir/dfa/{dfa.cc => determinization.cc} (100%) rename re2c/src/ir/dfa/{minimize.cc => minimization.cc} (95%) diff --git a/re2c/Makefile.am b/re2c/Makefile.am index 3b8122dd..08395912 100644 --- a/re2c/Makefile.am +++ b/re2c/Makefile.am @@ -91,8 +91,8 @@ SRC = \ src/ir/adfa/adfa.cc \ src/ir/adfa/prepare.cc \ src/ir/adfa/scc.cc \ - src/ir/dfa/dfa.cc \ - src/ir/dfa/minimize.cc \ + src/ir/dfa/determinization.cc \ + src/ir/dfa/minimization.cc \ src/ir/regexp/display.cc \ src/ir/regexp/encoding/enc.cc \ src/ir/regexp/encoding/range_suffix.cc \ diff --git a/re2c/src/ir/compile.cc b/re2c/src/ir/compile.cc index 3633c28f..8afd6cf3 100644 --- a/re2c/src/ir/compile.cc +++ b/re2c/src/ir/compile.cc @@ -54,7 +54,7 @@ smart_ptr compile (Spec & spec, Output & output, const std::string & cond, // but prior to any other DFA transformations Skeleton *skeleton = new Skeleton(dfa, cs, spec.rules, name, cond, line); - dfa.minimize(); + dfa.minimization(); // ADFA stands for 'DFA with actions' DFA *adfa = new DFA(dfa, skeleton, cs, name, cond, line); diff --git a/re2c/src/ir/dfa/dfa.cc b/re2c/src/ir/dfa/determinization.cc similarity index 100% rename from re2c/src/ir/dfa/dfa.cc rename to re2c/src/ir/dfa/determinization.cc diff --git a/re2c/src/ir/dfa/dfa.h b/re2c/src/ir/dfa/dfa.h index b30edbf8..5b72a139 100644 --- a/re2c/src/ir/dfa/dfa.h +++ b/re2c/src/ir/dfa/dfa.h @@ -52,11 +52,11 @@ struct dfa_t dfa_t(const nfa_t &nfa, const charset_t &charset, rules_t &rules); ~dfa_t(); - void minimize(); + void minimization(); private: - void minimize_table(size_t *part); - void minimize_moore(size_t *part); + void minimization_table(size_t *part); + void minimization_moore(size_t *part); }; } // namespace re2c diff --git a/re2c/src/ir/dfa/minimize.cc b/re2c/src/ir/dfa/minimization.cc similarity index 95% rename from re2c/src/ir/dfa/minimize.cc rename to re2c/src/ir/dfa/minimization.cc index 035afd64..851b3fac 100644 --- a/re2c/src/ir/dfa/minimize.cc +++ b/re2c/src/ir/dfa/minimization.cc @@ -8,7 +8,7 @@ namespace re2c { -void dfa_t::minimize() +void dfa_t::minimization() { const size_t count = states.size(); @@ -16,8 +16,8 @@ void dfa_t::minimize() switch (opts->dfa_minimization) { - case TABLE: minimize_table(part); break; - case MOORE: minimize_moore(part); break; + case TABLE: minimization_table(part); break; + case MOORE: minimization_moore(part); break; } for (size_t i = 0; i < count; ++i) @@ -54,7 +54,7 @@ void dfa_t::minimize() * the same symbol that go to distinguishable states. The algorithm * loops until the matrix stops changing. */ -void dfa_t::minimize_table(size_t *part) +void dfa_t::minimization_table(size_t *part) { const size_t count = states.size(); @@ -134,7 +134,7 @@ void dfa_t::minimize_table(size_t *part) * the same set of states. * The algorithm loops until partition stops changing. */ -void dfa_t::minimize_moore(size_t *part) +void dfa_t::minimization_moore(size_t *part) { const size_t count = states.size(); -- 2.40.0