diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-17 18:43:56 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-26 22:05:16 +0800 |
commit | fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070 (patch) | |
tree | 74e9fb9da86133e7a28ce0da4d56dc74c05a714b /libsolidity/interface | |
parent | 887823dca6e244d4dae84ca545fe3f0e8170b3d0 (diff) | |
download | dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar.gz dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar.bz2 dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar.lz dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar.xz dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.tar.zst dexon-solidity-fa5a7efb45de72d0a83e2e0bdb9b967f76f0c070.zip |
Remove unused interfaces from CompilerStack
Diffstat (limited to 'libsolidity/interface')
-rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 23 | ||||
-rw-r--r-- | libsolidity/interface/CompilerStack.h | 19 |
2 files changed, 4 insertions, 38 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 7a87875c..e5bb58d2 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -106,12 +106,6 @@ bool CompilerStack::addSource(string const& _name, string const& _content, bool return existed; } -void CompilerStack::setSource(string const& _sourceCode) -{ - reset(); - addSource("", _sourceCode); -} - bool CompilerStack::parse() { //reset @@ -252,23 +246,11 @@ bool CompilerStack::analyze() return false; } -bool CompilerStack::parse(string const& _sourceCode) -{ - setSource(_sourceCode); - return parse(); -} - bool CompilerStack::parseAndAnalyze() { return parse() && analyze(); } -bool CompilerStack::parseAndAnalyze(std::string const& _sourceCode) -{ - setSource(_sourceCode); - return parseAndAnalyze(); -} - vector<string> CompilerStack::contractNames() const { if (m_stackState < AnalysisSuccessful) @@ -300,11 +282,6 @@ bool CompilerStack::compile(bool _optimize, unsigned _runs, map<string, h160> co return true; } -bool CompilerStack::compile(string const& _sourceCode, bool _optimize, unsigned _runs) -{ - return parseAndAnalyze(_sourceCode) && compile(_optimize, _runs); -} - void CompilerStack::link() { for (auto& contract: m_contracts) diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index 6b8fb538..1bfb193d 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -97,32 +97,23 @@ public: void setRemappings(std::vector<std::string> const& _remappings); /// Resets the compiler to a state where the sources are not parsed or even removed. + /// Sets the state to SourcesSet if @a _keepSources is true, otherwise to Empty. + /// All settings, with the exception of remappings, are reset. void reset(bool _keepSources = false); /// Adds a source object (e.g. file) to the parser. After this, parse has to be called again. /// @returns true if a source object by the name already existed and was replaced. - void addSources(StringMap const& _nameContents, bool _isLibrary = false) - { - for (auto const& i: _nameContents) addSource(i.first, i.second, _isLibrary); - } bool addSource(std::string const& _name, std::string const& _content, bool _isLibrary = false); - void setSource(std::string const& _sourceCode); /// Parses all source units that were added /// @returns false on error. bool parse(); - /// Sets the given source code as the only source unit apart from standard sources and parses it. - /// @returns false on error. - bool parse(std::string const& _sourceCode); - /// performs the analyisis steps (imports, scopesetting, syntaxCheck, referenceResolving, + /// Performs the analysis steps (imports, scopesetting, syntaxCheck, referenceResolving, /// typechecking, staticAnalysis) on previously set sources /// @returns false on error. bool analyze(); /// Parses and analyzes all source units that were added /// @returns false on error. bool parseAndAnalyze(); - /// Sets the given source code as the only source unit apart from standard sources and parses and analyzes it. - /// @returns false on error. - bool parseAndAnalyze(std::string const& _sourceCode); /// @returns a list of the contract names in the sources. std::vector<std::string> contractNames() const; @@ -133,9 +124,6 @@ public: unsigned _runs = 200, std::map<std::string, h160> const& _libraries = std::map<std::string, h160>{} ); - /// Parses and compiles the given source code. - /// @returns false on error. - bool compile(std::string const& _sourceCode, bool _optimize = false, unsigned _runs = 200); /// @returns the assembled object for a contract. eth::LinkerObject const& object(std::string const& _contractName = "") const; @@ -202,6 +190,7 @@ public: /// @returns the list of errors that occured during parsing and type checking. ErrorList const& errors() { return m_errorReporter.errors(); } + /// @returns the current state. State state() const { return m_stackState; } private: |