Skip to content

Commit c0bf6ee

Browse files
committedMay 11, 2014
Apply corrections from the "include what you use" tool
Generally cleanups of the includes. Making sure each file can properly stand on its own and forward declares when possible.
1 parent f29af46 commit c0bf6ee

25 files changed

+305
-57
lines changed
 

‎include/chaiscript/chaiscript_stdlib.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,17 @@
77
#ifndef CHAISCRIPT_STDLIB_HPP_
88
#define CHAISCRIPT_STDLIB_HPP_
99

10+
#include <map>
11+
#include <memory>
12+
#include <string>
13+
#include <utility>
14+
#include <vector>
15+
1016
#include "chaiscript_defines.hpp"
17+
#include "dispatchkit/dispatchkit.hpp"
1118
#include "dispatchkit/bootstrap.hpp"
1219
#include "dispatchkit/bootstrap_stl.hpp"
20+
#include "dispatchkit/boxed_value.hpp"
1321

1422
/// @file
1523
///

‎include/chaiscript/dispatchkit/bad_boxed_cast.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,15 @@
77
#ifndef CHAISCRIPT_BAD_BOXED_CAST_HPP_
88
#define CHAISCRIPT_BAD_BOXED_CAST_HPP_
99

10+
#include <string>
11+
#include <typeinfo>
12+
1013
#include "type_info.hpp"
1114

