Fix include order in jsil

src/jsil/expr2jsil.cpp

@@ -9,10 +9,10 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
-#include <ansi-c/expr2c_class.h>
-
 #include "expr2jsil.h"
 
+#include <ansi-c/expr2c_class.h>
+
 class expr2jsilt:public expr2ct
 {
 public:

src/jsil/jsil_convert.cpp

@@ -9,11 +9,12 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language Conversion
 
+#include "jsil_convert.h"
+
 #include <util/message.h>
 #include <util/symbol_table.h>
 
 #include "jsil_parse_tree.h"
-#include "jsil_convert.h"
 
 class jsil_convertt:public messaget
 {

src/jsil/jsil_entry_point.cpp

@@ -9,6 +9,8 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
+#include "jsil_entry_point.h"
+
 #include <util/arith_tools.h>
 #include <util/config.h>
 #include <util/symbol_table.h>
@@ -18,8 +20,6 @@ Author: Michael Tautschnig, tautschn@amazon.com
 
 #include <goto-programs/goto_functions.h>
 
-#include "jsil_entry_point.h"
-
 #define INITIALIZE CPROVER_PREFIX "initialize"
 
 static void create_initialize(symbol_tablet &symbol_table)

src/jsil/jsil_internal_additions.cpp

@@ -9,6 +9,8 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
+#include "jsil_internal_additions.h"
+
 #include <util/std_types.h>
 #include <util/cprover_prefix.h>
 #include <util/symbol_table.h>
@@ -17,8 +19,6 @@ Author: Michael Tautschnig, tautschn@amazon.com
 
 #include "jsil_types.h"
 
-#include "jsil_internal_additions.h"
-
 void jsil_internal_additions(symbol_tablet &dest)
 {
   // add __CPROVER_rounding_mode

src/jsil/jsil_language.cpp

@@ -9,6 +9,8 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
+#include "jsil_language.h"
+
 #include <util/symbol_table.h>
 #include <util/get_base_name.h>
 
@@ -19,8 +21,6 @@ Author: Michael Tautschnig, tautschn@amazon.com
 #include "jsil_parser.h"
 #include "jsil_typecheck.h"
 
-#include "jsil_language.h"
-
 std::set<std::string> jsil_languaget::extensions() const
 {
   return { "jsil" };

src/jsil/jsil_parse_tree.cpp

@@ -9,12 +9,12 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
+#include "jsil_parse_tree.h"
+
 #include <util/symbol.h>
 
 #include "jsil_types.h"
 
-#include "jsil_parse_tree.h"
-
 static bool insert_at_label(
   const codet &code,
   const irep_idt &label,

src/jsil/jsil_typecheck.cpp

@@ -9,6 +9,8 @@ Author: Michael Tautschnig, tautschn@amazon.com
 /// \file
 /// Jsil Language
 
+#include "jsil_typecheck.h"
+
 #include <util/symbol_table.h>
 #include <util/prefix.h>
 #include <util/std_expr.h>
@@ -16,8 +18,6 @@ Author: Michael Tautschnig, tautschn@amazon.com
 #include "expr2jsil.h"
 #include "jsil_types.h"
 
-#include "jsil_typecheck.h"
-
 std::string jsil_typecheckt::to_string(const exprt &expr)
 {
   return expr2jsil(expr, ns);

src/jsil/jsil_typecheck.h

@@ -18,7 +18,7 @@ Author: Michael Tautschnig, tautschn@amazon.com
 #include <util/namespace.h>
 #include <util/std_code.h>
 
-
+class symbol_exprt;
 class codet;
 
 bool jsil_typecheck(

src/jsil/jsil_types.cpp

@@ -9,10 +9,10 @@ Author: Daiva Naudziuniene, daivan@amazon.com
 /// \file
 /// Jsil Language
 
-#include <algorithm>
-
 #include "jsil_types.h"
 
+#include <algorithm>
+
 typet jsil_any_type()
 {
   return jsil_union_typet({ // NOLINT(whitespace/braces)