Merge pull request #1743 from chriseth/evmasm

Move assembly related files to libevmasm and split parameters.
2023-10-03 13:03:40 +00:00 · 2015-05-05 16:06:17 +02:00 · 2015-05-05 16:06:17 +02:00 · 22eaf8ecd8
commit 22eaf8ecd8
parent 730dc3e21b c16b398f1a
12 changed files with 12 additions and 12 deletions
--- 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>
--- a/ASTUtils.h
+++ b/ASTUtils.h
@ -22,7 +22,7 @@

 #pragma once

-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/ASTVisitor.h>

 namespace dev
--- 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 )
--- 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>
--- 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 {
--- 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>
--- a/Exceptions.h
+++ b/Exceptions.h
@ -25,7 +25,7 @@
 #include <string>
 #include <utility>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>

 namespace dev
 {
--- 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>
--- 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
--- 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>
--- 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
--- a/SourceReferenceFormatter.h
+++ b/SourceReferenceFormatter.h
@ -23,7 +23,7 @@
 #pragma once

 #include <ostream>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>

 namespace dev
 {