cerc-io/solidity
10
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 #5395 from ethereum/fixStyle

Browse Source 
Fix style
This commit is contained in:
chriseth 2018-11-12 09:55:32 +01:00 committed by GitHub
commit 09f8ff27fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/contributing.rst
View File

@ -84,8 +84,8 @@ internally.
.. note :: .. note ::
Those working in a Windows environment wanting to run the above basic sets without aleth or libz3 in Git Bash, you would have to do: ``./build/test/RelWithDebInfo/soltest.exe -- --no-ipc --no-smt``. Those working in a Windows environment wanting to run the above basic sets without aleth or libz3 in Git Bash, you would have to do: ``./build/test/RelWithDebInfo/soltest.exe -- --no-ipc --no-smt``.
If you're running this in plain Command Prompt, use ``.\build\test\RelWithDebInfo\soltest.exe -- --no-ipc --no-smt``. If you're running this in plain Command Prompt, use ``.\build\test\RelWithDebInfo\soltest.exe -- --no-ipc --no-smt``.
The option ``--no-smt`` disables the tests that require ``libz3`` and The option ``--no-smt`` disables the tests that require ``libz3`` and
``--no-ipc`` disables those that require ``aleth``. ``--no-ipc`` disables those that require ``aleth``.

6
libsolidity/ast/AST.h
View File

@ -1191,11 +1191,11 @@ public:
Statement const& body() const { return *m_body; } Statement const& body() const { return *m_body; }
private: private:
/// For statement's initialization expression. for(XXX; ; ). Can be empty /// For statement's initialization expression. for (XXX; ; ). Can be empty
ASTPointer<Statement> m_initExpression; ASTPointer<Statement> m_initExpression;
/// For statement's condition expression. for(; XXX ; ). Can be empty /// For statement's condition expression. for (; XXX ; ). Can be empty
ASTPointer<Expression> m_condExpression; ASTPointer<Expression> m_condExpression;
/// For statement's loop expression. for(;;XXX). Can be empty /// For statement's loop expression. for (;;XXX). Can be empty
ASTPointer<ExpressionStatement> m_loopExpression; ASTPointer<ExpressionStatement> m_loopExpression;
/// The body of the loop /// The body of the loop
ASTPointer<Statement> m_body; ASTPointer<Statement> m_body;

2
libsolidity/parsing/Parser.cpp
View File

@ -1556,7 +1556,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
} }
case Token::IllegalHex: case Token::IllegalHex:
fatalParserError("Expected even number of hex-nibbles within double-quotes."); fatalParserError("Expected even number of hex-nibbles within double-quotes.");
break; break;
default: default:
if (TokenTraits::isElementaryTypeName(token)) if (TokenTraits::isElementaryTypeName(token))
{ {

2
test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
View File

@ -1,6 +1,6 @@
{ {
function f() -> a, b, c {} function f() -> a, b, c {}
let x, y, z let x, y, z
z, x, y := f() z, x, y := f()
} }
// ---- // ----

2
test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
View File

@ -1,5 +1,5 @@
{ {
let f let f
f := mload(0) f := mload(0)
} }
// ---- // ----