Fixed includes with 'include-what-you-use'.

Command:

    $ configure CXX=include-what-you-use CXXFLAGS="--check-also" \
        && make -k 2>log \
        && python2 `which fix_inclydes.py` < log

diff --git a/re2c/src/adfa/adfa.cc b/re2c/src/adfa/adfa.cc
index cefb982ae0191cf243af9f6dc0348a2044714dd6..c462b0f5b8158158ae194c979ca4da4a445e2480 100644 (file)
--- a/re2c/src/adfa/adfa.cc
+++ b/re2c/src/adfa/adfa.cc
@@ -1,13 +1,14 @@
 #include <assert.h>
+#include <algorithm>
+#include <limits>
 #include <queue>
 #include <set>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "src/code/go.h"
 #include "src/adfa/adfa.h"
+#include "src/code/go.h"
 #include "src/dfa/dfa.h"
-#include "src/skeleton/skeleton.h"
 #include "src/util/allocate.h"
 
 namespace re2c

diff --git a/re2c/src/adfa/adfa.h b/re2c/src/adfa/adfa.h
index 31d6174ebb7486b1faed36d166242a43420424c1..7df2d9722ed4175a51eb8b06817e1e005552b3b4 100644 (file)
--- a/re2c/src/adfa/adfa.h
+++ b/re2c/src/adfa/adfa.h
@@ -6,11 +6,13 @@
 #include <set>
 #include <string>
 #include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/code/label.h"
-#include "src/adfa/action.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/rule.h"
 #include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
