From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Tue, 19 Jan 2016 18:56:07 +0000 (+0000)
Subject: Fixed includes (applied some of 'include-what-you-use' suggestions).
X-Git-Tag: 0.16~1^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e060774594a1fc74c884bb7892f2975a81242494;p=re2c

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 44d9644e..e680475f 100644
--- 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 f8b672a1..e970eee5 100644
--- 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 229e7322..09cf98ea 100644
--- 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 3aa68210..e309f26d 100644
--- 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 0219690d..cb41d035 100644
--- 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 ed09c298..95f512d6 100644
--- 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 694cc95d..39cf65c1 100644
--- 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 85dca284..b38b398a 100644
--- 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 813d5219..01a04cc7 100644
--- 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 1b45bde3..f4488ea7 100644
--- 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 59c4966b..79c93e49 100644
--- 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 27c31188..39f0b4e1 100644
--- 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 f536b059..28587f41 100644
--- 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 9b3dd745..73e63040 100644
--- 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 eb25ecec..e5a7d9bd 100644
--- 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 576dcca1..78c08271 100644
--- 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 0275e6ef..55e9742a 100644
--- 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>