Moved source files to a proper subdirectory.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index 5f0078c790203f13779f84678555b7b484a7a81b..99a4337d43e48cded92e6654a82bb07201b794e3 100644 (file)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -17,7 +17,6 @@ SRC_HDR = \
        src/codegen/label.h \
        src/codegen/output.h \
        src/codegen/print.h \
-       src/codegen/scc.h \
        src/codegen/skeleton/path.h \
        src/codegen/skeleton/way.h \
        src/codegen/skeleton/skeleton.h \
@@ -27,6 +26,7 @@ SRC_HDR = \
        src/ir/bytecode/nfa.h \
        src/ir/adfa/action.h \
        src/ir/adfa/adfa.h \
+       src/ir/adfa/scc.h \
        src/ir/dfa/dfa.h \
        src/ir/regexp/encoding/case.h \
        src/ir/regexp/encoding/enc.h \
@@ -75,7 +75,6 @@ SRC = \
        src/codegen/emit_action.cc \
        src/codegen/emit_dfa.cc \
        src/codegen/label.cc \
-       src/codegen/prepare_dfa.cc \
        src/codegen/go_construct.cc \
        src/codegen/go_destruct.cc \
        src/codegen/go_emit.cc \
@@ -83,7 +82,6 @@ SRC = \
        src/codegen/input_api.cc \
        src/codegen/output.cc \
        src/codegen/print.cc \
-       src/codegen/scc.cc \
        src/codegen/skeleton/control_flow.cc \
        src/codegen/skeleton/generate_code.cc \
        src/codegen/skeleton/generate_data.cc \
@@ -99,6 +97,8 @@ SRC = \
        src/ir/nfa/nfa.cc \
        src/ir/nfa/split.cc \
        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/regexp/display.cc \

diff --git a/re2c/src/codegen/prepare_dfa.cc b/re2c/src/ir/adfa/prepare.cc
similarity index 99%
rename from re2c/src/codegen/prepare_dfa.cc
rename to re2c/src/ir/adfa/prepare.cc
index c1a31cce56c6948f453288fcc58bc6438751c223..6f14f92bbc1fc2376a31209b01edc5c15b9408f3 100644 (file)
--- a/re2c/src/codegen/prepare_dfa.cc
+++ b/re2c/src/ir/adfa/prepare.cc
@@ -4,11 +4,11 @@
 
 #include "src/codegen/bitmap.h"
 #include "src/codegen/go.h"
-#include "src/codegen/scc.h"
 #include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/adfa/action.h"
 #include "src/ir/adfa/adfa.h"
+#include "src/ir/adfa/scc.h"
 #include "src/ir/regexp/regexp_rule.h"
 #include "src/ir/rule_rank.h"
 #include "src/util/allocate.h"

diff --git a/re2c/src/codegen/scc.cc b/re2c/src/ir/adfa/scc.cc
similarity index 98%
rename from re2c/src/codegen/scc.cc
rename to re2c/src/ir/adfa/scc.cc
index 9ccf5a9390f2b8db47c267ecb9833ad38ecbbe42..c0d9439fba192dccce183764fcf342c4b0946d6e 100644 (file)
--- a/re2c/src/codegen/scc.cc
+++ b/re2c/src/ir/adfa/scc.cc
@@ -1,6 +1,6 @@
-#include "src/codegen/scc.h"
 #include "src/codegen/go.h"
 #include "src/ir/adfa/adfa.h"
+#include "src/ir/adfa/scc.h"
 
 namespace re2c {
 

diff --git a/re2c/src/codegen/scc.h b/re2c/src/ir/adfa/scc.h
similarity index 82%
rename from re2c/src/codegen/scc.h
rename to re2c/src/ir/adfa/scc.h
index dc2055cb6be10cec43f65a74aa0dc68efe7854c6..e847b8ae03d5c855302feea2d833c9f7314a2cd5 100644 (file)
--- a/re2c/src/codegen/scc.h
+++ b/re2c/src/ir/adfa/scc.h
@@ -1,5 +1,5 @@
-#ifndef _RE2C_CODEGEN_SCC_
-#define _RE2C_CODEGEN_SCC_
+#ifndef _RE2C_IR_ADFA_SCC_
+#define _RE2C_IR_ADFA_SCC_
 
 #include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
@@ -29,4 +29,4 @@ void calcDepth (State * head);
 
 } // namespace re2c
 
-#endif // _RE2C_CODEGEN_SCC_
+#endif // _RE2C_IR_ADFA_SCC_