Fixed includes (applied some of 'include-what-you-use' suggestions).

diff --git a/re2c/src/codegen/go_construct.cc b/re2c/src/codegen/go_construct.cc
index 44d9644eec37a0db8a8578da7ac5f16423e06537..e680475f0630b21cc04e9f55fff525e63aad446e 100644 (file)
--- a/re2c/src/codegen/go_construct.cc
+++ b/re2c/src/codegen/go_construct.cc
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <string>
 #include <utility>

diff --git a/re2c/src/codegen/go_emit.cc b/re2c/src/codegen/go_emit.cc
index f8b672a18e589facbc54a4037670d8a2d8c83fb3..e970eee562ca944b4b3cba7b746399c74ff59dbb 100644 (file)
--- a/re2c/src/codegen/go_emit.cc
+++ b/re2c/src/codegen/go_emit.cc
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <string>
 #include <utility>

diff --git a/re2c/src/codegen/go_used_labels.cc b/re2c/src/codegen/go_used_labels.cc
index 229e732245e14f9ffeef75b40cfce1e130867839..09cf98ea807bd6523a826c2a8378549af843ac19 100644 (file)
--- a/re2c/src/codegen/go_used_labels.cc
+++ b/re2c/src/codegen/go_used_labels.cc
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <utility>

diff --git a/re2c/src/conf/warn.cc b/re2c/src/conf/warn.cc
index 3aa68210a68f8f594c139810b89e3901389bc4e6..e309f26d6178ef79f569132c10576b657f467224 100644 (file)
--- a/re2c/src/conf/warn.cc
+++ b/re2c/src/conf/warn.cc
@@ -1,13 +1,10 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <algorithm>
-#include <set>
-#include <string>
 #include <utility>
 
 #include "src/conf/msg.h"
 #include "src/conf/warn.h"
