mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Always require a contract/sourceName in CompilerStack
This commit is contained in:
parent
7454a766b3
commit
039cc25b1f
@ -155,10 +155,10 @@ public:
|
||||
std::map<std::string, unsigned> sourceIndices() const;
|
||||
|
||||
/// @returns the previously used scanner, useful for counting lines during error reporting.
|
||||
Scanner const& scanner(std::string const& _sourceName = "") const;
|
||||
Scanner const& scanner(std::string const& _sourceName) const;
|
||||
|
||||
/// @returns the parsed source unit with the supplied name.
|
||||
SourceUnit const& ast(std::string const& _sourceName = "") const;
|
||||
SourceUnit const& ast(std::string const& _sourceName) const;
|
||||
|
||||
/// Helper function for logs printing. Do only use in error cases, it's quite expensive.
|
||||
/// line and columns are numbered starting from 1 with following order:
|
||||
@ -172,44 +172,44 @@ public:
|
||||
std::string const filesystemFriendlyName(std::string const& _contractName) const;
|
||||
|
||||
/// @returns the assembled object for a contract.
|
||||
eth::LinkerObject const& object(std::string const& _contractName = "") const;
|
||||
eth::LinkerObject const& object(std::string const& _contractName) const;
|
||||
|
||||
/// @returns the runtime object for the contract.
|
||||
eth::LinkerObject const& runtimeObject(std::string const& _contractName = "") const;
|
||||
eth::LinkerObject const& runtimeObject(std::string const& _contractName) const;
|
||||
|
||||
/// @returns the bytecode of a contract that uses an already deployed contract via DELEGATECALL.
|
||||
/// The returned bytes will contain a sequence of 20 bytes of the format "XXX...XXX" which have to
|
||||
/// substituted by the actual address. Note that this sequence starts end ends in three X
|
||||
/// characters but can contain anything in between.
|
||||
eth::LinkerObject const& cloneObject(std::string const& _contractName = "") const;
|
||||
eth::LinkerObject const& cloneObject(std::string const& _contractName) const;
|
||||
|
||||
/// @returns normal contract assembly items
|
||||
eth::AssemblyItems const* assemblyItems(std::string const& _contractName = "") const;
|
||||
eth::AssemblyItems const* assemblyItems(std::string const& _contractName) const;
|
||||
|
||||
/// @returns runtime contract assembly items
|
||||
eth::AssemblyItems const* runtimeAssemblyItems(std::string const& _contractName = "") const;
|
||||
eth::AssemblyItems const* runtimeAssemblyItems(std::string const& _contractName) const;
|
||||
|
||||
/// @returns the string that provides a mapping between bytecode and sourcecode or a nullptr
|
||||
/// if the contract does not (yet) have bytecode.
|
||||
std::string const* sourceMapping(std::string const& _contractName = "") const;
|
||||
std::string const* sourceMapping(std::string const& _contractName) const;
|
||||
|
||||
/// @returns the string that provides a mapping between runtime bytecode and sourcecode.
|
||||
/// if the contract does not (yet) have bytecode.
|
||||
std::string const* runtimeSourceMapping(std::string const& _contractName = "") const;
|
||||
std::string const* runtimeSourceMapping(std::string const& _contractName) const;
|
||||
|
||||
/// @return a verbose text representation of the assembly.
|
||||
/// @arg _sourceCodes is the map of input files to source code strings
|
||||
/// Prerequisite: Successful compilation.
|
||||
std::string assemblyString(std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const;
|
||||
std::string assemblyString(std::string const& _contractName, StringMap _sourceCodes = StringMap()) const;
|
||||
|
||||
/// @returns a JSON representation of the assembly.
|
||||
/// @arg _sourceCodes is the map of input files to source code strings
|
||||
/// Prerequisite: Successful compilation.
|
||||
Json::Value assemblyJSON(std::string const& _contractName = "", StringMap _sourceCodes = StringMap()) const;
|
||||
Json::Value assemblyJSON(std::string const& _contractName, StringMap _sourceCodes = StringMap()) const;
|
||||
|
||||
/// @returns a JSON representing the contract ABI.
|
||||
/// Prerequisite: Successful call to parse or compile.
|
||||
Json::Value const& contractABI(std::string const& _contractName = "") const;
|
||||
Json::Value const& contractABI(std::string const& _contractName) const;
|
||||
|
||||
/// @returns a JSON representing the contract's user documentation.
|
||||
/// Prerequisite: Successful call to parse or compile.
|
||||
@ -276,8 +276,8 @@ private:
|
||||
);
|
||||
void link();
|
||||
|
||||
Contract const& contract(std::string const& _contractName = "") const;
|
||||
Source const& source(std::string const& _sourceName = "") const;
|
||||
Contract const& contract(std::string const& _contractName) const;
|
||||
Source const& source(std::string const& _sourceName) const;
|
||||
|
||||
/// @returns the parsed contract with the supplied name. Throws an exception if the contract
|
||||
/// does not exist.
|
||||
|
@ -951,9 +951,10 @@ void CommandLineInterface::handleAst(string const& _argStr)
|
||||
for (auto const& sourceCode: m_sourceCodes)
|
||||
asts.push_back(&m_compiler->ast(sourceCode.first));
|
||||
map<ASTNode const*, eth::GasMeter::GasConsumption> gasCosts;
|
||||
if (m_compiler->runtimeAssemblyItems())
|
||||
// FIXME: shouldn't this be done for every contract?
|
||||
if (m_compiler->runtimeAssemblyItems(""))
|
||||
gasCosts = GasEstimator::breakToStatementLevel(
|
||||
GasEstimator::structuralEstimation(*m_compiler->runtimeAssemblyItems(), asts),
|
||||
GasEstimator::structuralEstimation(*m_compiler->runtimeAssemblyItems(""), asts),
|
||||
asts
|
||||
);
|
||||
|
||||
|
@ -81,7 +81,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
|
||||
}
|
||||
}
|
||||
|
||||
return make_pair(&m_compiler.ast(), firstError);
|
||||
return make_pair(&m_compiler.ast(""), firstError);
|
||||
}
|
||||
|
||||
SourceUnit const* AnalysisFramework::parseAndAnalyse(string const& _source)
|
||||
|
@ -52,7 +52,7 @@ public:
|
||||
BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed");
|
||||
|
||||
AssemblyItems const* items = m_compiler.runtimeAssemblyItems("");
|
||||
ASTNode const& sourceUnit = m_compiler.ast();
|
||||
ASTNode const& sourceUnit = m_compiler.ast("");
|
||||
BOOST_REQUIRE(items != nullptr);
|
||||
m_gasCosts = GasEstimator::breakToStatementLevel(
|
||||
GasEstimator::structuralEstimation(*items, vector<ASTNode const*>({&sourceUnit})),
|
||||
@ -64,13 +64,13 @@ public:
|
||||
{
|
||||
compileAndRun(_sourceCode);
|
||||
auto state = make_shared<KnownState>();
|
||||
PathGasMeter meter(*m_compiler.assemblyItems());
|
||||
PathGasMeter meter(*m_compiler.assemblyItems(""));
|
||||
GasMeter::GasConsumption gas = meter.estimateMax(0, state);
|
||||
u256 bytecodeSize(m_compiler.runtimeObject().bytecode.size());
|
||||
u256 bytecodeSize(m_compiler.runtimeObject("").bytecode.size());
|
||||
// costs for deployment
|
||||
gas += bytecodeSize * GasCosts::createDataGas;
|
||||
// costs for transaction
|
||||
gas += gasForTransaction(m_compiler.object().bytecode, true);
|
||||
gas += gasForTransaction(m_compiler.object("").bytecode, true);
|
||||
|
||||
BOOST_REQUIRE(!gas.isInfinite);
|
||||
BOOST_CHECK(gas.value == m_gasUsed);
|
||||
@ -91,7 +91,7 @@ public:
|
||||
}
|
||||
|
||||
gas += GasEstimator::functionalEstimation(
|
||||
*m_compiler.runtimeAssemblyItems(),
|
||||
*m_compiler.runtimeAssemblyItems(""),
|
||||
_sig
|
||||
);
|
||||
BOOST_REQUIRE(!gas.isInfinite);
|
||||
@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(non_overlapping_filtered_costs)
|
||||
if (first->first->location().intersects(second->first->location()))
|
||||
{
|
||||
BOOST_CHECK_MESSAGE(false, "Source locations should not overlap!");
|
||||
auto scannerFromSource = [&](string const&) -> Scanner const& { return m_compiler.scanner(); };
|
||||
auto scannerFromSource = [&](string const& _sourceName) -> Scanner const& { return m_compiler.scanner(_sourceName); };
|
||||
SourceReferenceFormatter::printSourceLocation(cout, &first->first->location(), scannerFromSource);
|
||||
SourceReferenceFormatter::printSourceLocation(cout, &second->first->location(), scannerFromSource);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user