aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-06-09 18:36:56 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-06-09 18:43:41 +0800
commit114c157b04f0ea1429b67d52c35e32f13c5ae9a4 (patch)
tree287502ea0f3131d39ea07059a630534b01d2f043
parentae6251effd0474cd25379f09148da95b3486e9b4 (diff)
downloaddexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar.gz
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar.bz2
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar.lz
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar.xz
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.tar.zst
dexon-solidity-114c157b04f0ea1429b67d52c35e32f13c5ae9a4.zip
Remove obsolete AsmStack
-rw-r--r--libjulia/backends/evm/EVMCodeTransform.h1
-rw-r--r--libsolidity/inlineasm/AsmStack.cpp96
-rw-r--r--libsolidity/inlineasm/AsmStack.h79
3 files changed, 0 insertions, 176 deletions
diff --git a/libjulia/backends/evm/EVMCodeTransform.h b/libjulia/backends/evm/EVMCodeTransform.h
index 6031d1a8..f65948dc 100644
--- a/libjulia/backends/evm/EVMCodeTransform.h
+++ b/libjulia/backends/evm/EVMCodeTransform.h
@@ -20,7 +20,6 @@
#include <libjulia/backends/evm/EVMAssembly.h>
-#include <libsolidity/inlineasm/AsmStack.h>
#include <libsolidity/inlineasm/AsmScope.h>
#include <boost/variant.hpp>
diff --git a/libsolidity/inlineasm/AsmStack.cpp b/libsolidity/inlineasm/AsmStack.cpp
deleted file mode 100644
index 92eb8a7a..00000000
--- a/libsolidity/inlineasm/AsmStack.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- This file is part of solidity.
-
- solidity is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- solidity is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with solidity. If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Full-stack Solidity inline assember.
- */
-
-#include <libsolidity/inlineasm/AsmStack.h>
-
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmCodeGen.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-
-#include <libsolidity/parsing/Scanner.h>
-
-#include <libevmasm/Assembly.h>
-#include <libevmasm/SourceLocation.h>
-
-#include <memory>
-
-using namespace std;
-using namespace dev;
-using namespace dev::solidity;
-using namespace dev::solidity::assembly;
-
-bool InlineAssemblyStack::parse(
- shared_ptr<Scanner> const& _scanner,
- julia::ExternalIdentifierAccess::Resolver const& _resolver
-)
-{
- m_parserResult = make_shared<Block>();
- Parser parser(m_errorReporter);
- auto result = parser.parse(_scanner);
- if (!result)
- return false;
-
- *m_parserResult = std::move(*result);
- AsmAnalysisInfo analysisInfo;
- return (AsmAnalyzer(analysisInfo, m_errorReporter, false, _resolver)).analyze(*m_parserResult);
-}
-
-string InlineAssemblyStack::toString()
-{
- return AsmPrinter()(*m_parserResult);
-}
-
-eth::Assembly InlineAssemblyStack::assemble()
-{
- AsmAnalysisInfo analysisInfo;
- AsmAnalyzer analyzer(analysisInfo, m_errorReporter);
- solAssert(analyzer.analyze(*m_parserResult), "");
- return CodeGenerator::assemble(*m_parserResult, analysisInfo);
-}
-
-bool InlineAssemblyStack::parseAndAssemble(
- string const& _input,
- eth::Assembly& _assembly,
- julia::ExternalIdentifierAccess const& _identifierAccess
-)
-{
- ErrorList errors;
- ErrorReporter errorReporter(errors);
- auto scanner = make_shared<Scanner>(CharStream(_input), "--CODEGEN--");
- auto parserResult = Parser(errorReporter).parse(scanner);
- if (!errorReporter.errors().empty())
- return false;
- solAssert(parserResult, "");
-
- AsmAnalysisInfo analysisInfo;
- AsmAnalyzer analyzer(analysisInfo, errorReporter, false, _identifierAccess.resolve);
- solAssert(analyzer.analyze(*parserResult), "");
- solAssert(errorReporter.errors().empty(), "");
- CodeGenerator::assemble(*parserResult, analysisInfo, _assembly, _identifierAccess);
-
- // At this point, the assembly might be messed up, but we should throw an
- // internal compiler error anyway.
- return errorReporter.errors().empty();
-}
-
diff --git a/libsolidity/inlineasm/AsmStack.h b/libsolidity/inlineasm/AsmStack.h
deleted file mode 100644
index 7452804d..00000000
--- a/libsolidity/inlineasm/AsmStack.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- This file is part of solidity.
-
- solidity is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- solidity is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with solidity. If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @author Christian <c@ethdev.com>
- * @date 2016
- * Full-stack Solidity inline assember.
- */
-
-#pragma once
-
-#include <libjulia/backends/evm/AbstractAssembly.h>
-#include <libsolidity/interface/ErrorReporter.h>
-
-#include <string>
-#include <functional>
-
-namespace dev
-{
-namespace eth
-{
-class Assembly;
-}
-namespace solidity
-{
-class Scanner;
-namespace assembly
-{
-struct Block;
-struct Identifier;
-
-class InlineAssemblyStack
-{
-public:
- InlineAssemblyStack():
- m_errorReporter(m_errorList) {}
- /// Parse the given inline assembly chunk starting with `{` and ending with the corresponding `}`.
- /// @return false or error.
- bool parse(
- std::shared_ptr<Scanner> const& _scanner,
- julia::ExternalIdentifierAccess::Resolver const& _externalIdentifierResolver = julia::ExternalIdentifierAccess::Resolver()
- );
- /// Converts the parser result back into a string form (not necessarily the same form
- /// as the source form, but it should parse into the same parsed form again).
- std::string toString();
-
- eth::Assembly assemble();
-
- /// Parse and assemble a string in one run - for use in Solidity code generation itself.
- bool parseAndAssemble(
- std::string const& _input,
- eth::Assembly& _assembly,
- julia::ExternalIdentifierAccess const& _identifierAccess = julia::ExternalIdentifierAccess()
- );
-
- ErrorList const& errors() const { return m_errorReporter.errors(); }
-
-private:
- std::shared_ptr<Block> m_parserResult;
- ErrorList m_errorList;
- ErrorReporter m_errorReporter;
-};
-
-}
-}
-}