Skip to content

Commit d8967f5

Browse files
author
Daniel Kroening
committed
moving language.h and language_file.h to langapi folder
The languaget API has become excessively cluttered, and will be phased out. In preparation, the files are moved to the langapi folder.
1 parent f9b9599 commit d8967f5

34 files changed

+63
-40
lines changed

src/ansi-c/ansi_c_language.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Author: Daniel Kroening, kroening@kroening.com
1414

1515
#include <memory>
1616

17-
#include <util/language.h>
1817
#include <util/make_unique.h>
1918

19+
#include <langapi/language.h>
20+
2021
#include "ansi_c_parse_tree.h"
2122

2223
class ansi_c_languaget:public languaget

src/cbmc/cbmc_parse_options.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ Author: Daniel Kroening, kroening@kroening.com
1818

1919
#include <util/string2int.h>
2020
#include <util/config.h>
21-
#include <util/language.h>
2221
#include <util/unicode.h>
2322
#include <util/memory_info.h>
2423
#include <util/invariant.h>
2524
#include <util/exit_codes.h>
2625

26+
#include <langapi/language.h>
27+
2728
#include <ansi-c/c_preprocess.h>
2829

2930
#include <goto-programs/convert_nondet.h>

src/cbmc/cbmc_parse_options.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Author: Daniel Kroening, kroening@kroening.com
1414

1515
#include <util/ui_message.h>
1616
#include <util/parse_options.h>
17-
#include <util/language.h>
17+
18+
#include <langapi/language.h>
1819

1920
#include <analyses/goto_check.h>
2021

src/clobber/clobber_parse_options.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Author: Daniel Kroening, kroening@kroening.com
1717

1818
#include <util/string2int.h>
1919
#include <util/config.h>
20-
#include <util/language.h>
2120
#include <util/options.h>
2221
#include <util/memory_info.h>
2322

src/cpp/cpp_language.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
1616

1717
#include <memory>
1818

19-
#include <util/language.h>
2019
#include <util/make_unique.h> // unique_ptr
2120

21+
#include <langapi/language.h>
22+
2223
#include "cpp_parse_tree.h"
2324

2425
class cpp_languaget:public languaget

src/goto-analyzer/goto_analyzer_parse_options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Author: Daniel Kroening, kroening@kroening.com
4646
#include <analyses/interval_domain.h>
4747

4848
#include <langapi/mode.h>
49+
#include <langapi/language.h>
4950

50-
#include <util/language.h>
5151
#include <util/options.h>
5252
#include <util/config.h>
5353
#include <util/string2int.h>

src/goto-analyzer/goto_analyzer_parse_options.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ Author: Daniel Kroening, kroening@kroening.com
103103

104104
#include <util/ui_message.h>
105105
#include <util/parse_options.h>
106-
#include <util/language.h>
106+
107+
#include <langapi/language.h>
107108

108109
#include <goto-programs/goto_model.h>
109110
#include <goto-programs/show_goto_functions.h>

src/goto-diff/goto_diff_parse_options.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ Author: Peter Schrammel
1818

1919
#include <util/string2int.h>
2020
#include <util/config.h>
21-
#include <util/language.h>
2221
#include <util/options.h>
2322
#include <util/make_unique.h>
2423

24+
#include <langapi/language.h>
25+
2526
#include <goto-programs/goto_convert_functions.h>
2627
#include <goto-programs/remove_function_pointers.h>
2728
#include <goto-programs/remove_returns.h>

src/goto-instrument/dump_c_class.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Author: Daniel Kroening, kroening@kroening.com
1616
#include <string>
1717
#include <memory> // unique_ptr
1818

19-
#include <util/language.h>
20-
19+
#include <langapi/language.h>
2120
#include <langapi/mode.h>
21+
2222
#include <goto-programs/system_library_symbols.h>
2323

2424
class dump_ct

src/goto-instrument/splice_call.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ Date: July 2017
1414
// useful for context/ environment setting in arbitrary nodes
1515

1616
#include "splice_call.h"
17+
1718
#include <util/message.h>
1819
#include <util/string2int.h>
1920
#include <util/string_utils.h>
20-
#include <util/language.h>
21+
22+
#include <langapi/language.h>
23+
2124
#include <goto-programs/goto_functions.h>
25+
2226
#include <algorithm>
2327

2428
// split the argument in caller/ callee two-position vector

0 commit comments

Comments
 (0)