Merge pull request #6408 from ethereum/includeCleanup

Include cleanup

libdevcore/Assertions.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "Exceptions.h"
+#include <libdevcore/Exceptions.h>
 
 namespace dev
 {

libdevcore/CommonIO.cpp

@@ -19,7 +19,11 @@
  * @date 2014
  */
 
-#include "CommonIO.h"
+#include <libdevcore/CommonIO.h>
+#include <libdevcore/Assertions.h>
+
+#include <boost/filesystem.hpp>
+
 #include <iostream>
 #include <cstdlib>
 #include <fstream>
@@ -29,8 +33,6 @@
 #include <unistd.h>
 #include <termios.h>
 #endif
-#include <boost/filesystem.hpp>
-#include "Assertions.h"
 
 using namespace std;
 using namespace dev;

libdevcore/CommonIO.h

@@ -23,10 +23,10 @@
 
 #pragma once
 
+#include <libdevcore/Common.h>
+#include <boost/filesystem.hpp>
 #include <sstream>
 #include <string>
-#include <boost/filesystem.hpp>
-#include "Common.h"
 
 namespace dev
 {

libdevcore/JSON.cpp

@@ -19,9 +19,9 @@
  * @date 2018
  */
 
-#include "JSON.h"
+#include <libdevcore/JSON.h>
 
-#include "CommonIO.h"
+#include <libdevcore/CommonIO.h>
 
 #include <sstream>
 #include <map>

libdevcore/StringUtils.cpp

@@ -21,7 +21,7 @@
  * String routines
  */
 
-#include "StringUtils.h"
+#include <libdevcore/StringUtils.h>
 #include <algorithm>
 #include <string>
 #include <vector>

libdevcore/UTF8.cpp

@@ -21,12 +21,10 @@
  * UTF-8 related helpers
  */
 
-#include "UTF8.h"
-
+#include <libdevcore/UTF8.h>
 
 namespace dev
 {
-
 namespace
 {
 
@@ -77,6 +75,8 @@ bool isWellFormed(unsigned char byte1, unsigned char byte2)
 	return false;
 }
 
+}
+
 bool validateUTF8(unsigned char const* _input, size_t _length, size_t& _invalidPosition)
 {
 	bool valid = true;
@@ -133,8 +133,6 @@ bool validateUTF8(unsigned char const* _input, size_t _length, size_t& _invalidP
 	return false;
 }
 
-}
-
 bool validateUTF8(std::string const& _input, size_t& _invalidPosition)
 {
 	return validateUTF8(reinterpret_cast<unsigned char const*>(_input.c_str()), _input.length(), _invalidPosition);

libevmasm/Assembly.cpp

@@ -19,7 +19,7 @@
  * @date 2014
  */
 
-#include "Assembly.h"
+#include <libevmasm/Assembly.h>
 
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/ControlFlowGraph.h>

libevmasm/JumpdestRemover.cpp

@@ -19,7 +19,7 @@
  * Removes unused JUMPDESTs.
  */
 
-#include "JumpdestRemover.h"
+#include <libevmasm/JumpdestRemover.h>
 
 #include <libevmasm/AssemblyItem.h>
 

libevmasm/KnownState.cpp

@@ -21,10 +21,11 @@
  * Contains knowledge about the state of the virtual machine at a specific instruction.
  */
 
-#include "KnownState.h"
-#include <functional>
-#include <libdevcore/Keccak256.h>
+#include <libevmasm/KnownState.h>
 #include <libevmasm/AssemblyItem.h>
+#include <libdevcore/Keccak256.h>
+
+#include <functional>
 
 using namespace std;
 using namespace dev;

libevmasm/PathGasMeter.cpp

@@ -19,7 +19,7 @@
  * @date 2015
  */
 
-#include "PathGasMeter.h"
+#include <libevmasm/PathGasMeter.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/SemanticInformation.h>
 

libevmasm/PeepholeOptimiser.cpp

@@ -19,7 +19,7 @@
  * Performs local optimising code changes to assembly.
  */
 
-#include "PeepholeOptimiser.h"
+#include <libevmasm/PeepholeOptimiser.h>
 
 #include <libevmasm/AssemblyItem.h>
 #include <libevmasm/SemanticInformation.h>

liblll/CodeFragment.cpp

@@ -19,7 +19,11 @@
  * @date 2014
  */
 
-#include "CodeFragment.h"
+#include <liblll/CodeFragment.h>
+#include <liblll/CompilerState.h>
+#include <liblll/Parser.h>
+#include <libevmasm/Instruction.h>
+#include <libdevcore/CommonIO.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -34,10 +38,6 @@
 #pragma GCC diagnostic pop
 #endif // defined(__GNUC__)
 
-#include <libdevcore/CommonIO.h>
-#include <libevmasm/Instruction.h>
-#include "CompilerState.h"
-#include "Parser.h"
 
 using namespace std;
 using namespace dev;

liblll/CodeFragment.h

@@ -21,10 +21,10 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <liblll/Exceptions.h>
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Assembly.h>
-#include "Exceptions.h"
+#include <libdevcore/Common.h>
 
 namespace boost { namespace spirit { class utree; } }
 namespace sp = boost::spirit;

liblll/CompilerState.cpp

@@ -19,8 +19,8 @@
  * @date 2014
  */
 
-#include "CompilerState.h"
-#include "CodeFragment.h"
+#include <liblll/CompilerState.h>
+#include <liblll/CodeFragment.h>
 
 using namespace std;
 using namespace dev;

liblll/CompilerState.h

@@ -21,8 +21,8 @@
 
 #pragma once
 
+#include <liblll/CodeFragment.h>
 #include <boost/spirit/include/support_utree.hpp>
-#include "CodeFragment.h"
 
 namespace dev
 {

liblll/Parser.cpp

@@ -19,7 +19,7 @@
  * @date 2014
  */
 
-#include "Parser.h"
+#include <liblll/Parser.h>
 
 #if _MSC_VER
 #pragma warning(disable:4348)

liblll/Parser.h

@@ -21,10 +21,10 @@
 
 #pragma once
 
+#include <liblll/Exceptions.h>
+#include <libdevcore/Common.h>
 #include <string>
 #include <vector>
-#include <libdevcore/Common.h>
-#include "Exceptions.h"
 
 namespace boost { namespace spirit { class utree; } }
 namespace sp = boost::spirit;

solc/main.cpp

@@ -20,10 +20,10 @@
  * Solidity commandline compiler.
  */
 
-#include "CommandLineInterface.h"
+#include <solc/CommandLineInterface.h>
+#include <boost/exception/all.hpp>
 #include <clocale>
 #include <iostream>
-#include <boost/exception/all.hpp>
 
 using namespace std;
 

test/liblll/EndToEndTest.cpp

@@ -29,6 +29,7 @@
 #include <memory>
 
 using namespace std;
+using namespace dev::test;
 
 namespace dev
 {

test/liblll/ExecutionFramework.h

@@ -22,13 +22,12 @@
 
 #pragma once
 
-#include <functional>
 
-#include "../ExecutionFramework.h"
+#include <test/ExecutionFramework.h>
 
 #include <liblll/Compiler.h>
 
-using namespace dev::test;
+#include <functional>
 
 namespace dev
 {
@@ -38,9 +37,8 @@ namespace lll
 namespace test
 {
 
-class LLLExecutionFramework: public ExecutionFramework
+class LLLExecutionFramework: public dev::test::ExecutionFramework
 {
-
 public:
 	LLLExecutionFramework();
 
@@ -49,7 +47,7 @@ public:
 		u256 const& _value = 0,
 		std::string const& _contractName = "",
 		bytes const& _arguments = bytes(),
-		std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
+		std::map<std::string, dev::test::Address> const& _libraryAddresses = {}
 	) override
 	{
 		BOOST_REQUIRE(_contractName.empty());

test/liblll/LLL_ENS.cpp

@@ -29,6 +29,7 @@
 
 using namespace std;
 using namespace dev::lll;
+using namespace dev::test;
 
 namespace dev
 {

test/liblll/LLL_ERC20.cpp

@@ -34,6 +34,7 @@
 
 using namespace std;
 using namespace dev::lll;
+using namespace dev::test;
 
 namespace dev
 {