mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Mark a lot of functions static (where possible)
This commit is contained in:
parent
2a5772cff7
commit
9897c56b2c
@ -159,7 +159,7 @@ AssemblyItems CodeCopyMethod::execute(Assembly& _assembly) const
|
||||
return actualCopyRoutine;
|
||||
}
|
||||
|
||||
AssemblyItems const& CodeCopyMethod::copyRoutine() const
|
||||
AssemblyItems const& CodeCopyMethod::copyRoutine()
|
||||
{
|
||||
AssemblyItems static copyRoutine{
|
||||
u256(0),
|
||||
@ -234,7 +234,7 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
|
||||
}
|
||||
}
|
||||
|
||||
bool ComputeMethod::checkRepresentation(u256 const& _value, AssemblyItems const& _routine) const
|
||||
bool ComputeMethod::checkRepresentation(u256 const& _value, AssemblyItems const& _routine)
|
||||
{
|
||||
// This is a tiny EVM that can only evaluate some instructions.
|
||||
vector<u256> stack;
|
||||
|
@ -121,7 +121,7 @@ public:
|
||||
virtual AssemblyItems execute(Assembly& _assembly) const override;
|
||||
|
||||
protected:
|
||||
AssemblyItems const& copyRoutine() const;
|
||||
static AssemblyItems const& copyRoutine();
|
||||
};
|
||||
|
||||
/**
|
||||
@ -151,7 +151,7 @@ protected:
|
||||
/// Tries to recursively find a way to compute @a _value.
|
||||
AssemblyItems findRepresentation(u256 const& _value);
|
||||
/// Recomputes the value from the calculated representation and checks for correctness.
|
||||
bool checkRepresentation(u256 const& _value, AssemblyItems const& _routine) const;
|
||||
static bool checkRepresentation(u256 const& _value, AssemblyItems const& _routine);
|
||||
bigint gasNeeded(AssemblyItems const& _routine) const;
|
||||
|
||||
/// Counter for the complexity of optimization, will stop when it reaches zero.
|
||||
|
@ -50,8 +50,8 @@ public:
|
||||
private:
|
||||
void finalise(CompilerState const& _cs);
|
||||
|
||||
template <class T> void error() const { BOOST_THROW_EXCEPTION(T() ); }
|
||||
template <class T> void error(std::string const& reason) const {
|
||||
template <class T> static void error() { BOOST_THROW_EXCEPTION(T() ); }
|
||||
template <class T> static void error(std::string const& reason) {
|
||||
auto err = T();
|
||||
err << errinfo_comment(reason);
|
||||
BOOST_THROW_EXCEPTION(err);
|
||||
|
@ -119,7 +119,7 @@ private:
|
||||
);
|
||||
std::string sourceLocationToString(SourceLocation const& _location) const;
|
||||
std::string namePathToString(std::vector<ASTString> const& _namePath) const;
|
||||
Json::Value idOrNull(ASTNode const* _pt) const
|
||||
static Json::Value idOrNull(ASTNode const* _pt)
|
||||
{
|
||||
return _pt ? Json::Value(nodeId(*_pt)) : Json::nullValue;
|
||||
}
|
||||
@ -134,12 +134,12 @@ private:
|
||||
std::string literalTokenKind(Token::Value _token);
|
||||
std::string type(Expression const& _expression);
|
||||
std::string type(VariableDeclaration const& _varDecl);
|
||||
int nodeId(ASTNode const& _node) const
|
||||
static int nodeId(ASTNode const& _node)
|
||||
{
|
||||
return _node.id();
|
||||
}
|
||||
template<class Container>
|
||||
Json::Value getContainerIds(Container const& container) const
|
||||
static Json::Value getContainerIds(Container const& container)
|
||||
{
|
||||
Json::Value tmp(Json::arrayValue);
|
||||
for (auto const& element: container)
|
||||
|
@ -1056,7 +1056,7 @@ string ABIFunctions::createFunction(string const& _name, function<string ()> con
|
||||
return _name;
|
||||
}
|
||||
|
||||
size_t ABIFunctions::headSize(TypePointers const& _targetTypes) const
|
||||
size_t ABIFunctions::headSize(TypePointers const& _targetTypes)
|
||||
{
|
||||
size_t headSize = 0;
|
||||
for (auto const& t: _targetTypes)
|
||||
|
@ -162,7 +162,7 @@ private:
|
||||
std::string createFunction(std::string const& _name, std::function<std::string()> const& _creator);
|
||||
|
||||
/// @returns the size of the static part of the encoding of the given types.
|
||||
size_t headSize(TypePointers const& _targetTypes) const;
|
||||
static size_t headSize(TypePointers const& _targetTypes);
|
||||
|
||||
/// Map from function name to code for a multi-use function.
|
||||
std::map<std::string, std::string> m_requestedFunctions;
|
||||
|
@ -127,7 +127,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
LabelID assemblyTagToIdentifier(eth::AssemblyItem const& _tag) const
|
||||
static LabelID assemblyTagToIdentifier(eth::AssemblyItem const& _tag)
|
||||
{
|
||||
u256 id = _tag.data();
|
||||
solAssert(id <= std::numeric_limits<LabelID>::max(), "Tag id too large.");
|
||||
|
Loading…
Reference in New Issue
Block a user