Moved source subdirectory.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index 99a4337d43e48cded92e6654a82bb07201b794e3..3b8122dd21fb762e6d94fade2d47b4882cd8d0e4 100644 (file)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -17,9 +17,6 @@ SRC_HDR = \
        src/codegen/label.h \
        src/codegen/output.h \
        src/codegen/print.h \
-       src/codegen/skeleton/path.h \
-       src/codegen/skeleton/way.h \
-       src/codegen/skeleton/skeleton.h \
        src/conf/msg.h \
        src/conf/opt.h \
        src/conf/warn.h \
@@ -47,6 +44,9 @@ SRC_HDR = \
        src/ir/regexp/regexp_close.h \
        src/ir/compile.h \
        src/ir/rule_rank.h \
+       src/ir/skeleton/path.h \
+       src/ir/skeleton/way.h \
+       src/ir/skeleton/skeleton.h \
        src/globals.h \
        src/parse/code.h \
        src/parse/extop.h \
@@ -82,14 +82,6 @@ SRC = \
        src/codegen/input_api.cc \
        src/codegen/output.cc \
        src/codegen/print.cc \
-       src/codegen/skeleton/control_flow.cc \
-       src/codegen/skeleton/generate_code.cc \
-       src/codegen/skeleton/generate_data.cc \
-       src/codegen/skeleton/match_empty.cc \
-       src/codegen/skeleton/maxlen.cc \
-       src/codegen/skeleton/skeleton.cc \
-       src/codegen/skeleton/unreachable.cc \
-       src/codegen/skeleton/way.cc \
        src/conf/msg.cc \
        src/conf/opt.cc \
        src/conf/warn.cc \
@@ -114,6 +106,14 @@ SRC = \
        src/ir/regexp/regexp.cc \
        src/ir/compile.cc \
        src/ir/rule_rank.cc \
+       src/ir/skeleton/control_flow.cc \
+       src/ir/skeleton/generate_code.cc \
+       src/ir/skeleton/generate_data.cc \
+       src/ir/skeleton/match_empty.cc \
+       src/ir/skeleton/maxlen.cc \
+       src/ir/skeleton/skeleton.cc \
+       src/ir/skeleton/unreachable.cc \
+       src/ir/skeleton/way.cc \
        src/main.cc \
        src/parse/code.cc \
        src/parse/input.cc \

diff --git a/re2c/bootstrap/src/parse/lex.cc b/re2c/bootstrap/src/parse/lex.cc
index f2ad8a5a2759baa51240ddcbcd0fb2964410c5af..4c482babe5686397ee8a7c0e178c74000186cfe3 100644 (file)
--- a/re2c/bootstrap/src/parse/lex.cc
+++ b/re2c/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Thu Dec 31 21:08:19 2015 */
+/* Generated by re2c 0.15.3 on Thu Dec 31 22:03:04 2015 */
 #line 1 "../src/parse/lex.re"
 #include "src/util/c99_stdint.h"
 #include <stddef.h>

diff --git a/re2c/bootstrap/src/parse/parser.cc b/re2c/bootstrap/src/parse/parser.cc
index 7945438f25a677b129ff08a2c363f6300453e7df..8a795325b4c956d41f023f98736fba28515aef9e 100644 (file)
--- a/re2c/bootstrap/src/parse/parser.cc
+++ b/re2c/bootstrap/src/parse/parser.cc
@@ -81,7 +81,6 @@
 #include <vector>
 
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/compile.h"
@@ -94,6 +93,7 @@
 #include "src/ir/regexp/regexp_null.h"
 #include "src/ir/regexp/regexp_rule.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/code.h"
 #include "src/parse/extop.h"
 #include "src/parse/loc.h"

diff --git a/re2c/src/codegen/emit_action.cc b/re2c/src/codegen/emit_action.cc
index 88baea169bc443a4f37725723a94ba0ddd7540f1..01f99eb467348d223ea0c8993f78d8d339ccefc9 100644 (file)
--- a/re2c/src/codegen/emit_action.cc
+++ b/re2c/src/codegen/emit_action.cc
@@ -6,13 +6,13 @@
 #include "src/codegen/emit.h"
 #include "src/codegen/input_api.h"
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.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/regexp/regexp.h"
 #include "src/ir/regexp/regexp_rule.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/code.h"
 #include "src/parse/loc.h"
 

