Merge pull request #5668 from ethereum/sort_includes_formal

Sort includes in libsolidity/formal

libsolidity/formal/CVC4Interface.cpp

@@ -18,7 +18,6 @@
 #include <libsolidity/formal/CVC4Interface.h>
 
 #include <liblangutil/Exceptions.h>
-
 #include <libdevcore/CommonIO.h>
 
 using namespace std;

libsolidity/formal/CVC4Interface.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <libsolidity/formal/SolverInterface.h>
-
 #include <boost/noncopyable.hpp>
 
 #if defined(__GLIBC__)

libsolidity/formal/SMTChecker.cpp

@@ -18,12 +18,10 @@
 #include <libsolidity/formal/SMTChecker.h>
 
 #include <libsolidity/formal/SMTPortfolio.h>
-
 #include <libsolidity/formal/VariableUsage.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
 #include <liblangutil/ErrorReporter.h>
-
 #include <libdevcore/StringUtils.h>
 
 #include <boost/range/adaptor/map.hpp>

libsolidity/formal/SMTChecker.h

@@ -22,13 +22,11 @@
 #include <libsolidity/formal/SymbolicVariables.h>
 
 #include <libsolidity/ast/ASTVisitor.h>
-
 #include <libsolidity/interface/ReadFile.h>
-
 #include <liblangutil/Scanner.h>
 
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 namespace langutil

libsolidity/formal/SMTLib2Interface.cpp

@@ -17,22 +17,20 @@
 
 #include <libsolidity/formal/SMTLib2Interface.h>
 
-#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
-
+#include <liblangutil/Exceptions.h>
 #include <libdevcore/Keccak256.h>
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#include <cstdio>
+#include <array>
 #include <fstream>
 #include <iostream>
 #include <memory>
 #include <stdexcept>
 #include <string>
-#include <array>
 
 using namespace std;
 using namespace dev;

libsolidity/formal/SMTLib2Interface.h

@@ -19,20 +19,17 @@
 
 #include <libsolidity/formal/SolverInterface.h>
 
-#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
-
+#include <liblangutil/Exceptions.h>
+#include <libdevcore/Common.h>
 #include <libdevcore/FixedHash.h>
 
-#include <libdevcore/Common.h>
-
 #include <boost/noncopyable.hpp>
-
+#include <cstdio>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
-#include <cstdio>
-#include <set>
 
 namespace dev
 {

libsolidity/formal/SMTPortfolio.h

@@ -19,13 +19,10 @@
 
 
 #include <libsolidity/formal/SolverInterface.h>
-
 #include <libsolidity/interface/ReadFile.h>
-
 #include <libdevcore/FixedHash.h>
 
 #include <boost/noncopyable.hpp>
-
 #include <map>
 #include <vector>
 

libsolidity/formal/SolverInterface.h

@@ -17,18 +17,16 @@
 
 #pragma once
 
-#include <liblangutil/Exceptions.h>
 #include <libsolidity/interface/ReadFile.h>
-
+#include <liblangutil/Exceptions.h>
 #include <libdevcore/Common.h>
 #include <libdevcore/Exceptions.h>
 
 #include <boost/noncopyable.hpp>
-
+#include <cstdio>
 #include <map>
 #include <string>
 #include <vector>
-#include <cstdio>
 
 namespace dev
 {

libsolidity/formal/SymbolicTypes.cpp

@@ -18,7 +18,6 @@
 #include <libsolidity/formal/SymbolicTypes.h>
 
 #include <libsolidity/ast/Types.h>
-
 #include <memory>
 
 using namespace std;

libsolidity/formal/SymbolicTypes.h

@@ -19,7 +19,6 @@
 
 #include <libsolidity/formal/SolverInterface.h>
 #include <libsolidity/formal/SymbolicVariables.h>
-
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/Types.h>
 

libsolidity/formal/SymbolicVariables.cpp

@@ -18,7 +18,6 @@
 #include <libsolidity/formal/SymbolicVariables.h>
 
 #include <libsolidity/formal/SymbolicTypes.h>
-
 #include <libsolidity/ast/AST.h>
 
 using namespace std;

libsolidity/formal/SymbolicVariables.h

@@ -17,12 +17,9 @@
 
 #pragma once
 
-#include <libsolidity/formal/SSAVariable.h>
-
 #include <libsolidity/formal/SolverInterface.h>
-
+#include <libsolidity/formal/SSAVariable.h>
 #include <libsolidity/ast/Types.h>
-
 #include <memory>
 
 namespace dev

libsolidity/formal/Z3Interface.cpp

@@ -18,7 +18,6 @@
 #include <libsolidity/formal/Z3Interface.h>
 
 #include <liblangutil/Exceptions.h>
-
 #include <libdevcore/CommonIO.h>
 
 using namespace std;

libsolidity/formal/Z3Interface.h

@@ -18,9 +18,7 @@
 #pragma once
 
 #include <libsolidity/formal/SolverInterface.h>
-
 #include <boost/noncopyable.hpp>
-
 #include <z3++.h>
 
 namespace dev