@@ -18,8 +20,9 @@
 namespace re2c
 {
 
-struct Output;
+struct opt_t;
 class OutputFile;
+struct Output;
 struct dfa_t;
 
 struct State

diff --git a/re2c/src/adfa/dump.cc b/re2c/src/adfa/dump.cc
index 34bd95d76b651e64c472262e8f1cad82997de64a..fd7c70e4873f7ec9644c60794f6b3e8a8eb05706 100644 (file)
--- a/re2c/src/adfa/dump.cc
+++ b/re2c/src/adfa/dump.cc
@@ -1,7 +1,18 @@
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
+#include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
 
-#include "src/dfa/dump.h"
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/adfa/dump.h"
+#include "src/code/go.h"
+#include "src/dfa/dump.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/adfa/dump.h b/re2c/src/adfa/dump.h
index 1a3999f790a23f6c11e1b6dd948b21d9efd399bc..352f45325aafaf3164e6aae09ccf10f954dc7de8 100644 (file)
--- a/re2c/src/adfa/dump.h
+++ b/re2c/src/adfa/dump.h
@@ -6,6 +6,8 @@
 namespace re2c
 {
 
+struct DFA;
+
 void dump_adfa(const DFA &dfa);
 
 } // namespace re2c

diff --git a/re2c/src/adfa/prepare.cc b/re2c/src/adfa/prepare.cc
index c8202d97031ae4077b8a9559866b43cf667a1340..f4a5f16ef91951c4d98384d326b57bfc10b3e023 100644 (file)
--- a/re2c/src/adfa/prepare.cc
+++ b/re2c/src/adfa/prepare.cc
@@ -1,12 +1,19 @@
+#include <assert.h>
 #include "src/util/c99_stdint.h"
 #include <string.h>
-#include <map>
+#include <algorithm>
+#include <utility>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/conf/msg.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
 #include "src/util/allocate.h"
 
 namespace re2c {

diff --git a/re2c/src/ast/ast.cc b/re2c/src/ast/ast.cc
index 67e9959e13c0a9553e1a3830d509dc51cebd2484..612641e9d4065831f9cf71d0fc162194ad4ccb77 100644 (file)
--- a/re2c/src/ast/ast.cc
+++ b/re2c/src/ast/ast.cc
@@ -1,6 +1,7 @@
 #include <limits>
 
 #include "src/ast/ast.h"
+#include "src/util/free_list.h"
 
 namespace re2c
 {

diff --git a/re2c/src/ast/ast.h b/re2c/src/ast/ast.h
index f059485df385ee9be787c5d49eb320267af9501d..e4685f7664a830c803fd973bd7338e39b269f637 100644 (file)
--- a/re2c/src/ast/ast.h
+++ b/re2c/src/ast/ast.h
@@ -14,6 +14,9 @@
 namespace re2c
 {
 
+struct Code;
+template <class _Ty> class free_list;
+
 struct ASTChar
 {
        uint32_t chr;

diff --git a/re2c/src/ast/normalize.cc b/re2c/src/ast/normalize.cc
index 40e0232bacaf4ecdf4fc0bff1a724a38d0700dfe..dda268dea4ac8577dc6e7fa52f82d5c3478896bb 100644 (file)
--- a/re2c/src/ast/normalize.cc
+++ b/re2c/src/ast/normalize.cc
@@ -1,4 +1,8 @@
+#include <string>
+#include <vector>
+
 #include "src/ast/ast.h"
+#include "src/re/rule.h"
 
 namespace re2c {
 

diff --git a/re2c/src/ast/parser.h b/re2c/src/ast/parser.h
index 52ab03de8096a82b3e74399258d0cd45e42c3cdb..88469ae17275ade957cc182875785a08e83a62b2 100644 (file)
--- a/re2c/src/ast/parser.h
+++ b/re2c/src/ast/parser.h
@@ -4,14 +4,17 @@
 #include <set>
 #include <string>
 
-#include "src/conf/msg.h"
 #include "src/ast/ast.h"
-#include "src/conf/opt.h"
 #include "src/ast/scanner.h"
+#include "src/conf/msg.h"
+#include "src/conf/opt.h"
 
 namespace re2c
 {
 
+class Scanner;
+struct Opt;
+
 typedef std::set<std::string> CondList;
 
 struct context_t

diff --git a/re2c/src/ast/scanner.cc b/re2c/src/ast/scanner.cc
index 34e2b516dba31285882905a3380cd1264826492a..9dd4dcfe0ac66aba67ee5b93e65689b0b6891d95 100644 (file)
--- a/re2c/src/ast/scanner.cc
+++ b/re2c/src/ast/scanner.cc
@@ -1,13 +1,8 @@
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <new>
 
-#include "src/conf/msg.h"
-#include "src/code/label.h"
-#include "src/code/output.h"
 #include "src/ast/scanner.h"
-#include "src/util/counter.h"
+#include "src/conf/msg.h"
 
 // used by Scanner::fatal_at and Scanner::fatalf
 #if defined(_MSC_VER) && !defined(vsnprintf)
@@ -16,6 +11,8 @@
 
 namespace re2c {
 
+class Warn;
+
 const uint32_t Scanner::BSIZE = 8192;
 
 ScannerState::ScannerState ()

diff --git a/re2c/src/ast/scanner.h b/re2c/src/ast/scanner.h
index 9ff5122bd7c47f32abe85bdf78a4c06eca0aba53..78c47374adab202e0299053b2792d30ee5d9b01b 100644 (file)
--- a/re2c/src/ast/scanner.h
+++ b/re2c/src/ast/scanner.h
@@ -1,22 +1,27 @@
 #ifndef _RE2C_AST_SCANNER_
 #define _RE2C_AST_SCANNER_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <sys/types.h>
 #include <string>
 
+#include "src/ast/input.h"
 #include "src/conf/opt.h"
 #include "src/conf/warn.h"
-#include "src/ast/input.h"
+#include "src/re/encoding/enc.h"
 #include "src/util/attribute.h"
 #include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+class Warn;
+struct Opt;
+struct conopt_t;
+class OutputFile;
 class Range;
 struct AST;
-class OutputFile;
 
 struct ScannerState
 {

diff --git a/re2c/src/ast/validate.cc b/re2c/src/ast/validate.cc
index 238039f43af4929d4215aedb488b95636bf84b01..9f95f76777f290d01979813bc42dd96207e5e9bd 100644 (file)
--- a/re2c/src/ast/validate.cc
+++ b/re2c/src/ast/validate.cc
@@ -1,5 +1,11 @@
-#include "src/conf/msg.h"
+#include "src/util/c99_stdint.h"
+#include <string>
+#include <vector>
+
 #include "src/ast/ast.h"
+#include "src/ast/scanner.h"
+#include "src/conf/msg.h"
+#include "src/re/rule.h"
 
 namespace re2c {
 

diff --git a/re2c/src/code/bitmap.cc b/re2c/src/code/bitmap.cc
index dfc3d1718a6f5e3f5fa057d61995a20a83339683..b6b0a927dc16cf67e7d2d7ed4da0933e7b5fb2a1 100644 (file)
--- a/re2c/src/code/bitmap.cc
+++ b/re2c/src/code/bitmap.cc
@@ -1,9 +1,11 @@
-#include <algorithm> // min
 #include <string.h> // memset
+#include <algorithm> // min
 
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/code/output.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {

diff --git a/re2c/src/code/bitmap.h b/re2c/src/code/bitmap.h
index d8c63e149c7aaefcaec6cac67c59e5fe91b5e8b9..4ece47267ccb70ec21ae888935669dcd7af1f836 100644 (file)
--- a/re2c/src/code/bitmap.h
+++ b/re2c/src/code/bitmap.h
@@ -8,10 +8,10 @@
 
 namespace re2c {
 
+class OutputFile;
 struct Go;
 struct Span;
 struct State;
-class OutputFile;
 
 struct bitmap_t
 {

diff --git a/re2c/src/code/emit_action.cc b/re2c/src/code/emit_action.cc
index c5632e69ebe5922259216b77c3752654d14aa1e3..3a9dfc27310db4f6f9aee78e8b94d816b731b36a 100644 (file)
--- a/re2c/src/code/emit_action.cc
+++ b/re2c/src/code/emit_action.cc
@@ -1,21 +1,30 @@
-#include "src/util/c99_stdint.h"
+#include <assert.h>
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <iosfwd>
 #include <set>
 #include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/emit.h"
+#include "src/code/go.h"
 #include "src/code/input_api.h"
+#include "src/code/label.h"
 #include "src/code/output.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/string_utils.h"
 
 namespace re2c
 {
 
-class label_t;
-
 static void need               (OutputFile &o, uint32_t ind, size_t some);
 static void emit_accept_binary (OutputFile &o, uint32_t ind, const DFA &dfa, const accept_t &acc, size_t l, size_t r);
 static void emit_accept        (OutputFile &o, uint32_t ind, const DFA &dfa, const accept_t &acc);

diff --git a/re2c/src/code/emit_dfa.cc b/re2c/src/code/emit_dfa.cc
index 5c0f8cb830ebd732eb7149cc7e70f84fd15ead0d..8f73b314b94d1d054ce5950c1f84f1e938db3a59 100644 (file)
--- a/re2c/src/code/emit_dfa.cc
+++ b/re2c/src/code/emit_dfa.cc
@@ -1,18 +1,23 @@
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <ostream>
 #include <set>
 #include <string>
 #include <utility>
+#include <valarray>
 #include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/emit.h"
 #include "src/code/go.h"
 #include "src/code/input_api.h"
 #include "src/code/label.h"
 #include "src/code/output.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/counter.h"
 #include "src/util/string_utils.h"

diff --git a/re2c/src/code/go_construct.cc b/re2c/src/code/go_construct.cc
index 9a4d46f2010a8dea49153ffbadae118a7ffa685d..eec4cef570ba69119e60ec7fb6dc72f263de4c8b 100644 (file)
--- a/re2c/src/code/go_construct.cc
+++ b/re2c/src/code/go_construct.cc
@@ -5,9 +5,12 @@
 #include <utility>
 #include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/util/allocate.h"
 
 namespace re2c

diff --git a/re2c/src/code/go_destruct.cc b/re2c/src/code/go_destruct.cc
index 062652cf5d9c0bca37bfd6cd3d192c43534c60f2..9876491bf71b698f54c0ac3f92ed80c32b89ec1d 100644 (file)
--- a/re2c/src/code/go_destruct.cc
+++ b/re2c/src/code/go_destruct.cc
@@ -1,6 +1,4 @@
 #include "src/util/c99_stdint.h"
-#include <utility>
-#include <vector>
 
 #include "src/code/go.h"
 

diff --git a/re2c/src/code/go_emit.cc b/re2c/src/code/go_emit.cc
index 11a4beb7b6dc7b83d8a99ae3aa1064c142a1335d..d96bd7cb25518b746d7de8ddc5292dc720dd1d30 100644 (file)
--- a/re2c/src/code/go_emit.cc
+++ b/re2c/src/code/go_emit.cc
@@ -4,14 +4,15 @@
 #include <utility>
 #include <vector>
 
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
-#include "src/code/go.h"
 #include "src/code/emit.h"
-#include "src/code/input_api.h"
+#include "src/code/go.h"
 #include "src/code/label.h"
 #include "src/code/output.h"
 #include "src/code/print.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/encoding/enc.h"
 
 namespace re2c

diff --git a/re2c/src/code/go_used_labels.cc b/re2c/src/code/go_used_labels.cc
index 939fec72ec417752313c6c2298157eaa70d6a27e..5ce70d9416ae3e249751c12bd29cd77b59e35ec7 100644 (file)
--- a/re2c/src/code/go_used_labels.cc
+++ b/re2c/src/code/go_used_labels.cc
@@ -1,16 +1,15 @@
 #include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
-#include <utility>
-#include <vector>
 
-#include "src/code/go.h"
-#include "src/code/label.h"
 #include "src/adfa/adfa.h"
+#include "src/code/go.h"
 
 namespace re2c
 {
 
+class label_t;
+
 void Cases::used_labels (std::set<label_t> & used) const
 {
        for (uint32_t i = 0; i < cases_size; ++i)

diff --git a/re2c/src/code/input_api.cc b/re2c/src/code/input_api.cc
index ce7c3d641989e7e8f5671cd282f2422cf55d2287..3b91ec2bf959b42328c68978492283934d2b19ab 100644 (file)
--- a/re2c/src/code/input_api.cc
+++ b/re2c/src/code/input_api.cc
@@ -3,6 +3,7 @@
 
 #include "src/code/emit.h"
 #include "src/code/input_api.h"
+#include "src/conf/opt.h"
 
 namespace re2c
 {

diff --git a/re2c/src/code/input_api.h b/re2c/src/code/input_api.h
index a5b95b3ed473e520552531018f83431d04b6f286..abb6289c1f9a8e4b60aa329e96db869f1497a383 100644 (file)
--- a/re2c/src/code/input_api.h
+++ b/re2c/src/code/input_api.h
@@ -1,7 +1,9 @@
 #ifndef _RE2C_CODE_INPUT_API_
 #define _RE2C_CODE_INPUT_API_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
+#include <iosfwd>
 #include <string>
 
 namespace re2c

diff --git a/re2c/src/code/label.h b/re2c/src/code/label.h
index ca184d6be9b59383e9047984c0009f1c03ad8d3c..bf29628a53fd5d607ae3f2d890aedaea0f6fdf66 100644 (file)
--- a/re2c/src/code/label.h
+++ b/re2c/src/code/label.h
@@ -1,9 +1,8 @@
 #ifndef _RE2C_CODE_LABEL_
 #define _RE2C_CODE_LABEL_
 
-#include <iosfwd> // ostream
-
 #include "src/util/c99_stdint.h"
+#include <iosfwd> // ostream
 
 namespace re2c {
 

diff --git a/re2c/src/code/output.cc b/re2c/src/code/output.cc
index 4ee267f430681c0840c22f8f74ea7178e3e49cb7..a1c52985340e9fb78cc1e01642a873da3d465c5b 100644 (file)
--- a/re2c/src/code/output.cc
+++ b/re2c/src/code/output.cc
@@ -2,11 +2,17 @@
 #include <time.h>
 #include <iomanip>
 
+#include "config.h"
 #include "src/code/emit.h"
+#include "src/code/input_api.h"
 #include "src/code/output.h"
 #include "src/code/print.h"
 #include "src/conf/msg.h"
+#include "src/conf/opt.h"
+#include "src/conf/warn.h"
+#include "src/re/encoding/enc.h"
 #include "src/util/string_utils.h"
+#include "src/util/uniq_vector.h"
 
 namespace re2c
 {

diff --git a/re2c/src/code/output.h b/re2c/src/code/output.h
index 0d9382db798efde5e05ff11ff1ef6894f107498c..5f093c4ce4daaf0e0d95346cc3995ac6d5b1df33 100644 (file)
--- a/re2c/src/code/output.h
+++ b/re2c/src/code/output.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_CODE_OUTPUT_
 #define _RE2C_CODE_OUTPUT_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
 #include <fstream>
 #include <set>
@@ -20,6 +20,11 @@
 namespace re2c
 {
 
+class Warn;
+struct Opt;
+struct opt_t;
+template <typename value_t> class uniq_vector_t;
+
 struct ConfTags
 {
        std::string format;

diff --git a/re2c/src/compile.cc b/re2c/src/compile.cc
index 1056ef29f9b1df3e4343262015aa0d27a2e23e91..21c3439a73419a3ebf35a8e774c80f1197cf5fb5 100644 (file)
--- a/re2c/src/compile.cc
+++ b/re2c/src/compile.cc
@@ -1,23 +1,35 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <algorithm>
 #include <ostream>
-#include <set>
+#include <string>
+#include <vector>
 
-#include "src/code/output.h"
-#include "src/conf/msg.h"
-#include "src/compile.h"
 #include "src/adfa/adfa.h"
 #include "src/adfa/dump.h"
+#include "src/ast/ast.h"
 #include "src/ast/parser.h"
+#include "src/ast/scanner.h"
+#include "src/code/label.h"
+#include "src/code/output.h"
+#include "src/compile.h"
+#include "src/conf/opt.h"
 #include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/nfa/nfa.h"
 #include "src/re/encoding/range_suffix.h"
+#include "src/re/re.h"
+#include "src/re/rule.h"
 #include "src/skeleton/skeleton.h"
-#include "src/ast/ast.h"
+#include "src/util/counter.h"
+#include "src/util/free_list.h"
+#include "src/util/range.h"
 #include "src/util/smart_ptr.h"
 
 namespace re2c {
 
+class Warn;
+
 static std::string make_name(const std::string &cond, uint32_t line)
 {
        std::ostringstream os;

diff --git a/re2c/src/compile.h b/re2c/src/compile.h
index 0ace65040ca9d177d346be5910a8d8c23428e98d..ee1a8a0962f29a257e792c46f15fc7980c2dec91 100644 (file)
--- a/re2c/src/compile.h
+++ b/re2c/src/compile.h
@@ -8,6 +8,10 @@
 namespace re2c
 {
 
+class Scanner;
+struct Opt;
+struct Output;
+
 void compile(Scanner &input, Output &output, Opt &opts);
 
 } // namespace re2c

diff --git a/re2c/src/conf/msg.h b/re2c/src/conf/msg.h
index 5d6140f71dda7d006465f43e8ed00e4b1f2770af..74781ce476ad9bb7090aa0ebfac19932fb9238b4 100644 (file)
--- a/re2c/src/conf/msg.h
+++ b/re2c/src/conf/msg.h
@@ -1,10 +1,10 @@
 #ifndef _RE2C_CONF_MSG_
 #define _RE2C_CONF_MSG_
 
+#include "src/util/c99_stdint.h"
 #include <string>
 
 #include "src/util/attribute.h"
-#include "src/util/c99_stdint.h"
 
 namespace re2c {
 

diff --git a/re2c/src/conf/opt.h b/re2c/src/conf/opt.h
index bb0b8191aaede341692315c71c1cb25e89a24b9e..f638083529ff7631f0127270f2c73e3c915affd3 100644 (file)
--- a/re2c/src/conf/opt.h
+++ b/re2c/src/conf/opt.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_CONF_OPT_
 #define _RE2C_CONF_OPT_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <string>
 
 #include "src/code/input_api.h"
@@ -15,6 +15,8 @@
 namespace re2c
 {
 
+class Warn;
+
 enum target_t
 {
        TARGET_CODE,

diff --git a/re2c/src/conf/warn.cc b/re2c/src/conf/warn.cc
index fe1ded7a66f1fb921f0803b12fe95bc5d80dd1d0..2bf406b1816a3a8b28b92882d02ebb4532b38c8d 100644 (file)
--- a/re2c/src/conf/warn.cc
+++ b/re2c/src/conf/warn.cc
@@ -1,11 +1,12 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <algorithm>
-#include <utility>
+#include <set>
 
 #include "src/conf/msg.h"
 #include "src/conf/warn.h"
 #include "src/skeleton/path.h"
+#include "src/re/rule.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c {

diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h
index cef97e4ee3306d372854bce6598531800f503afd..c89cfbb2a4027c5e7baaf94ddba9f43b3ecfe219 100644 (file)
--- a/re2c/src/conf/warn.h
+++ b/re2c/src/conf/warn.h
@@ -1,6 +1,7 @@
 #ifndef _RE2C_CONF_WARN_
 #define _RE2C_CONF_WARN_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <string>
 #include <vector>
@@ -10,6 +11,7 @@
 namespace re2c {
 
 class path_t;
+struct Rule;
 struct Skeleton;
 
 #define RE2C_WARNING_TYPES \

diff --git a/re2c/src/dfa/cfg/cfg.cc b/re2c/src/dfa/cfg/cfg.cc
index fc9c67403b14db4a88b75c45a47e480c79966126..00acf9683c2d050161aced8027bc106dcfcf3385 100644 (file)
--- a/re2c/src/dfa/cfg/cfg.cc
+++ b/re2c/src/dfa/cfg/cfg.cc
@@ -1,11 +1,19 @@
 #include <string.h>
+#include <algorithm>
+#include <new>
+#include <valarray>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
 #include "src/util/allocate.h"
 
 namespace re2c
 {
 
+struct Rule;
+struct tcmd_t;
+
 static void map_arcs_to_bblocks(const dfa_t &dfa, cfg_ix_t *arc2bb, cfg_ix_t &nbbarc, cfg_ix_t &nbbfin, cfg_ix_t &nbbfall);
 static cfg_bb_t *create_bblocks(dfa_t &dfa, const cfg_ix_t *arc2bb, cfg_ix_t nbbfin, cfg_ix_t nbbfall);
 static void successors(const dfa_t &dfa, const cfg_ix_t *arc2bb, bool *been, cfg_ix_t *&succ, size_t x);

diff --git a/re2c/src/dfa/cfg/cfg.h b/re2c/src/dfa/cfg/cfg.h
index 7a64f8fe1774c0cbadd762c05ef6564a7ac68888..ccb54fd96ac0ead0bd2036dfe05ffa7ab063b08b 100644 (file)
--- a/re2c/src/dfa/cfg/cfg.h
+++ b/re2c/src/dfa/cfg/cfg.h
@@ -1,11 +1,18 @@
 #ifndef _RE2C_DFA_CFG_CFG_
 #define _RE2C_DFA_CFG_CFG_
 
-#include "src/util/forbid_copy.h"
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/dfa.h"
+#include "src/re/tag.h"
+#include "src/util/forbid_copy.h"
 
 namespace re2c {
 
+struct Rule;
+struct dfa_t;
+struct tcmd_t;
+
 typedef uint32_t cfg_ix_t;
 
 // basic block

diff --git a/re2c/src/dfa/cfg/compact.cc b/re2c/src/dfa/cfg/compact.cc
index f55c0aaea627d32a3ef538d165a972f20e81674a..e67e8e5e84cc09027377aa0b7541c5f1f29d295d 100644 (file)
--- a/re2c/src/dfa/cfg/compact.cc
+++ b/re2c/src/dfa/cfg/compact.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include <algorithm>
+#include <vector>
+
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/dce.cc b/re2c/src/dfa/cfg/dce.cc
index d4bc2cb89b9b00ffb05bb7a0a0691d9129341ab0..88b97efd3e9efbb2c7e839e4b46d11fa16633e7f 100644 (file)
--- a/re2c/src/dfa/cfg/dce.cc
+++ b/re2c/src/dfa/cfg/dce.cc
@@ -1,4 +1,7 @@
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/dump.cc b/re2c/src/dfa/cfg/dump.cc
index 0368868efefbc6b20778535d209f7243f0b96748..d3757c1fbe736e553cd87774cffc72bf01b498b0 100644 (file)
--- a/re2c/src/dfa/cfg/dump.cc
+++ b/re2c/src/dfa/cfg/dump.cc
@@ -1,6 +1,10 @@
 #include <stdio.h>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/freeze.cc b/re2c/src/dfa/cfg/freeze.cc
index 6b8e9fb562b5d8cbfff1f5e5b860d07a75cc9864..926089d306f59173f533e85e3997add86ae5ae2c 100644 (file)
--- a/re2c/src/dfa/cfg/freeze.cc
+++ b/re2c/src/dfa/cfg/freeze.cc
@@ -1,4 +1,8 @@
+#include <stddef.h>
+#include <vector>
+
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/interfere.cc b/re2c/src/dfa/cfg/interfere.cc
index 0c9d7f6f4911981fa7e6e098d354ce3e0bf0139e..45da84bc44b271d9d302a88008138d2d7bf5f7de 100644 (file)
--- a/re2c/src/dfa/cfg/interfere.cc
+++ b/re2c/src/dfa/cfg/interfere.cc
@@ -1,6 +1,11 @@
 #include <string.h>
+#include <set>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/liveanal.cc b/re2c/src/dfa/cfg/liveanal.cc
index a3634723e95390ba3845a8e3c31a239c16fc1725..4123f3fd37682ba91b68f69877394adb4c80a9d8 100644 (file)
--- a/re2c/src/dfa/cfg/liveanal.cc
+++ b/re2c/src/dfa/cfg/liveanal.cc
@@ -1,7 +1,12 @@
 #include <assert.h>
 #include <string.h>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/normalize.cc b/re2c/src/dfa/cfg/normalize.cc
index fcc7e0a560c06620e20ca51c040159debf945087..ac6f09e0902d5d7d7246672a9ca3c3beb0f3f45a 100644 (file)
--- a/re2c/src/dfa/cfg/normalize.cc
+++ b/re2c/src/dfa/cfg/normalize.cc
@@ -1,7 +1,12 @@
 #include <assert.h>
+#include "src/util/c99_stdint.h"
 #include <string.h>
+#include <algorithm>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/optimize.cc b/re2c/src/dfa/cfg/optimize.cc
index f1fc7827fd092932583155ce77c6e634a3733801..c2ea2ed6a65149e56a6996665dbff45fe30bd9c8 100644 (file)
--- a/re2c/src/dfa/cfg/optimize.cc
+++ b/re2c/src/dfa/cfg/optimize.cc
@@ -1,5 +1,9 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/cfg/cfg.h"
 #include "src/dfa/dfa.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/rename.cc b/re2c/src/dfa/cfg/rename.cc
index f271c2e8439abe0032a67e06343c0e1058bdba4d..615bbf08cf46b35ebdad028d1108ef6595c38d83 100644 (file)
--- a/re2c/src/dfa/cfg/rename.cc
+++ b/re2c/src/dfa/cfg/rename.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include <set>
+#include <vector>
+
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/cfg/varalloc.cc b/re2c/src/dfa/cfg/varalloc.cc
index 4f0384e44fe5a310fe5c288250ff80e61aa4852a..75d449c728049cd7bced531a89c518c50b288eba 100644 (file)
--- a/re2c/src/dfa/cfg/varalloc.cc
+++ b/re2c/src/dfa/cfg/varalloc.cc
@@ -1,6 +1,10 @@
+#include <algorithm>
 #include <limits>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/closure.cc b/re2c/src/dfa/closure.cc
index 194e6181d7dee27bad900db1fa1e9f259a2315e0..a097aafe9ef05c0f1068e30831a1bd842f40031e 100644 (file)
--- a/re2c/src/dfa/closure.cc
+++ b/re2c/src/dfa/closure.cc
@@ -1,9 +1,20 @@
+#include <assert.h>
+#include "src/util/c99_stdint.h"
+#include <stdlib.h>
 #include <string.h>
+#include <algorithm>
+#include <set>
+#include <stack>
+#include <utility>
+#include <valarray>
 
+#include "src/conf/opt.h"
 #include "src/dfa/closure.h"
+#include "src/dfa/dfa.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tcmd.h"
 #include "src/nfa/nfa.h"
-#include "src/util/local_increment.h"
+#include "src/re/rule.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/closure.h b/re2c/src/dfa/closure.h
index 77fca4e55570693fa430e08dca2215156463cc9e..ed30ca359ad0be1275d20547ad8a3a897e273e83 100644 (file)
--- a/re2c/src/dfa/closure.h
+++ b/re2c/src/dfa/closure.h
@@ -1,15 +1,22 @@
 #ifndef _RE2C_DFA_CLOSURE_
 #define _RE2C_DFA_CLOSURE_
 
-#include "src/util/c99_stdint.h"
+#include <stddef.h>
 #include <map>
+#include <vector>
 
 #include "src/dfa/dfa.h"
+#include "src/dfa/tagtree.h"
 #include "src/nfa/nfa.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
 
+struct Tagpool;
+struct dfa_t;
+struct tcmd_t;
+
 struct clos_t
 {
        nfa_state_t *origin; // for debug only

diff --git a/re2c/src/dfa/dead_rules.cc b/re2c/src/dfa/dead_rules.cc
index 11a48b1028db9360c9a0cb5e19d2ab0f64517ae4..296b1f6b15fee769367a665524f37e9a67a553cd 100644 (file)
--- a/re2c/src/dfa/dead_rules.cc
+++ b/re2c/src/dfa/dead_rules.cc
@@ -1,11 +1,19 @@
 #include <string.h>
+#include <set>
+#include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/conf/warn.h"
 #include "src/dfa/dfa.h"
+#include "src/re/rule.h"
 #include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+struct tcmd_t;
+
 /* note [unreachable rules]
  *
  * DFA may contain useless final states. Such states may

diff --git a/re2c/src/dfa/determinization.cc b/re2c/src/dfa/determinization.cc
index 492a3ff1bdb7c95f266bffc8ac97f82c57b82852..f2f8347ae8cc77dbfdc730d6b10e143c60bff100 100644 (file)
--- a/re2c/src/dfa/determinization.cc
+++ b/re2c/src/dfa/determinization.cc
@@ -1,14 +1,25 @@
-#include <limits>
+#include <assert.h>
+#include "src/util/c99_stdint.h"
 #include <string.h>
+#include <algorithm>
+#include <limits>
+#include <set>
+#include <string>
+#include <valarray>
 #include <vector>
 
 #include "src/conf/opt.h"
+#include "src/conf/warn.h"
 #include "src/dfa/closure.h"
 #include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/dfa/find_state.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tagtree.h"
+#include "src/dfa/tcmd.h"
 #include "src/nfa/nfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/util/range.h"
 
 namespace re2c

diff --git a/re2c/src/dfa/dump.cc b/re2c/src/dfa/dump.cc
index 8c11c25ce5da530d558eb68f1c0989b20660ba9f..7f8d505e6998c5fc3de1ce4a4c26c980034e28f8 100644 (file)
--- a/re2c/src/dfa/dump.cc
+++ b/re2c/src/dfa/dump.cc
@@ -1,7 +1,18 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/conf/opt.h"
+#include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tagtree.h"
+#include "src/dfa/tcmd.h"
+#include "src/nfa/nfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/dump.h b/re2c/src/dfa/dump.h
index 3381ac4c80de73cbc688af4145e43c21a1426b98..c58e281059367f4bc06e797fdc53b9acefc4143d 100644 (file)
--- a/re2c/src/dfa/dump.h
+++ b/re2c/src/dfa/dump.h
@@ -1,12 +1,22 @@
 #ifndef _RE2C_DFA_DUMP_
 #define _RE2C_DFA_DUMP_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/closure.h"
 #include "src/dfa/dfa.h"
+#include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+struct Tagpool;
+struct dfa_t;
+struct nfa_state_t;
+struct nfa_t;
+struct tcmd_t;
+
 struct dump_dfa_t
 {
        const bool debug;

diff --git a/re2c/src/dfa/fallback_tags.cc b/re2c/src/dfa/fallback_tags.cc
index 9c56f8972b271dea4d6a67a9700ade25899e88ac..5eee256329d90436c87f7d5302fd253a74966472 100644 (file)
--- a/re2c/src/dfa/fallback_tags.cc
+++ b/re2c/src/dfa/fallback_tags.cc
@@ -1,4 +1,10 @@
+#include <stddef.h>
+#include <algorithm>
+#include <vector>
+
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/fillpoints.cc b/re2c/src/dfa/fillpoints.cc
index 130f17ee7837d639d9889fa63ee71192f6db1735..1e2c844b5f7ee3716776781a702a100b22a80f9b 100644 (file)
--- a/re2c/src/dfa/fillpoints.cc
+++ b/re2c/src/dfa/fillpoints.cc
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include <limits>
 #include <stack>
 #include <vector>

diff --git a/re2c/src/dfa/find_state.cc b/re2c/src/dfa/find_state.cc
index 09b75f1b7dd93e6a2d5df6a4c26045d9efdb804d..fe044bca4a12c07d716a2a6b60784cf0c3fbfc3e 100644 (file)
--- a/re2c/src/dfa/find_state.cc
+++ b/re2c/src/dfa/find_state.cc
@@ -1,7 +1,16 @@
+#include <assert.h>
+#include <stdlib.h>
 #include <string.h>
+#include <algorithm>
+#include <valarray>
 
+#include "src/dfa/dfa.h"
+#include "src/dfa/dump.h"
 #include "src/dfa/find_state.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tcmd.h"
+#include "src/nfa/nfa.h"
+#include "src/re/rule.h"
 #include "src/util/hash32.h"
 
 namespace re2c

diff --git a/re2c/src/dfa/find_state.h b/re2c/src/dfa/find_state.h
index e7a584991d3748e9e628d3df292f5acf25a9f783..0f0841256a668d7cb7a561f468458f4e8e9146a2 100644 (file)
--- a/re2c/src/dfa/find_state.h
+++ b/re2c/src/dfa/find_state.h
@@ -1,14 +1,27 @@
 #ifndef _RE2C_DFA_FIND_STATE_
 #define _RE2C_DFA_FIND_STATE_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <vector>
+
 #include "src/dfa/closure.h"
 #include "src/dfa/dump.h"
+#include "src/dfa/tagtree.h"
+#include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
 #include "src/util/lookup.h"
 
 namespace re2c
 {
 
+class tcpool_t;
+struct Tagpool;
+struct dfa_t;
+struct dump_dfa_t;
+struct nfa_state_t;
+struct tcmd_t;
+
 struct kernel_t
 {
        size_t size;

diff --git a/re2c/src/dfa/minimization.cc b/re2c/src/dfa/minimization.cc
index 2f30ca43812f83af95c1aac1838882874018c38d..6404b45d2093f0c2e3713a171bf3430939fd61c2 100644 (file)
--- a/re2c/src/dfa/minimization.cc
+++ b/re2c/src/dfa/minimization.cc
@@ -1,9 +1,10 @@
-#include <map>
 #include <string.h>
+#include <map>
 #include <utility>
 #include <vector>
 
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {

diff --git a/re2c/src/dfa/tagpool.cc b/re2c/src/dfa/tagpool.cc
index 5dc387bcc2603b76be202a0e9691a1c8c1de7cd6..b4fd90af0b798806240c0a9947367d72be62711f 100644 (file)
--- a/re2c/src/dfa/tagpool.cc
+++ b/re2c/src/dfa/tagpool.cc
@@ -1,5 +1,7 @@
+#include "src/util/c99_stdint.h"
 #include <stdlib.h> // malloc
 #include <string.h> // memcpy, memcmp
+#include <algorithm>
 
 #include "src/dfa/tagpool.h"
 #include "src/util/hash32.h"

diff --git a/re2c/src/dfa/tagpool.h b/re2c/src/dfa/tagpool.h
index e8315385b12c6c70c294126ecd5df33145024af2..f06de0afd73abe6809d883c40c27052c1e53a6bb 100644 (file)
--- a/re2c/src/dfa/tagpool.h
+++ b/re2c/src/dfa/tagpool.h
@@ -1,17 +1,19 @@
 #ifndef _RE2C_DFA_TAGPOOL_
 #define _RE2C_DFA_TAGPOOL_
 
+#include <stddef.h>
 #include <stack>
 
 #include "src/dfa/closure.h"
 #include "src/dfa/tagtree.h"
 #include "src/re/tag.h"
-#include "src/util/lookup.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/lookup.h"
 
 namespace re2c
 {
 
+struct nfa_state_t;
 struct opt_t;
 
 static const size_t ZERO_TAGS = 0;

diff --git a/re2c/src/dfa/tagtree.cc b/re2c/src/dfa/tagtree.cc
index 5e9afcc0e2761d0b626c530bb9217d4b0cb2962c..a5966a18201d70e4d97b061793decddff45e266f 100644 (file)
--- a/re2c/src/dfa/tagtree.cc
+++ b/re2c/src/dfa/tagtree.cc
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "src/dfa/tagtree.h"
 

diff --git a/re2c/src/dfa/tagtree.h b/re2c/src/dfa/tagtree.h
index 6fc66734d81ad7d8206938b962595d28fd6cfb22..7f3bf4bb14eb2e07edc3d1d9c7422d27adf86414 100644 (file)
--- a/re2c/src/dfa/tagtree.h
+++ b/re2c/src/dfa/tagtree.h
@@ -1,6 +1,9 @@
 #ifndef _RE2C_DFA_TAGTREE_
 #define _RE2C_DFA_TAGTREE_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <sys/types.h>
 #include <vector>
 
 #include "src/re/tag.h"

diff --git a/re2c/src/dfa/tcmd.h b/re2c/src/dfa/tcmd.h
index 948efe98a48d5073626173a8f84ccf1be2fe7738..88d12fa4f634534e18889f269fc22535f677ebda 100644 (file)
--- a/re2c/src/dfa/tcmd.h
+++ b/re2c/src/dfa/tcmd.h
@@ -1,9 +1,11 @@
 #ifndef _RE2C_DFA_TCMD_
 #define _RE2C_DFA_TCMD_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/tagtree.h"
 #include "src/re/tag.h"
-#include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
 #include "src/util/lookup.h"
 #include "src/util/slab_allocator.h"

diff --git a/re2c/src/main.cc b/re2c/src/main.cc
index 06b3a31eb8217bbaedaf0b045754e3e55003fdac..55d0499e6fdb170ec3cc62cf353ea8c05251dafc 100644 (file)
--- a/re2c/src/main.cc
+++ b/re2c/src/main.cc
@@ -1,12 +1,10 @@
-#include "src/util/c99_stdint.h"
-#include <string>
-
+#include "src/ast/input.h"
+#include "src/ast/scanner.h"
+#include "src/code/output.h"
 #include "src/compile.h"
 #include "src/conf/msg.h"
 #include "src/conf/opt.h"
 #include "src/conf/warn.h"
-#include "src/ast/input.h"
-#include "src/ast/scanner.h"
 
 using namespace re2c;
 

diff --git a/re2c/src/nfa/dump.cc b/re2c/src/nfa/dump.cc
index 47e175aaa5d6da9a93aae14d9627989482f1bf94..4d418b8bed30a4fe11fc80f4366e4dce5d2355e0 100644 (file)
--- a/re2c/src/nfa/dump.cc
+++ b/re2c/src/nfa/dump.cc
@@ -1,6 +1,11 @@
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
+#include <string>
+#include <vector>
 
 #include "src/nfa/nfa.h"
+#include "src/re/tag.h"
+#include "src/util/range.h"
 
 namespace re2c
 {

diff --git a/re2c/src/nfa/estimate_size.cc b/re2c/src/nfa/estimate_size.cc
index 32663b8d2232dfac75b416ae62017f6b51aea39b..98c2143fd3cddf45e23559a923cf9c55c424ac70 100644 (file)
--- a/re2c/src/nfa/estimate_size.cc
+++ b/re2c/src/nfa/estimate_size.cc
@@ -1,4 +1,9 @@
-#include "src/nfa/nfa.h"
+
+#include <stddef.h>
+#include <vector>
+
+#include "src/ast/ast.h"
+#include "src/re/re.h"
 
 namespace re2c {
 

diff --git a/re2c/src/nfa/re_to_nfa.cc b/re2c/src/nfa/re_to_nfa.cc
index f80e8b1db870f0ab82695e689ec2164cb480c963..e2d1f19af95619ad8bbfdddcd6ca6e8dc2092e97 100644 (file)
--- a/re2c/src/nfa/re_to_nfa.cc
+++ b/re2c/src/nfa/re_to_nfa.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <vector>
+
+#include "src/ast/ast.h"
 #include "src/nfa/nfa.h"
+#include "src/re/re.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 

diff --git a/re2c/src/re/ast_to_re.cc b/re2c/src/re/ast_to_re.cc
index 7c97ac89cbbb170b8beb91fea1ca5eaa5d29a57f..dbcd0d07a3f0f905def3bb51f31bffeaf6f0e715 100644 (file)
--- a/re2c/src/re/ast_to_re.cc
+++ b/re2c/src/re/ast_to_re.cc
@@ -1,10 +1,25 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
+
+#include "src/ast/ast.h"
 #include "src/conf/msg.h"
-#include "src/re/re.h"
+#include "src/conf/opt.h"
+#include "src/conf/warn.h"
 #include "src/re/empty_class_policy.h"
 #include "src/re/encoding/case.h"
 #include "src/re/encoding/enc.h"
 #include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/re/encoding/utf8/utf8_regexp.h"
+#include "src/re/re.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
+#include "src/util/range.h"
 
 namespace re2c {
 

diff --git a/re2c/src/re/default_tags.cc b/re2c/src/re/default_tags.cc
index ef69c06bb9246f632fc129b4a13ab18028738abe..226e7058ffb0a2ec27bd7d42dc90a271043ea9d8 100644 (file)
--- a/re2c/src/re/default_tags.cc
+++ b/re2c/src/re/default_tags.cc
@@ -1,3 +1,6 @@
+#include <stddef.h>
+#include <vector>
+
 #include "src/re/re.h"
 
 namespace re2c {

diff --git a/re2c/src/re/encoding/enc.cc b/re2c/src/re/encoding/enc.cc
index 2fed6db74e530d2b39e1a1fb43e6c8d3c2528993..5f65e82162d2481de3d752fbf3c4952348057df5 100644 (file)
--- a/re2c/src/re/encoding/enc.cc
+++ b/re2c/src/re/encoding/enc.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/enc.h"
+
+#include <stddef.h>
+
 #include "src/util/range.h"
 
 namespace re2c {

diff --git a/re2c/src/re/encoding/range_suffix.h b/re2c/src/re/encoding/range_suffix.h
index 4d3529c6a3ab9b4c934aabded50d0baf5ba376df..ae7a6a59f72dfc8ff1cbfdfe8c33969d9b8d1159 100644 (file)
--- a/re2c/src/re/encoding/range_suffix.h
+++ b/re2c/src/re/encoding/range_suffix.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_RE_ENCODING_RANGE_SUFFIX_
 #define _RE2C_RE_ENCODING_RANGE_SUFFIX_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h> // NULL
+#include "src/util/c99_stdint.h"
 
 #include "src/re/re.h"
 #include "src/util/forbid_copy.h"

diff --git a/re2c/src/re/encoding/utf16/utf16_range.cc b/re2c/src/re/encoding/utf16/utf16_range.cc
index 1d78ada0cd1f4312cd9af0fd28e0cfe186ab0212..f0164d1228928a6dd583de312e94fa7b0050546b 100644 (file)
--- a/re2c/src/re/encoding/utf16/utf16_range.cc
+++ b/re2c/src/re/encoding/utf16/utf16_range.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/utf16/utf16_range.h"
+
+#include <stddef.h>
+
 #include "src/re/encoding/range_suffix.h"
 
 namespace re2c {

diff --git a/re2c/src/re/encoding/utf16/utf16_regexp.cc b/re2c/src/re/encoding/utf16/utf16_regexp.cc
index 2778a332b83407276c1cb630ffa3047762d2a510..43fed267cb34bb860a9a7db73e7e32b67e36c5d0 100644 (file)
--- a/re2c/src/re/encoding/utf16/utf16_regexp.cc
+++ b/re2c/src/re/encoding/utf16/utf16_regexp.cc
@@ -1,8 +1,9 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 
-#include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/re/encoding/range_suffix.h"
 #include "src/re/encoding/utf16/utf16_range.h"
+#include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/util/range.h"
 
 namespace re2c {

diff --git a/re2c/src/re/encoding/utf8/utf8_range.cc b/re2c/src/re/encoding/utf8/utf8_range.cc
index c93eeaa73a4a1367946b45fff1cc07f183d32e8f..18ef75656b9e1f72be3a2f8b8c6974ba010b2918 100644 (file)
--- a/re2c/src/re/encoding/utf8/utf8_range.cc
+++ b/re2c/src/re/encoding/utf8/utf8_range.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/utf8/utf8_range.h"
+
+#include <stddef.h>
+
 #include "src/re/encoding/range_suffix.h"
 
 namespace re2c {

diff --git a/re2c/src/re/encoding/utf8/utf8_regexp.cc b/re2c/src/re/encoding/utf8/utf8_regexp.cc
index 55bdd79a5767259a6385689edffcfd17089fc8dd..370663dd02ef3bbef611e9a0eb670a73433684eb 100644 (file)
--- a/re2c/src/re/encoding/utf8/utf8_regexp.cc
+++ b/re2c/src/re/encoding/utf8/utf8_regexp.cc
@@ -1,8 +1,9 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 
-#include "src/re/encoding/utf8/utf8_regexp.h"
 #include "src/re/encoding/range_suffix.h"
 #include "src/re/encoding/utf8/utf8_range.h"
+#include "src/re/encoding/utf8/utf8_regexp.h"
 #include "src/util/range.h"
 
 namespace re2c {

diff --git a/re2c/src/re/fixed_tags.cc b/re2c/src/re/fixed_tags.cc
index c19ad5106516bb8c1e79146293e3d954e4c738c8..03d5f4952e28da64c349499f957977ebd38f6a0a 100644 (file)
--- a/re2c/src/re/fixed_tags.cc
+++ b/re2c/src/re/fixed_tags.cc
@@ -1,4 +1,10 @@
+#include <stddef.h>
+#include <vector>
+
+#include "src/code/input_api.h"
+#include "src/conf/opt.h"
 #include "src/re/re.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 

diff --git a/re2c/src/re/nullable.cc b/re2c/src/re/nullable.cc
index 9aa7c52171c123d69bd1998eed90bbdeaf57c58b..40cb7921973801a106f6df70f6ed9be775d879dd 100644 (file)
--- a/re2c/src/re/nullable.cc
+++ b/re2c/src/re/nullable.cc
@@ -1,4 +1,12 @@
+#include <stddef.h>
+#include <string>
+#include <valarray>
+#include <vector>
+
+#include "src/conf/warn.h"
 #include "src/re/re.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 

diff --git a/re2c/src/re/rule.h b/re2c/src/re/rule.h
index 7488e0ce4db9106a70f63f3b783a4bf2b93b2c1c..1f9dcf58e5b792a52cceba94b4babc5671855b97 100644 (file)
--- a/re2c/src/re/rule.h
+++ b/re2c/src/re/rule.h
@@ -1,13 +1,14 @@
 #ifndef _RE2C_RE_RULE_
 #define _RE2C_RE_RULE_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <string>
 
 #include "src/re/tag.h"
-#include "src/util/free_list.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/free_list.h"
 
 namespace re2c
 {

diff --git a/re2c/src/re/split_charset.cc b/re2c/src/re/split_charset.cc
index 21c282dfe6bdf0e691d530cb813c6c8d0e53b4ad..d2bef13a64017e898729eacd20ed36ce50467be4 100644 (file)
--- a/re2c/src/re/split_charset.cc
+++ b/re2c/src/re/split_charset.cc
@@ -1,8 +1,12 @@
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <stack>
+#include <vector>
 
+#include "src/conf/opt.h"
+#include "src/re/encoding/enc.h"
 #include "src/re/re.h"
+#include "src/util/range.h"
 
 namespace re2c {
 

diff --git a/re2c/src/re/tag.h b/re2c/src/re/tag.h
index e389b83089847ff224ebc2ebb1fa43ae8d00e417..9a9a05e4aee71feb1d313f94418d555bd6c25553 100644 (file)
--- a/re2c/src/re/tag.h
+++ b/re2c/src/re/tag.h
@@ -1,12 +1,12 @@
 #ifndef _RE2C_RE_TAG_
 #define _RE2C_RE_TAG_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <limits>
 #include <string>
 #include <vector>
 
-#include "src/util/c99_stdint.h"
-
 namespace re2c
 {
 

diff --git a/re2c/src/skeleton/control_flow.cc b/re2c/src/skeleton/control_flow.cc
index a1b3a20485eec02ee3869702e89101e4192d074e..138def51ad841dee525e82ca5bbc7f9ecf5e7513 100644 (file)
--- a/re2c/src/skeleton/control_flow.cc
+++ b/re2c/src/skeleton/control_flow.cc
@@ -1,6 +1,12 @@
+#include "src/util/c99_stdint.h"
+#include <stdio.h>
+#include <map>
+#include <utility>
 #include <valarray>
 #include <vector>
 
+#include "src/conf/warn.h"
+#include "src/re/rule.h"
 #include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/u32lim.h"

diff --git a/re2c/src/skeleton/generate_code.cc b/re2c/src/skeleton/generate_code.cc
index 30ed8c870fab91de3a7181990a8a874cb3cfda94..e5b6ef60b92279eb8f90e7bd97e5abc7f0293711 100644 (file)
--- a/re2c/src/skeleton/generate_code.cc
+++ b/re2c/src/skeleton/generate_code.cc
@@ -1,14 +1,18 @@
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
-#include <algorithm>
+#include "src/util/c99_stdint.h"
 #include <set>
 #include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/emit.h"
 #include "src/code/output.h"
+#include "src/conf/opt.h"
 #include "src/re/encoding/enc.h"
-#include "src/adfa/adfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c

diff --git a/re2c/src/skeleton/generate_data.cc b/re2c/src/skeleton/generate_data.cc
index 9b690a49a9ef59f669bbaf39f985218122bc2bea..f2f16207ffd651a7f75a8177adce7dff26bcb2f7 100644 (file)
--- a/re2c/src/skeleton/generate_data.cc
+++ b/re2c/src/skeleton/generate_data.cc
@@ -1,20 +1,25 @@
-#include "src/util/c99_stdint.h"
 #include <assert.h>
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
+#include <valarray>
 #include <vector>
 
 #include "src/conf/msg.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/encoding/enc.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
+#include "src/util/forbid_copy.h"
 #include "src/util/u32lim.h"
+#include "src/util/wrap_iter.h"
 
 namespace re2c
 {

diff --git a/re2c/src/skeleton/maxpath.cc b/re2c/src/skeleton/maxpath.cc
index 8fada329276326b75dcc1ed9f73dc7439a5b2792..3daa3a5688e686e2b2067d86c8e526e1b7c4a643 100644 (file)
--- a/re2c/src/skeleton/maxpath.cc
+++ b/re2c/src/skeleton/maxpath.cc
@@ -1,6 +1,11 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <algorithm>
 #include <limits>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "src/conf/msg.h"
 #include "src/skeleton/skeleton.h"

diff --git a/re2c/src/skeleton/skeleton.cc b/re2c/src/skeleton/skeleton.cc
index acf90da956b6aab7ab1f082fb438006b16cbd30e..5f551ab5b6cfcc6068d92feff88d78a8a6637144 100644 (file)
--- a/re2c/src/skeleton/skeleton.cc
+++ b/re2c/src/skeleton/skeleton.cc
@@ -1,14 +1,15 @@
 #include <assert.h>
 #include <algorithm>
-#include <string.h>
 
 #include "src/dfa/dfa.h"
-#include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c
 {
 
+struct opt_t;
+struct tcmd_t;
+
 Node::Node()
        : arcs()
        , rule(Rule::NONE)

diff --git a/re2c/src/skeleton/skeleton.h b/re2c/src/skeleton/skeleton.h
index 26c2b36375d877970606269914df8183c2757b48..206365e12e94d40252c55fffb3b072d9e010eda4 100644 (file)
--- a/re2c/src/skeleton/skeleton.h
+++ b/re2c/src/skeleton/skeleton.h
@@ -7,26 +7,31 @@
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <valarray>
 #include <vector>
-#include <utility>
 
 #include "src/code/bitmap.h"
 #include "src/conf/opt.h"
 #include "src/dfa/tcmd.h"
 #include "src/re/rule.h"
-#include "src/util/local_increment.h"
+#include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/local_increment.h"
 #include "src/util/wrap_iter.h"
 
 namespace re2c
 {
 
-struct dfa_t;
-struct dfa_state_t;
-struct DFA;
 class OutputFile;
 class path_t;
+struct DFA;
+struct dfa_state_t;
+struct dfa_t;
+class Warn;
+class bitmaps_t;
+struct opt_t;
+struct tcmd_t;
 
 typedef local_increment_t<uint8_t> local_inc;
 

diff --git a/re2c/src/util/range.h b/re2c/src/util/range.h
index 9a9cf03b455b559c3b6c7bdac03835cccb165284..afc142cc7407c85bd3605e5b87643f95d93f8b22 100644 (file)
--- a/re2c/src/util/range.h
+++ b/re2c/src/util/range.h
@@ -1,9 +1,9 @@
 #ifndef _RE2C_UTIL_RANGE_
 #define _RE2C_UTIL_RANGE_
 
-#include "src/util/c99_stdint.h"
 #include <assert.h>
 #include <stddef.h> // NULL
+#include "src/util/c99_stdint.h"
 
 #include "src/test/range/test.h"
 #include "src/util/forbid_copy.h"

diff --git a/re2c/src/util/s_to_n32_unsafe.h b/re2c/src/util/s_to_n32_unsafe.h
index e733c1613a690b471c93accd2c01e3dc05b5e97c..27c1e1cc3b56caa31a6c7391b454ebf1589b14e7 100644 (file)
--- a/re2c/src/util/s_to_n32_unsafe.h
+++ b/re2c/src/util/s_to_n32_unsafe.h
@@ -1,9 +1,10 @@
 #ifndef _RE2C_UTIL_S_TO_N32_UNSAFE_
 #define _RE2C_UTIL_S_TO_N32_UNSAFE_
 
-#include "src/util/attribute.h"
 #include "src/util/c99_stdint.h"
 
+#include "src/util/attribute.h"
+
 bool s_to_u32_unsafe (const char * s, const char * s_end, uint32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
 bool s_to_i32_unsafe (const char * s, const char * s_end, int32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
 

diff --git a/release.sh b/release.sh
index 8c7d0271df7977bc37a169a1ef720428954654fc..edf0e6a3d3a37b95938c1b83e71faa9a074460a9 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+echo 'RUNME: configure CXX=include-what-you-use CXXFLAGS="--check-also" && make -k 2>log && python2 `which fix_inclydes.py` < log'
 echo 'RUNME: cppcheck --enable=all --inconclusive --std=posix --quiet --force -I. src/'
 echo 'RUNME: for h in $(find src/ -name ''*.h*''); do echo "CHECKING $h"; g++ -I. -c $h -o foo.o; done'
 echo "RUNME: uselex `find <objdir> -type f -name '*.o'`"