-#include "src/ir/rule_rank.h"
 
 namespace re2c {
 

diff --git a/re2c/src/ir/adfa/adfa.cc b/re2c/src/ir/adfa/adfa.cc
index 0219690d5f20348f7da4298ea76c4a98b9884c41..cb41d035107557dbc2f4c93c52a9e5169e8774ae 100644 (file)
--- a/re2c/src/ir/adfa/adfa.cc
+++ b/re2c/src/ir/adfa/adfa.cc
@@ -2,6 +2,7 @@
 #include <queue>
 #include <set>
 #include <vector>
+#include <utility>
 
 #include "src/codegen/go.h"
 #include "src/ir/adfa/adfa.h"

diff --git a/re2c/src/ir/adfa/adfa.h b/re2c/src/ir/adfa/adfa.h
index ed09c298b2a963c90ce963c07186f7d60761bbf7..95f512d63477e6f98620f83f32f69cfaa1149c10 100644 (file)
--- a/re2c/src/ir/adfa/adfa.h
+++ b/re2c/src/ir/adfa/adfa.h
@@ -1,11 +1,13 @@
 #ifndef _RE2C_IR_ADFA_ADFA_
 #define _RE2C_IR_ADFA_ADFA_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <string>
 
 #include "src/codegen/go.h"
+#include "src/codegen/label.h"
 #include "src/ir/adfa/action.h"
 #include "src/ir/regexp/regexp.h"
 #include "src/util/forbid_copy.h"
@@ -14,7 +16,6 @@ namespace re2c
 {
 
 struct Skeleton;
-class label_t;
 struct Output;
 struct OutputFile;
 struct dfa_t;

diff --git a/re2c/src/ir/adfa/prepare.cc b/re2c/src/ir/adfa/prepare.cc
index 694cc95d558d32fed268edf64472e8608f239ed9..39cf65c1bba277495b41b0e3cfba3b372e69ecb5 100644 (file)
--- a/re2c/src/ir/adfa/prepare.cc
+++ b/re2c/src/ir/adfa/prepare.cc
@@ -4,7 +4,6 @@
 
 #include "src/codegen/bitmap.h"
 #include "src/codegen/go.h"
-#include "src/conf/opt.h"
 #include "src/globals.h"
 #include "src/ir/adfa/action.h"
 #include "src/ir/adfa/adfa.h"

diff --git a/re2c/src/ir/compile.cc b/re2c/src/ir/compile.cc
index 85dca28457058790684356f6041dd34137ce797d..b38b398a1be74188830aa12f7657ab9c8c7b7581 100644 (file)
--- a/re2c/src/ir/compile.cc
+++ b/re2c/src/ir/compile.cc
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <ostream>
+#include <set>
 
 #include "src/codegen/output.h"
 #include "src/ir/compile.h"

diff --git a/re2c/src/ir/dfa/determinization.cc b/re2c/src/ir/dfa/determinization.cc
index 813d5219943e2a48f31241ae8f27bd2e769e87fe..01a04cc7e8362a1b309563e43b9117174dcdf9bf 100644 (file)
--- a/re2c/src/ir/dfa/determinization.cc
+++ b/re2c/src/ir/dfa/determinization.cc
@@ -1,13 +1,15 @@
 #include <algorithm>
-#include <assert.h>
 #include <limits>
-#include <string.h>
-#include <queue>
+#include <map>
+#include <set>
+#include <vector>
 
 #include "src/ir/dfa/dfa.h"
 #include "src/ir/nfa/nfa.h"
+#include "src/ir/regexp/regexp.h"
 #include "src/ir/regexp/regexp_rule.h"
 #include "src/ir/rule_rank.h"
+#include "src/parse/rules.h"
 #include "src/util/ord_hash_set.h"
 #include "src/util/range.h"
 

diff --git a/re2c/src/ir/dfa/fillpoints.cc b/re2c/src/ir/dfa/fillpoints.cc
index 1b45bde387a6a8cfc1d6b36e795fe00a60f7faa9..f4488ea75bf46c376eea2baaabbea2268233cc30 100644 (file)
--- a/re2c/src/ir/dfa/fillpoints.cc
+++ b/re2c/src/ir/dfa/fillpoints.cc
@@ -1,6 +1,6 @@
 #include <limits>
 #include <stack>
-#include <string.h>
+#include <vector>
 
 #include "src/ir/dfa/dfa.h"
 

diff --git a/re2c/src/ir/dfa/minimization.cc b/re2c/src/ir/dfa/minimization.cc
index 59c4966b7e9f2190a189da26144050bf27fcb160..79c93e490c3f9c42d83925372a1e519e23196d74 100644 (file)
--- a/re2c/src/ir/dfa/minimization.cc
+++ b/re2c/src/ir/dfa/minimization.cc
@@ -1,13 +1,16 @@
 #include <string.h>
+#include <utility>
+#include <vector>
 
 #include "src/conf/opt.h"
 #include "src/ir/dfa/dfa.h"
-#include "src/ir/regexp/regexp_rule.h"
 #include "src/globals.h"
 
 namespace re2c
 {
 
+class RuleOp;
+
 /*
  * note [DFA minimization: table filling algorithm]
  *

diff --git a/re2c/src/ir/nfa/calc_size.cc b/re2c/src/ir/nfa/calc_size.cc
index 27c3118869e821eb40f169cb2ac9f291f88c7247..39f0b4e1be1a34f55f0690e59ef2c1b7b86ea8bc 100644 (file)
--- a/re2c/src/ir/nfa/calc_size.cc
+++ b/re2c/src/ir/nfa/calc_size.cc
@@ -7,7 +7,6 @@
 #include "src/ir/regexp/regexp_match.h"
 #include "src/ir/regexp/regexp_null.h"
 #include "src/ir/regexp/regexp_rule.h"
-#include "src/util/range.h"
 
 namespace re2c
 {

diff --git a/re2c/src/ir/nfa/nfa.h b/re2c/src/ir/nfa/nfa.h
index f536b05969d002017ff49bf551a3aadef87626a0..28587f415dd2caa3219a6be6f691a9c5d662b0c3 100644 (file)
--- a/re2c/src/ir/nfa/nfa.h
+++ b/re2c/src/ir/nfa/nfa.h
@@ -2,8 +2,6 @@
 #define _RE2C_IR_NFA_NFA_
 
 #include "src/util/c99_stdint.h"
-#include <vector>
-#include <set>
 
 #include "src/util/forbid_copy.h"
 

diff --git a/re2c/src/ir/nfa/split.cc b/re2c/src/ir/nfa/split.cc
index 9b3dd7450df69b21e63e57f122dc678536674b89..73e63040bc640e08f0315e032a5844c62ac97b16 100644 (file)
--- a/re2c/src/ir/nfa/split.cc
+++ b/re2c/src/ir/nfa/split.cc
@@ -1,4 +1,5 @@
 #include "src/util/c99_stdint.h"
+#include <set>
 
 #include "src/ir/regexp/regexp.h"
 #include "src/ir/regexp/regexp_alt.h"

diff --git a/re2c/src/ir/regexp/regexp.cc b/re2c/src/ir/regexp/regexp.cc
index eb25ecec2c7f41a1b68c616cf2487bb5e6e516dd..e5a7d9bd5dece2bdc6a56f3ad25352d31d4675d8 100644 (file)
--- a/re2c/src/ir/regexp/regexp.cc
+++ b/re2c/src/ir/regexp/regexp.cc
@@ -1,3 +1,5 @@
+#include <stddef.h>
+
 #include "src/conf/opt.h"
 #include "src/conf/warn.h"
 #include "src/globals.h"

diff --git a/re2c/src/ir/skeleton/skeleton.h b/re2c/src/ir/skeleton/skeleton.h
index 576dcca167155e6e2eef0539907b3ca3a72db4ce..78c082716404baa3b44af56e5ce57d738b12f7b6 100644 (file)
--- a/re2c/src/ir/skeleton/skeleton.h
+++ b/re2c/src/ir/skeleton/skeleton.h
@@ -9,6 +9,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <utility>
 
 #include "src/ir/regexp/regexp.h"
 #include "src/ir/rule_rank.h"

diff --git a/re2c/src/util/ord_hash_set.h b/re2c/src/util/ord_hash_set.h
index 0275e6ef250b3859dee16f973e0ac3273228beb7..55e9742af598ae735bc4aac9270d0bbc7d872814 100644 (file)
--- a/re2c/src/util/ord_hash_set.h
+++ b/re2c/src/util/ord_hash_set.h
@@ -2,6 +2,8 @@
 #define _RE2C_UTIL_ORD_HASH_SET_
 
 #include "src/util/c99_stdint.h"
+#include <stdlib.h> // malloc, free
+#include <string.h> // memcpy
 #include <map>
 #include <vector>