cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5180 from ethereum/cpp-cleanup

Browse Source 
Some C++ cleanup
This commit is contained in:
chriseth 2018-10-10 11:43:42 +02:00 committed by GitHub
commit 06200b4b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libdevcore/CommonIO.cpp
View File

@ -23,7 +23,6 @@
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <fstream> #include <fstream>
#include <stdio.h>
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#else #else

2
libsolidity/analysis/SyntaxChecker.cpp
View File

@ -76,7 +76,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
{ {
solAssert(m_sourceUnit, ""); solAssert(m_sourceUnit, "");
vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end()); vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
if (literals.size() == 0) if (literals.empty())
m_errorReporter.syntaxError( m_errorReporter.syntaxError(
_pragma.location(), _pragma.location(),
"Experimental feature name is missing." "Experimental feature name is missing."

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -2123,7 +2123,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
auto& annotation = _memberAccess.annotation(); auto& annotation = _memberAccess.annotation();
if (possibleMembers.size() == 0) if (possibleMembers.empty())
{ {
if (initialMemberCount == 0) if (initialMemberCount == 0)
{ {

2
libsolidity/codegen/ContractCompiler.cpp
View File

@ -965,7 +965,7 @@ void ContractCompiler::popScopedVariables(ASTNode const* _node)
unsigned stackDiff = m_context.stackHeight() - blockHeight; unsigned stackDiff = m_context.stackHeight() - blockHeight;
CompilerUtils(m_context).popStackSlots(stackDiff); CompilerUtils(m_context).popStackSlots(stackDiff);
m_scopeStackHeight[m_modifierDepth].erase(_node); m_scopeStackHeight[m_modifierDepth].erase(_node);
if (m_scopeStackHeight[m_modifierDepth].size() == 0) if (m_scopeStackHeight[m_modifierDepth].empty())
m_scopeStackHeight.erase(m_modifierDepth); m_scopeStackHeight.erase(m_modifierDepth);
} }

2
libsolidity/formal/SMTChecker.cpp
View File

@ -894,7 +894,7 @@ void SMTChecker::pushPathCondition(smt::Expression const& _e)
smt::Expression SMTChecker::currentPathConditions() smt::Expression SMTChecker::currentPathConditions()
{ {
if (m_pathConditions.size() == 0) if (m_pathConditions.empty())
return smt::Expression(true); return smt::Expression(true);
return m_pathConditions.back(); return m_pathConditions.back();
} }

4
libsolidity/inlineasm/AsmParser.cpp
View File

@ -26,7 +26,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <ctype.h> #include <cctype>
#include <algorithm> #include <algorithm>
using namespace std; using namespace std;
@ -97,7 +97,7 @@ assembly::Statement Parser::parseStatement()
fatalParserError("Only one default case allowed."); fatalParserError("Only one default case allowed.");
else if (m_scanner->currentToken() == Token::Case) else if (m_scanner->currentToken() == Token::Case)
fatalParserError("Case not allowed after default case."); fatalParserError("Case not allowed after default case.");
if (_switch.cases.size() == 0) if (_switch.cases.empty())
fatalParserError("Switch statement without any cases."); fatalParserError("Switch statement without any cases.");
_switch.location.end = _switch.cases.back().body.location.end; _switch.location.end = _switch.cases.back().body.location.end;
return _switch; return _switch;

2
libsolidity/interface/CompilerStack.cpp
View File

@ -780,7 +780,7 @@ CompilerStack::Contract const& CompilerStack::contract(string const& _contractNa
// To provide a measure of backward-compatibility, if a contract is not located by its // To provide a measure of backward-compatibility, if a contract is not located by its
// fully-qualified name, a lookup will be attempted purely on the contract's name to see // fully-qualified name, a lookup will be attempted purely on the contract's name to see
// if anything will satisfy. // if anything will satisfy.
if (_contractName.find(":") == string::npos) if (_contractName.find(':') == string::npos)
{ {
for (auto const& contractEntry: m_contracts) for (auto const& contractEntry: m_contracts)
{ {

2
libsolidity/interface/StandardCompiler.cpp
View File

@ -509,7 +509,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
bool const compilationSuccess = m_compilerStack.state() == CompilerStack::State::CompilationSuccessful; bool const compilationSuccess = m_compilerStack.state() == CompilerStack::State::CompilationSuccessful;
/// Inconsistent state - stop here to receive error reports from users /// Inconsistent state - stop here to receive error reports from users
if (!compilationSuccess && (errors.size() == 0)) if (!compilationSuccess && errors.empty())
return formatFatalError("InternalCompilerError", "No error reported, but compilation failed."); return formatFatalError("InternalCompilerError", "No error reported, but compilation failed.");
Json::Value output = Json::objectValue; Json::Value output = Json::objectValue;

4
libsolidity/parsing/Parser.cpp
View File

@ -20,7 +20,7 @@
* Solidity parser. * Solidity parser.
*/ */
#include <ctype.h> #include <cctype>
#include <vector> #include <vector>
#include <libevmasm/SourceLocation.h> #include <libevmasm/SourceLocation.h>
#include <libsolidity/parsing/Parser.h> #include <libsolidity/parsing/Parser.h>
@ -554,7 +554,7 @@ ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
if (m_scanner->currentToken() != Token::Identifier) if (m_scanner->currentToken() != Token::Identifier)
fatalParserError(string("Expected identifier after ','")); fatalParserError(string("Expected identifier after ','"));
} }
if (members.size() == 0) if (members.empty())
parserError({"enum with no members is not allowed."}); parserError({"enum with no members is not allowed."});
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();

1
test/libsolidity/ASTJSONTest.cpp
View File

@ -22,7 +22,6 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <cctype>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>

4
test/libsolidity/LibSolc.cpp
View File

@ -52,7 +52,7 @@ Json::Value compileMulti(string const& _input, bool _callback)
{ {
string output( string output(
_callback ? _callback ?
compileJSONCallback(_input.c_str(), dev::test::Options::get().optimize, NULL) : compileJSONCallback(_input.c_str(), dev::test::Options::get().optimize, nullptr) :
compileJSONMulti(_input.c_str(), dev::test::Options::get().optimize) compileJSONMulti(_input.c_str(), dev::test::Options::get().optimize)
); );
Json::Value ret; Json::Value ret;
@ -62,7 +62,7 @@ Json::Value compileMulti(string const& _input, bool _callback)
Json::Value compile(string const& _input) Json::Value compile(string const& _input)
{ {
string output(compileStandard(_input.c_str(), NULL)); string output(compileStandard(_input.c_str(), nullptr));
Json::Value ret; Json::Value ret;
BOOST_REQUIRE(jsonParseStrict(output, ret)); BOOST_REQUIRE(jsonParseStrict(output, ret));
return ret; return ret;

1
test/libsolidity/SyntaxTest.cpp
View File

@ -20,7 +20,6 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <cctype>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>

2
test/tools/fuzzer.cpp
View File

@ -86,7 +86,7 @@ void testConstantOptimizer()
void runCompiler(string input) void runCompiler(string input)
{ {
string outputString(compileStandard(input.c_str(), NULL)); string outputString(compileStandard(input.c_str(), nullptr));
Json::Value output; Json::Value output;
if (!jsonParseStrict(outputString, output)) if (!jsonParseStrict(outputString, output))
{ {