15+
namespace chaiscript {
16+
class Type_Info;
17+
} // namespace chaiscript
18+
1219
namespace chaiscript
1320
{
1421
namespace exception

‎include/chaiscript/dispatchkit/bootstrap.hpp

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,31 @@
77
#ifndef CHAISCRIPT_BOOTSTRAP_HPP_
88
#define CHAISCRIPT_BOOTSTRAP_HPP_
99

10+
#include <cstdint>
11+
#include <exception>
12+
#include <functional>
13+
#include <iostream>
14+
#include <map>
15+
#include <memory>
16+
#include <sstream>
17+
#include <stdexcept>
18+
#include <string>
19+
#include <type_traits>
20+
#include <vector>
21+
22+
#include "bad_boxed_cast.hpp"
23+
#include "boxed_cast.hpp"
24+
#include "boxed_number.hpp"
25+
#include "boxed_value.hpp"
1026
#include "dispatchkit.hpp"
27+
#include "dynamic_cast_conversion.hpp"
1128
#include "dynamic_object.hpp"
12-
#include "register_function.hpp"
1329
#include "operators.hpp"
14-
#include "boxed_number.hpp"
15-
#include <sstream>
16-
#include <type_traits>
30+
#include "proxy_constructors.hpp"
31+
#include "proxy_functions.hpp"
32+
#include "proxy_functions_detail.hpp"
33+
#include "register_function.hpp"
34+
#include "type_info.hpp"
1735

1836
namespace chaiscript
1937
{

‎include/chaiscript/dispatchkit/bootstrap_stl.hpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,21 @@
1313
#ifndef CHAISCRIPT_BOOTSTRAP_STL_HPP_
1414
#define CHAISCRIPT_BOOTSTRAP_STL_HPP_
1515

16-
#include "dispatchkit.hpp"
16+
#include <functional>
17+
#include <iterator>
18+
#include <memory>
19+
#include <stdexcept>
20+
#include <string>
21+
#include <typeinfo>
22+
#include <vector>
23+
1724
#include "bootstrap.hpp"
25+
#include "boxed_value.hpp"
26+
#include "dispatchkit.hpp"
27+
#include "operators.hpp"
28+
#include "proxy_constructors.hpp"
1829
#include "register_function.hpp"
30+
#include "type_info.hpp"
1931

2032
namespace chaiscript
2133
{

‎include/chaiscript/dispatchkit/boxed_cast.hpp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,24 @@
77
#ifndef CHAISCRIPT_BOXED_CAST_HPP_
88
#define CHAISCRIPT_BOXED_CAST_HPP_
99

10-
#include "../chaiscript_defines.hpp"
10+
#include <type_traits>
1111

12-
#include "type_info.hpp"
13-
#include "boxed_value.hpp"
12+
#include "../chaiscript_defines.hpp"
13+
#include "../chaiscript_threading.hpp"
14+
#include "bad_boxed_cast.hpp"
1415
#include "boxed_cast_helper.hpp"
16+
#include "boxed_value.hpp"
1517
#include "dynamic_cast_conversion.hpp"
18+
#include "type_info.hpp"
1619

17-
#include "../chaiscript_threading.hpp"
20+
namespace chaiscript {
21+
class Dynamic_Cast_Conversions;
22+
namespace detail {
23+
namespace exception {
24+
class bad_any_cast;
25+
} // namespace exception
26+
} // namespace detail
27+
} // namespace chaiscript
1828

1929
namespace chaiscript
2030
{

‎include/chaiscript/dispatchkit/boxed_cast_helper.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
#ifndef CHAISCRIPT_BOXED_CAST_HELPER_HPP_
88
#define CHAISCRIPT_BOXED_CAST_HELPER_HPP_
99

10-
#include "type_info.hpp"
10+
#include <functional>
11+
#include <memory>
12+
#include <type_traits>
13+
1114
#include "boxed_value.hpp"
15+
#include "type_info.hpp"
1216

1317

1418
namespace chaiscript

‎include/chaiscript/dispatchkit/boxed_number.hpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@
77
#ifndef CHAISCRIPT_BOXED_NUMERIC_HPP_
88
#define CHAISCRIPT_BOXED_NUMERIC_HPP_
99

10-
#include "boxed_value.hpp"
11-
#include "../language/chaiscript_algebraic.hpp"
12-
#include <sstream>
1310
#include <cstdint>
11+
#include <sstream>
12+
#include <string>
13+
14+
#include "../language/chaiscript_algebraic.hpp"
15+
#include "any.hpp"
16+
#include "boxed_cast.hpp"
17+
#include "boxed_cast_helper.hpp"
18+
#include "boxed_value.hpp"
19+
#include "type_info.hpp"
20+
21+
namespace chaiscript {
22+
class Dynamic_Cast_Conversions;
23+
} // namespace chaiscript
1424

1525
namespace chaiscript
1626
{

‎include/chaiscript/dispatchkit/boxed_value.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
#ifndef CHAISCRIPT_BOXED_VALUE_HPP_
88
#define CHAISCRIPT_BOXED_VALUE_HPP_
99

10-
#include "type_info.hpp"
10+
#include <functional>
11+
#include <map>
12+
#include <memory>
13+
#include <type_traits>
1114

1215
#include "../chaiscript_threading.hpp"
13-
14-
#include <map>
1516
#include "any.hpp"
17+
#include "type_info.hpp"
1618

1719
namespace chaiscript
1820
{

‎include/chaiscript/dispatchkit/dispatchkit.hpp

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,43 @@
77
#ifndef CHAISCRIPT_DISPATCHKIT_HPP_
88
#define CHAISCRIPT_DISPATCHKIT_HPP_
99

10-
#include <typeinfo>
11-
#include <string>
10+
#include <algorithm>
11+
#include <cassert>
12+
#include <deque>
13+
#include <iostream>
14+
#include <iterator>
15+
#include <list>
1216
#include <map>
17+
#include <memory>
1318
#include <set>
1419
#include <stdexcept>
20+
#include <string>
21+
#include <typeinfo>
22+
#include <utility>
1523
#include <vector>
16-
#include <iostream>
17-
#include <deque>
18-
#include <list>
19-
#include <algorithm>
2024

25+
#include "../chaiscript_defines.hpp"
26+
#include "../chaiscript_threading.hpp"
27+
#include "boxed_cast.hpp"
28+
#include "boxed_cast_helper.hpp"
2129
#include "boxed_value.hpp"
22-
#include "type_info.hpp"
23-
#include "proxy_functions.hpp"
24-
#include "proxy_constructors.hpp"
30+
#include "dynamic_cast_conversion.hpp"
2531
#include "dynamic_object.hpp"
26-
#include "../chaiscript_threading.hpp"
32+
#include "proxy_constructors.hpp"
33+
#include "proxy_functions.hpp"
34+
#include "type_info.hpp"
35+
36+
namespace chaiscript {
37+
class Boxed_Number;
38+
} // namespace chaiscript
39+
40+
namespace chaiscript {
41+
namespace dispatch {
42+
class Dynamic_Proxy_Function;
43+
class Proxy_Function_Base;
44+
struct Placeholder_Object;
45+
} // namespace dispatch
46+
} // namespace chaiscript
2747

2848

2949
/// \namespace chaiscript::dispatch

‎include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,16 @@
99

1010
#include <memory>
1111
#include <set>
12+
#include <stdexcept>
13+
#include <string>
14+
#include <type_traits>
15+
#include <typeinfo>
1216

13-
#include "type_info.hpp"
14-
#include "boxed_value.hpp"
15-
#include "boxed_cast_helper.hpp"
17+
#include "../chaiscript_threading.hpp"
1618
#include "bad_boxed_cast.hpp"
19+
#include "boxed_cast_helper.hpp"
20+
#include "boxed_value.hpp"
21+
#include "type_info.hpp"
1722

1823
namespace chaiscript
1924
{

‎include/chaiscript/dispatchkit/dynamic_object.hpp

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,27 @@
77
#ifndef CHAISCRIPT_DYNAMIC_OBJECT_HPP_
88
#define CHAISCRIPT_DYNAMIC_OBJECT_HPP_
99

10+
#include <cassert>
11+
#include <map>
12+
#include <memory>
13+
#include <string>
14+
#include <typeinfo>
1015
#include <utility>
11-
16+
#include <vector>
17+
18+
#include "../chaiscript_defines.hpp"
19+
#include "boxed_cast.hpp"
20+
#include "boxed_cast_helper.hpp"
21+
#include "boxed_value.hpp"
22+
#include "proxy_functions.hpp"
23+
#include "type_info.hpp"
24+
25+
namespace chaiscript {
26+
class Dynamic_Cast_Conversions;
27+
namespace dispatch {
28+
class Proxy_Function_Base;
29+
} // namespace dispatch
30+
} // namespace chaiscript
1231

1332
namespace chaiscript
1433
{

‎include/chaiscript/dispatchkit/exception_specification.hpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@
77
#ifndef CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_
88
#define CHAISCRIPT_EXCEPTION_SPECIFICATION_HPP_
99

10+
#include <memory>
11+
12+
#include "../chaiscript_defines.hpp"
1013
#include "boxed_cast.hpp"
1114

15+
namespace chaiscript {
16+
class Boxed_Value;
17+
namespace exception {
18+
class bad_boxed_cast;
19+
} // namespace exception
20+
} // namespace chaiscript
21+
1222
namespace chaiscript
1323
{
1424
namespace detail

‎include/chaiscript/dispatchkit/function_call.hpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,22 @@
77
#ifndef CHAISCRIPT_FUNCTION_CALL_HPP_
88
#define CHAISCRIPT_FUNCTION_CALL_HPP_
99

10+
#include <functional>
11+
#include <iostream>
1012
#include <string>
1113
#include <vector>
12-
#include "proxy_functions.hpp"
13-
#include "function_call_detail.hpp"
1414

15+
#include "boxed_cast.hpp"
16+
#include "function_call_detail.hpp"
17+
#include "proxy_functions.hpp"
1518

16-
#include <iostream>
19+
namespace chaiscript {
20+
class Boxed_Value;
21+
class Dynamic_Cast_Conversions;
22+
namespace detail {
23+
template <typename T> struct Cast_Helper;
24+
} // namespace detail
25+
} // namespace chaiscript
1726

1827
namespace chaiscript
1928
{

‎include/chaiscript/dispatchkit/function_call_detail.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77
#ifndef CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_
88
#define CHAISCRIPT_FUNCTION_CALL_DETAIL_HPP_
99

10+
#include <algorithm>
11+
#include <functional>
12+
#include <memory>
1013
#include <string>
14+
#include <type_traits>
1115
#include <vector>
16+
17+
#include "boxed_cast.hpp"
18+
#include "boxed_number.hpp"
19+
#include "boxed_value.hpp"
20+
#include "dynamic_cast_conversion.hpp"
1221
#include "proxy_functions.hpp"
1322

1423
namespace chaiscript

‎include/chaiscript/dispatchkit/handle_return.hpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@
77
#ifndef CHAISCRIPT_HANDLE_RETURN_HPP_
88
#define CHAISCRIPT_HANDLE_RETURN_HPP_
99

10-
#include "boxed_value.hpp"
10+
#include <functional>
11+
#include <memory>
12+
#include <stdexcept>
13+
#include <string>
14+
#include <vector>
15+
1116
#include "boxed_number.hpp"
17+
#include "boxed_value.hpp"
1218
#include "type_info.hpp"
13-
#include <string>
1419

15-
#include <stdexcept>
16-
#include <vector>
20+
namespace chaiscript {
21+
class Boxed_Number;
22+
} // namespace chaiscript
1723

1824
namespace chaiscript
1925
{

‎include/chaiscript/dispatchkit/proxy_functions.hpp

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,29 @@
99
#define CHAISCRIPT_PROXY_FUNCTIONS_HPP_
1010

1111

12-
#include "boxed_value.hpp"
13-
#include "type_info.hpp"
12+
#include <algorithm>
13+
#include <cassert>
14+
#include <functional>
15+
#include <memory>
16+
#include <stdexcept>
1417
#include <string>
1518
#include <type_traits>
16-
#include <stdexcept>
1719
#include <vector>
18-
#include <cassert>
20+
21+
#include "../chaiscript_defines.hpp"
22+
#include "boxed_cast.hpp"
23+
#include "boxed_cast_helper.hpp"
24+
#include "boxed_value.hpp"
1925
#include "proxy_functions_detail.hpp"
26+
#include "type_info.hpp"
27+
28+
namespace chaiscript {
29+
class Dynamic_Cast_Conversions;
30+
namespace exception {
31+
class bad_boxed_cast;
32+
struct arity_error;
33+
} // namespace exception
34+
} // namespace chaiscript
2035

2136
namespace chaiscript
2237
{

‎include/chaiscript/dispatchkit/proxy_functions_detail.hpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,24 @@
77
#ifndef CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
88
#define CHAISCRIPT_PROXY_FUNCTIONS_DETAIL_HPP_
99

10-
#include "boxed_value.hpp"
10+
#include <algorithm>
11+
#include <functional>
12+
#include <stdexcept>
13+
#include <string>
14+
#include <vector>
15+
16+
#include "../chaiscript_defines.hpp"
1117
#include "boxed_cast.hpp"
12-
#include "type_info.hpp"
18+
#include "boxed_value.hpp"
1319
#include "handle_return.hpp"
14-
#include <string>
20+
#include "type_info.hpp"
1521

16-
#include <stdexcept>
17-
#include <vector>
18-
#include <functional>
22+
namespace chaiscript {
23+
class Dynamic_Cast_Conversions;
24+
namespace exception {
25+
class bad_boxed_cast;
26+
} // namespace exception
27+
} // namespace chaiscript
1928

2029
namespace chaiscript
2130
{

‎include/chaiscript/dispatchkit/register_function.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
#ifndef CHAISCRIPT_REGISTER_FUNCTION_HPP_
88
#define CHAISCRIPT_REGISTER_FUNCTION_HPP_
99

10-
#include "dispatchkit.hpp"
10+
#include <functional>
11+
#include <type_traits>
12+
1113
#include "bind_first.hpp"
14+
#include "dispatchkit.hpp"
15+
#include "proxy_functions.hpp"
1216

1317
namespace chaiscript
1418
{

‎include/chaiscript/dispatchkit/type_info.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
#ifndef CHAISCRIPT_TYPE_INFO_HPP_
88
#define CHAISCRIPT_TYPE_INFO_HPP_
99

10-
#include <string>
11-
#include <typeinfo>
10+
#include <functional>
1211
#include <memory>
12+
#include <string>
1313
#include <type_traits>
14+
#include <typeinfo>
1415

1516
namespace chaiscript
1617
{

‎include/chaiscript/language/chaiscript_algebraic.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#ifndef CHAISCRIPT_ALGEBRAIC_HPP_
88
#define CHAISCRIPT_ALGEBRAIC_HPP_
99

10+
#include <string>
11+
1012
#include "../dispatchkit/dispatchkit.hpp"
1113

1214
namespace chaiscript

‎include/chaiscript/language/chaiscript_common.hpp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,24 @@
55
// http://www.chaiscript.com
66

77
#ifndef CHAISCRIPT_COMMON_HPP_
8-
#define CHAISCRIPT_COMMON_HPP_
8+
#define CHAISCRIPT_COMMON_HPP_
99

10+
#include <algorithm>
11+
#include <memory>
1012
#include <sstream>
13+
#include <stdexcept>
14+
#include <string>
15+
#include <vector>
16+
17+
#include "../chaiscript_defines.hpp"
18+
#include "../dispatchkit/boxed_value.hpp"
1119
#include "../dispatchkit/dispatchkit.hpp"
20+
#include "../dispatchkit/proxy_functions.hpp"
21+
#include "../dispatchkit/type_info.hpp"
22+
23+
namespace chaiscript {
24+
struct AST_Node;
25+
} // namespace chaiscript
1226

1327
namespace chaiscript
1428
{

‎include/chaiscript/language/chaiscript_engine.hpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,27 @@
77
#ifndef CHAISCRIPT_ENGINE_HPP_
88
#define CHAISCRIPT_ENGINE_HPP_
99

10+
#include <cassert>
11+
#include <cstring>
12+
#include <algorithm>
1013
#include <exception>
1114
#include <fstream>
15+
#include <functional>
16+
#include <map>
17+
#include <memory>
18+
#include <mutex>
19+
#include <set>
20+
#include <stdexcept>
21+
#include <string>
22+
#include <vector>
1223

1324
#include "../chaiscript_defines.hpp"
25+
#include "../chaiscript_threading.hpp"
26+
#include "../dispatchkit/boxed_cast_helper.hpp"
27+
#include "../dispatchkit/boxed_value.hpp"
28+
#include "../dispatchkit/dispatchkit.hpp"
29+
#include "../dispatchkit/dynamic_cast_conversion.hpp"
30+
#include "../dispatchkit/proxy_functions.hpp"
1431
#include "chaiscript_common.hpp"
1532

1633
#if defined(__linux__) || defined(__unix__) || defined(__APPLE__)
@@ -28,9 +45,9 @@
2845
#endif
2946

3047

31-
#include "chaiscript_prelude.chai"
32-
#include "chaiscript_parser.hpp"
3348
#include "../dispatchkit/exception_specification.hpp"
49+
#include "chaiscript_parser.hpp"
50+
#include "chaiscript_prelude.chai"
3451

3552
namespace chaiscript
3653
{

‎include/chaiscript/language/chaiscript_eval.hpp

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,36 @@
77
#ifndef CHAISCRIPT_EVAL_HPP_
88
#define CHAISCRIPT_EVAL_HPP_
99

10+
#include <assert.h>
11+
#include <cstdlib>
12+
#include <exception>
13+
#include <functional>
14+
#include <limits>
1015
#include <map>
11-
12-
#include "chaiscript_common.hpp"
16+
#include <memory>
17+
#include <ostream>
18+
#include <stdexcept>
19+
#include <string>
20+
#include <vector>
21+
22+
#include "../chaiscript_defines.hpp"
23+
#include "../dispatchkit/boxed_cast.hpp"
24+
#include "../dispatchkit/boxed_cast_helper.hpp"
25+
#include "../dispatchkit/boxed_number.hpp"
26+
#include "../dispatchkit/boxed_value.hpp"
27+
#include "../dispatchkit/dispatchkit.hpp"
28+
#include "../dispatchkit/proxy_functions.hpp"
29+
#include "../dispatchkit/proxy_functions_detail.hpp"
1330
#include "../dispatchkit/register_function.hpp"
31+
#include "../dispatchkit/type_info.hpp"
32+
#include "chaiscript_algebraic.hpp"
33+
#include "chaiscript_common.hpp"
34+
35+
namespace chaiscript {
36+
namespace exception {
37+
class bad_boxed_cast;
38+
} // namespace exception
39+
} // namespace chaiscript
1440

1541
namespace chaiscript
1642
{

‎include/chaiscript/language/chaiscript_parser.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@
77
#ifndef CHAISCRIPT_PARSER_HPP_
88
#define CHAISCRIPT_PARSER_HPP_
99

10+
#include <cstdint>
11+
#include <cstring>
1012
#include <exception>
1113
#include <fstream>
14+
#include <iostream>
15+
#include <memory>
1216
#include <sstream>
13-
#include <cstring>
17+
#include <string>
18+
#include <vector>
1419

20+
#include "../dispatchkit/boxed_value.hpp"
1521
#include "chaiscript_common.hpp"
1622

1723
namespace chaiscript

‎include/chaiscript/utility/utility.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
#ifndef CHAISCRIPT_UTILITY_UTILITY_HPP_
88
#define CHAISCRIPT_UTILITY_UTILITY_HPP_
99

10-
#include "../chaiscript.hpp"
1110
#include <string>
11+
#include <utility>
12+
#include <vector>
13+
14+
#include "../chaiscript.hpp"
15+
#include "../dispatchkit/proxy_functions.hpp"
16+
#include "../dispatchkit/type_info.hpp"
1217

1318

1419
namespace chaiscript

0 commit comments

Comments
 (0)
Please sign in to comment.