aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-11-12 16:55:32 +0800
committerGitHub <noreply@github.com>2018-11-12 16:55:32 +0800
commit09f8ff27fc576dbbd05e31471bb39c00abe90563 (patch)
tree388c476e7eba7967dfa37f9109f874e0b675b307
parent405565db62e8700fea08671b0dd85225257b6c5d (diff)
parent2cc304fd3fbc4c9af1f2e220a7af90a7eb9c42fb (diff)
downloaddexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar.gz
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar.bz2
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar.lz
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar.xz
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.tar.zst
dexon-solidity-09f8ff27fc576dbbd05e31471bb39c00abe90563.zip
Merge pull request #5395 from ethereum/fixStyle
Fix style
-rw-r--r--docs/contributing.rst4
-rw-r--r--libsolidity/ast/AST.h6
-rw-r--r--libsolidity/parsing/Parser.cpp2
-rw-r--r--test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul2
-rw-r--r--test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul2
5 files changed, 8 insertions, 8 deletions
diff --git a/docs/contributing.rst b/docs/contributing.rst
index e626e5c0..11f95206 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -84,8 +84,8 @@ internally.
.. 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``.
- If you're running this in plain Command Prompt, use ``.\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``.
The option ``--no-smt`` disables the tests that require ``libz3`` and
``--no-ipc`` disables those that require ``aleth``.
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index d819402e..4fd2bcb8 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1191,11 +1191,11 @@ public:
Statement const& body() const { return *m_body; }
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;
- /// For statement's condition expression. for(; XXX ; ). Can be empty
+ /// For statement's condition expression. for (; XXX ; ). Can be empty
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;
/// The body of the loop
ASTPointer<Statement> m_body;
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index f99b9ea4..b17dad9a 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1556,7 +1556,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
}
case Token::IllegalHex:
fatalParserError("Expected even number of hex-nibbles within double-quotes.");
- break;
+ break;
default:
if (TokenTraits::isElementaryTypeName(token))
{
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
index 4ac07031..ed8d33b4 100644
--- a/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
@@ -1,6 +1,6 @@
{
function f() -> a, b, c {}
- let x, y, z
+ let x, y, z
z, x, y := f()
}
// ----
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
index 117e0cc9..d8959040 100644
--- a/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
@@ -1,5 +1,5 @@
{
- let f
+ let f
f := mload(0)
}
// ----