diff --git a/re2c/src/codegen/emit_dfa.cc b/re2c/src/codegen/emit_dfa.cc
index 4d697233fa2fb550ad749f8b173779eb62e4a7bb..2ec642647b738a3194a70a5bf1782cf24f6bda08 100644 (file)
--- a/re2c/src/codegen/emit_dfa.cc
+++ b/re2c/src/codegen/emit_dfa.cc
@@ -11,11 +11,11 @@
 #include "src/codegen/input_api.h"
 #include "src/codegen/label.h"
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.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/skeleton/skeleton.h"
 #include "src/util/counter.h"
 
 namespace re2c

diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h
index 599082aeaa2ddabf7574ede6394d853e5d0ab4f5..fb313b01d9b97b4cc408c20e707206ba925f39c1 100644 (file)
--- a/re2c/src/conf/warn.h
+++ b/re2c/src/conf/warn.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "src/codegen/skeleton/way.h"
+#include "src/ir/skeleton/way.h"
 #include "src/parse/rules.h"
 
 namespace re2c {

diff --git a/re2c/src/ir/adfa/adfa.cc b/re2c/src/ir/adfa/adfa.cc
index a0d739557f85250098bfccd59cd8102650f27d64..61941864b98038aac0d1f8cc262fb0141272faff 100644 (file)
--- a/re2c/src/ir/adfa/adfa.cc
+++ b/re2c/src/ir/adfa/adfa.cc
@@ -4,9 +4,9 @@
 #include <vector>
 
 #include "src/codegen/go.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/ir/adfa/adfa.h"
 #include "src/ir/dfa/dfa.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/util/allocate.h"
 
 namespace re2c

diff --git a/re2c/src/ir/compile.cc b/re2c/src/ir/compile.cc
index cc9199580c086e5e8f0296273d4a4abcf8ea603d..3633c28fd7c68a84da289065a5c728ccf177de51 100644 (file)
--- a/re2c/src/ir/compile.cc
+++ b/re2c/src/ir/compile.cc
@@ -2,12 +2,12 @@
 #include <ostream>
 
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/ir/compile.h"
 #include "src/ir/adfa/adfa.h"
 #include "src/ir/dfa/dfa.h"
 #include "src/ir/nfa/nfa.h"
 #include "src/ir/regexp/regexp.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/spec.h"
 
 namespace re2c {

diff --git a/re2c/src/codegen/skeleton/control_flow.cc b/re2c/src/ir/skeleton/control_flow.cc
similarity index 92%
rename from re2c/src/codegen/skeleton/control_flow.cc
rename to re2c/src/ir/skeleton/control_flow.cc
index f2cb3f390fa5b331c35e29f1487a82cdbaad81d1..a015ffb5a19107a7ceab615dcc4a327f503c62fe 100644 (file)
--- a/re2c/src/codegen/skeleton/control_flow.cc
+++ b/re2c/src/ir/skeleton/control_flow.cc
@@ -2,12 +2,12 @@
 #include <utility>
 #include <vector>
 
-#include "src/codegen/skeleton/path.h"
-#include "src/codegen/skeleton/skeleton.h"
-#include "src/codegen/skeleton/way.h"
 #include "src/conf/warn.h"
 #include "src/globals.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/path.h"
+#include "src/ir/skeleton/skeleton.h"
+#include "src/ir/skeleton/way.h"
 #include "src/util/u32lim.h"
 
 namespace re2c

diff --git a/re2c/src/codegen/skeleton/generate_code.cc b/re2c/src/ir/skeleton/generate_code.cc
similarity index 99%
rename from re2c/src/codegen/skeleton/generate_code.cc
rename to re2c/src/ir/skeleton/generate_code.cc
index 5b49abfecc8a10823443f5b1f832c4eb14e3b88f..f13d2eda8af5d15083768298b6126e82fcde50cd 100644 (file)
--- a/re2c/src/codegen/skeleton/generate_code.cc
+++ b/re2c/src/ir/skeleton/generate_code.cc
@@ -6,11 +6,11 @@
 
 #include "src/codegen/bitmap.h"
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/regexp/encoding/enc.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/skeleton.h"
 
 namespace re2c
 {

diff --git a/re2c/src/codegen/skeleton/generate_data.cc b/re2c/src/ir/skeleton/generate_data.cc
similarity index 98%
rename from re2c/src/codegen/skeleton/generate_data.cc
rename to re2c/src/ir/skeleton/generate_data.cc
index 15bad9e936b3a47678b8efa94c0f18514a828b5a..bebca17219e480810419a0115243cb6c690052f4 100644 (file)
--- a/re2c/src/codegen/skeleton/generate_data.cc
+++ b/re2c/src/ir/skeleton/generate_data.cc
@@ -8,13 +8,13 @@
 #include <utility>
 #include <vector>
 
-#include "src/codegen/skeleton/path.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/msg.h"
 #include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/regexp/encoding/enc.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/path.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/util/u32lim.h"
 
 namespace re2c

diff --git a/re2c/src/codegen/skeleton/match_empty.cc b/re2c/src/ir/skeleton/match_empty.cc
similarity index 91%
rename from re2c/src/codegen/skeleton/match_empty.cc
rename to re2c/src/ir/skeleton/match_empty.cc
index a1b9be9de3339879566f1596b80b6369b3670b7f..16fba615e7845169a4c21f7e0d9863ef2036e029 100644 (file)
--- a/re2c/src/codegen/skeleton/match_empty.cc
+++ b/re2c/src/ir/skeleton/match_empty.cc
@@ -1,11 +1,11 @@
 #include <map>
 #include <set>
 
-#include "src/codegen/skeleton/path.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/warn.h"
 #include "src/globals.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/path.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/rules.h"
 
 namespace re2c

diff --git a/re2c/src/codegen/skeleton/maxlen.cc b/re2c/src/ir/skeleton/maxlen.cc
similarity index 95%
rename from re2c/src/codegen/skeleton/maxlen.cc
rename to re2c/src/ir/skeleton/maxlen.cc
index 942b07bd88dc24171445fb7ee646eeba4a71c02e..3f1d9331002cd16fcd383c568dfaca2752d3cebe 100644 (file)
--- a/re2c/src/codegen/skeleton/maxlen.cc
+++ b/re2c/src/ir/skeleton/maxlen.cc
@@ -4,7 +4,7 @@
 #include <map>
 #include <utility>
 
-#include "src/codegen/skeleton/skeleton.h"
+#include "src/ir/skeleton/skeleton.h"
 
 namespace re2c
 {

diff --git a/re2c/src/codegen/skeleton/path.h b/re2c/src/ir/skeleton/path.h
similarity index 92%
rename from re2c/src/codegen/skeleton/path.h
rename to re2c/src/ir/skeleton/path.h
index 66ef599f29adbbc20e16ce8a6a432ad0373d55a1..d09861e5a2b56332fa1556bab396588686091d40 100644 (file)
--- a/re2c/src/codegen/skeleton/path.h
+++ b/re2c/src/ir/skeleton/path.h
@@ -1,5 +1,5 @@
-#ifndef _RE2C_CODEGEN_SKELETON_PATH_
-#define _RE2C_CODEGEN_SKELETON_PATH_
+#ifndef _RE2C_IR_SKELETON_PATH_
+#define _RE2C_IR_SKELETON_PATH_
 
 #include <vector>
 
@@ -100,4 +100,4 @@ public:
 
 } // namespace re2c
 
-#endif // _RE2C_CODEGEN_SKELETON_PATH_
+#endif // _RE2C_IR_SKELETON_PATH_

diff --git a/re2c/src/codegen/skeleton/skeleton.cc b/re2c/src/ir/skeleton/skeleton.cc
similarity index 98%
rename from re2c/src/codegen/skeleton/skeleton.cc
rename to re2c/src/ir/skeleton/skeleton.cc
index 7a38de30b61351604e3d02a4ce320ed86621a754..0d9ca54f6203e5fffd55d98736221e5843dacf23 100644 (file)
--- a/re2c/src/codegen/skeleton/skeleton.cc
+++ b/re2c/src/ir/skeleton/skeleton.cc
@@ -3,11 +3,11 @@
 #include <utility>
 
 #include "src/codegen/go.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/msg.h"
 #include "src/ir/dfa/dfa.h"
 #include "src/ir/regexp/regexp.h"
 #include "src/ir/regexp/regexp_rule.h"
+#include "src/ir/skeleton/skeleton.h"
 
 namespace re2c
 {

diff --git a/re2c/src/codegen/skeleton/skeleton.h b/re2c/src/ir/skeleton/skeleton.h
similarity index 95%
rename from re2c/src/codegen/skeleton/skeleton.h
rename to re2c/src/ir/skeleton/skeleton.h
index 43bb863cadd63a5a8be846851a21eff7f7632f92..dedca8ac623608bd7412ee3fcaf2261ed2ee1ae8 100644 (file)
--- a/re2c/src/codegen/skeleton/skeleton.h
+++ b/re2c/src/ir/skeleton/skeleton.h
@@ -1,5 +1,5 @@
-#ifndef _RE2C_CODEGEN_SKELETON_SKELETON_
-#define _RE2C_CODEGEN_SKELETON_SKELETON_
+#ifndef _RE2C_IR_SKELETON_SKELETON_
+#define _RE2C_IR_SKELETON_SKELETON_
 
 #include "src/util/c99_stdint.h"
 #include <stddef.h>
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "src/codegen/skeleton/path.h"
-#include "src/codegen/skeleton/way.h"
 #include "src/ir/regexp/regexp.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/path.h"
+#include "src/ir/skeleton/way.h"
 #include "src/parse/rules.h"
 #include "src/util/local_increment.h"
 #include "src/util/forbid_copy.h"
@@ -170,4 +170,4 @@ template<typename key_t> key_t Skeleton::rule2key (rule_rank_t r)
 
 } // namespace re2c
 
-#endif // _RE2C_CODEGEN_SKELETON_SKELETON_
+#endif // _RE2C_IR_SKELETON_SKELETON_

diff --git a/re2c/src/codegen/skeleton/unreachable.cc b/re2c/src/ir/skeleton/unreachable.cc
similarity index 95%
rename from re2c/src/codegen/skeleton/unreachable.cc
rename to re2c/src/ir/skeleton/unreachable.cc
index 4e04756ab7d441dc69aedc0850fab15702332463..fac41dfc365c9ee6376eda8c78d6a79f5d814d1a 100644 (file)
--- a/re2c/src/codegen/skeleton/unreachable.cc
+++ b/re2c/src/ir/skeleton/unreachable.cc
@@ -3,11 +3,11 @@
 #include <set>
 #include <utility>
 
-#include "src/codegen/skeleton/path.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/warn.h"
 #include "src/globals.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/path.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/rules.h"
 
 namespace re2c

diff --git a/re2c/src/codegen/skeleton/way.cc b/re2c/src/ir/skeleton/way.cc
similarity index 97%
rename from re2c/src/codegen/skeleton/way.cc
rename to re2c/src/ir/skeleton/way.cc
index 05a064861ae345c9ce6e00d9dc9adfc1f3c5bc24..0f58efe423e5cb47835555d57544c5d78e4ce7e9 100644 (file)
--- a/re2c/src/codegen/skeleton/way.cc
+++ b/re2c/src/ir/skeleton/way.cc
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <algorithm>
 
-#include "src/codegen/skeleton/way.h"
+#include "src/ir/skeleton/way.h"
 
 namespace re2c
 {

diff --git a/re2c/src/codegen/skeleton/way.h b/re2c/src/ir/skeleton/way.h
similarity index 75%
rename from re2c/src/codegen/skeleton/way.h
rename to re2c/src/ir/skeleton/way.h
index 090a16b36b6da2ad02eb986996ad0b7e596e5061..e10010a9154f9819c6301d4c1bef97e6e76836f6 100644 (file)
--- a/re2c/src/codegen/skeleton/way.h
+++ b/re2c/src/ir/skeleton/way.h
@@ -1,5 +1,5 @@
-#ifndef _RE2C_CODEGEN_SKELETON_WAY_
-#define _RE2C_CODEGEN_SKELETON_WAY_
+#ifndef _RE2C_IR_SKELETON_WAY_
+#define _RE2C_IR_SKELETON_WAY_
 
 #include "src/util/c99_stdint.h"
 #include <stdio.h>
@@ -17,4 +17,4 @@ void fprint_way (FILE * f, const way_t & p);
 
 } // namespace re2c
 
-#endif // _RE2C_CODEGEN_SKELETON_WAY_
+#endif // _RE2C_IR_SKELETON_WAY_

diff --git a/re2c/src/parse/parser.ypp b/re2c/src/parse/parser.ypp
index fdfdf6b2a5476b5998211ecfca9017b6e8e8b73d..76540ecc06d3a2f2c3aeff62963bd61f76431d51 100644 (file)
--- a/re2c/src/parse/parser.ypp
+++ b/re2c/src/parse/parser.ypp
@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "src/codegen/output.h"
-#include "src/codegen/skeleton/skeleton.h"
 #include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/compile.h"
@@ -26,6 +25,7 @@
 #include "src/ir/regexp/regexp_null.h"
 #include "src/ir/regexp/regexp_rule.h"
 #include "src/ir/rule_rank.h"
+#include "src/ir/skeleton/skeleton.h"
 #include "src/parse/code.h"
 #include "src/parse/extop.h"
 #include "src/parse/loc.h"