diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-19 04:10:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 04:10:03 +0800 |
| commit | 37fa0c85ecfb459d5cdef5309ca2327e8a8d00c4 (patch) | |
| tree | 2d80cd08445747ab4fb5a0b197df60fbeb4b5e6e | |
| parent | 233a522707939431feda453aacbdf126028493ce (diff) | |
| parent | 24e5dcc352e9ce9569138dfa5af96fbf72ad3604 (diff) | |
| download | dexon-solidity-37fa0c85ecfb459d5cdef5309ca2327e8a8d00c4.tar.gz dexon-solidity-37fa0c85ecfb459d5cdef5309ca2327e8a8d00c4.tar.zst dexon-solidity-37fa0c85ecfb459d5cdef5309ca2327e8a8d00c4.zip | |
Merge pull request #5010 from liangdzou/code_format_problems
fix code format problems
| -rw-r--r-- | liblll/Compiler.cpp | 3 | ||||
| -rw-r--r-- | liblll/Parser.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/Natspec.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/SourceReferenceFormatter.cpp | 3 | ||||
| -rw-r--r-- | solc/CommandLineInterface.cpp | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp index 657f58b8..f944adbd 100644 --- a/liblll/Compiler.cpp +++ b/liblll/Compiler.cpp @@ -90,7 +90,8 @@ std::string dev::lll::compileLLLToAsm(std::string const& _src, EVMVersion _evmVe } catch (std::exception const& _e) { - if (_errors) { + if (_errors) + { _errors->push_back("Parse exception."); _errors->push_back(boost::diagnostic_information(_e)); } diff --git a/liblll/Parser.cpp b/liblll/Parser.cpp index c3c33306..854aeecc 100644 --- a/liblll/Parser.cpp +++ b/liblll/Parser.cpp @@ -148,7 +148,8 @@ void dev::lll::parseTreeLLL(string const& _s, sp::utree& o_out) BOOST_THROW_EXCEPTION(ParserException() << errinfo_comment(reason)); } for (auto i = ret; i != s.cend(); ++i) - if (!isspace(*i)) { + if (!isspace(*i)) + { BOOST_THROW_EXCEPTION(ParserException() << errinfo_comment("Non-whitespace left in parser")); } } diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp index a8716862..11dde349 100644 --- a/libsolidity/interface/Natspec.cpp +++ b/libsolidity/interface/Natspec.cpp @@ -83,7 +83,8 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef) doc["details"] = Json::Value(dev); auto constructorDefinition(_contractDef.constructor()); - if (constructorDefinition) { + if (constructorDefinition) + { Json::Value constructor(devDocumentation(constructorDefinition->annotation().docTags)); if (!constructor.empty()) // add the constructor, only if we have any documentation to add diff --git a/libsolidity/interface/SourceReferenceFormatter.cpp b/libsolidity/interface/SourceReferenceFormatter.cpp index 4724fc7f..865907e2 100644 --- a/libsolidity/interface/SourceReferenceFormatter.cpp +++ b/libsolidity/interface/SourceReferenceFormatter.cpp @@ -59,7 +59,8 @@ void SourceReferenceFormatter::printSourceLocation(SourceLocation const* _locati line = line.substr(max(0, startColumn - 35), min(startColumn, 35) + min(locationLength + 35, len - startColumn)); if (startColumn + locationLength + 35 < len) line += " ..."; - if (startColumn > 35) { + if (startColumn > 35) + { line = " ... " + line; startColumn = 40; } diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index f7d1c748..a43e789e 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -742,7 +742,8 @@ bool CommandLineInterface::processInput() // path will have it's last component set to '.'. This breaks // path comparison in later parts of the code, so we need to strip // it. - if (filesystem_path.filename() == ".") { + if (filesystem_path.filename() == ".") + { filesystem_path.remove_filename(); } m_allowedDirectories.push_back(filesystem_path); |