aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-04-24 23:35:16 +0800
committerchriseth <c@ethdev.com>2015-04-30 17:42:02 +0800
commit99ea9a62fc00d1dab2ae9c50722e743b9b131aa4 (patch)
treecd45ad336a48afcc01b3fcadba563093277f506a
parent8a1758e60501911b44a0287c4573d4316b684295 (diff)
downloaddexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar.gz
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar.bz2
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar.lz
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar.xz
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.tar.zst
dexon-solidity-99ea9a62fc00d1dab2ae9c50722e743b9b131aa4.zip
Move assembly related files to libevmasm and Params.h/.cpp to libevmcore.
-rw-r--r--AST.h2
-rw-r--r--CMakeLists.txt2
-rw-r--r--Compiler.cpp2
-rw-r--r--Compiler.h2
-rw-r--r--CompilerContext.h2
-rw-r--r--Exceptions.h2
-rw-r--r--ExpressionCompiler.h2
-rw-r--r--LValue.h2
-rw-r--r--Parser.cpp2
-rw-r--r--Scanner.h2
-rw-r--r--SourceReferenceFormatter.h2
11 files changed, 11 insertions, 11 deletions
diff --git a/AST.h b/AST.h
index c9ad6447..fde0b71b 100644
--- a/AST.h
+++ b/AST.h
@@ -27,7 +27,7 @@
#include <vector>
#include <memory>
#include <boost/noncopyable.hpp>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
#include <libsolidity/Utils.h>
#include <libsolidity/ASTForward.h>
#include <libsolidity/Token.h>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d31331a..10c7bc2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB HEADERS "*.h")
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} evmasm)
target_link_libraries(${EXECUTABLE} devcrypto)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
diff --git a/Compiler.cpp b/Compiler.cpp
index 37b577cc..0301375f 100644
--- a/Compiler.cpp
+++ b/Compiler.cpp
@@ -24,7 +24,7 @@
#include <algorithm>
#include <boost/range/adaptor/reversed.hpp>
#include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
#include <libsolidity/AST.h>
#include <libsolidity/ExpressionCompiler.h>
#include <libsolidity/CompilerUtils.h>
diff --git a/Compiler.h b/Compiler.h
index c3c3b9dc..106038d1 100644
--- a/Compiler.h
+++ b/Compiler.h
@@ -26,7 +26,7 @@
#include <functional>
#include <libsolidity/ASTVisitor.h>
#include <libsolidity/CompilerContext.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
namespace dev {
namespace solidity {
diff --git a/CompilerContext.h b/CompilerContext.h
index 0ca6369d..93391245 100644
--- a/CompilerContext.h
+++ b/CompilerContext.h
@@ -26,7 +26,7 @@
#include <stack>
#include <utility>
#include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
#include <libsolidity/ASTForward.h>
#include <libsolidity/Types.h>
#include <libdevcore/Common.h>
diff --git a/Exceptions.h b/Exceptions.h
index 0d07c706..e5f653e1 100644
--- a/Exceptions.h
+++ b/Exceptions.h
@@ -24,7 +24,7 @@
#include <string>
#include <libdevcore/Exceptions.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
namespace dev
{
diff --git a/ExpressionCompiler.h b/ExpressionCompiler.h
index 35526662..45a2311e 100644
--- a/ExpressionCompiler.h
+++ b/ExpressionCompiler.h
@@ -25,7 +25,7 @@
#include <memory>
#include <boost/noncopyable.hpp>
#include <libdevcore/Common.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
#include <libsolidity/Utils.h>
#include <libsolidity/ASTVisitor.h>
#include <libsolidity/LValue.h>
diff --git a/LValue.h b/LValue.h
index ad622516..1617e816 100644
--- a/LValue.h
+++ b/LValue.h
@@ -23,7 +23,7 @@
#pragma once
#include <memory>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
#include <libsolidity/ArrayUtils.h>
namespace dev
diff --git a/Parser.cpp b/Parser.cpp
index 43571314..37c358d3 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -22,7 +22,7 @@
#include <vector>
#include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
#include <libsolidity/Parser.h>
#include <libsolidity/Scanner.h>
#include <libsolidity/Exceptions.h>
diff --git a/Scanner.h b/Scanner.h
index b57b8a18..43fcd133 100644
--- a/Scanner.h
+++ b/Scanner.h
@@ -55,7 +55,7 @@
#include <libdevcore/Common.h>
#include <libdevcore/Log.h>
#include <libdevcore/CommonData.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
#include <libsolidity/Token.h>
namespace dev
diff --git a/SourceReferenceFormatter.h b/SourceReferenceFormatter.h
index 304e6a27..ba1077ff 100644
--- a/SourceReferenceFormatter.h
+++ b/SourceReferenceFormatter.h
@@ -23,7 +23,7 @@
#pragma once
#include <ostream>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
namespace dev
{