diff options
| -rw-r--r-- | docs/solidity-by-example.rst | 2 | ||||
| -rw-r--r-- | docs/types.rst | 4 | ||||
| -rw-r--r-- | libevmasm/CommonSubexpressionEliminator.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/analysis/ViewPureChecker.cpp | 8 | ||||
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.h | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/Scanner.cpp | 2 | ||||
| -rw-r--r-- | scripts/codespell_whitelist.txt | 1 | ||||
| -rw-r--r-- | test/compilationTests/zeppelin/token/VestedToken.sol | 2 |
8 files changed, 12 insertions, 11 deletions
diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst index 0f9a71ab..1bbd42f8 100644 --- a/docs/solidity-by-example.rst +++ b/docs/solidity-by-example.rst @@ -242,7 +242,7 @@ activate themselves. mapping(address => uint) pendingReturns; // Set to true at the end, disallows any change. - // By defaul initialized to `false`. + // By default initialized to `false`. bool ended; // Events that will be emitted on changes. diff --git a/docs/types.rst b/docs/types.rst index 84c448ff..dfe77728 100644 --- a/docs/types.rst +++ b/docs/types.rst @@ -499,9 +499,9 @@ terminate the string literal. Newline only terminates the string literal if it i Hexadecimal Literals -------------------- -Hexademical Literals are prefixed with the keyword ``hex`` and are enclosed in double or single-quotes (``hex"001122FF"``). Their content must be a hexadecimal string and their value will be the binary representation of those values. +Hexadecimal literals are prefixed with the keyword ``hex`` and are enclosed in double or single-quotes (``hex"001122FF"``). Their content must be a hexadecimal string and their value will be the binary representation of those values. -Hexademical Literals behave like String Literals and have the same convertibility restrictions. +Hexadecimal literals behave like string literals and have the same convertibility restrictions. .. index:: enum diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp index 293cb02c..39485dd9 100644 --- a/libevmasm/CommonSubexpressionEliminator.cpp +++ b/libevmasm/CommonSubexpressionEliminator.cpp @@ -160,7 +160,7 @@ AssemblyItems CSECodeGenerator::generateCode( if (seqNr < _initialSequenceNumber) // Invalid sequenced operation. // @todo quick fix for now. Proper fix needs to choose representative with higher - // sequence number during dependency analyis. + // sequence number during dependency analysis. BOOST_THROW_EXCEPTION(StackTooDeepException()); sequencedExpressions.insert(make_pair(seqNr, id)); } diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp index 113a3177..b0cacc43 100644 --- a/libsolidity/analysis/ViewPureChecker.cpp +++ b/libsolidity/analysis/ViewPureChecker.cpp @@ -292,11 +292,11 @@ void ViewPureChecker::endVisit(FunctionCall const& _functionCall) if (_functionCall.annotation().kind != FunctionCallKind::FunctionCall) return; - StateMutability mut = dynamic_cast<FunctionType const&>(*_functionCall.expression().annotation().type).stateMutability(); + StateMutability mutability = dynamic_cast<FunctionType const&>(*_functionCall.expression().annotation().type).stateMutability(); // We only require "nonpayable" to call a payble function. - if (mut == StateMutability::Payable) - mut = StateMutability::NonPayable; - reportMutability(mut, _functionCall.location()); + if (mutability == StateMutability::Payable) + mutability = StateMutability::NonPayable; + reportMutability(mutability, _functionCall.location()); } bool ViewPureChecker::visit(MemberAccess const& _memberAccess) diff --git a/libsolidity/codegen/CompilerUtils.h b/libsolidity/codegen/CompilerUtils.h index ad3d7327..bd8170ad 100644 --- a/libsolidity/codegen/CompilerUtils.h +++ b/libsolidity/codegen/CompilerUtils.h @@ -260,7 +260,7 @@ public: /// Stack post: <shifted_value> void rightShiftNumberOnStack(unsigned _bits); - /// Appends code that computes tha Keccak-256 hash of the topmost stack element of 32 byte type. + /// Appends code that computes the Keccak-256 hash of the topmost stack element of 32 byte type. void computeHashStatic(); /// Bytes we need to the start of call data. diff --git a/libsolidity/parsing/Scanner.cpp b/libsolidity/parsing/Scanner.cpp index 0f6d6996..9a7f85cb 100644 --- a/libsolidity/parsing/Scanner.cpp +++ b/libsolidity/parsing/Scanner.cpp @@ -601,7 +601,7 @@ void Scanner::scanToken() { tie(token, m, n) = scanIdentifierOrKeyword(); - // Special case for hexademical literals + // Special case for hexadecimal literals if (token == Token::Hex) { // reset diff --git a/scripts/codespell_whitelist.txt b/scripts/codespell_whitelist.txt index 31f03981..0f5013cb 100644 --- a/scripts/codespell_whitelist.txt +++ b/scripts/codespell_whitelist.txt @@ -1,3 +1,4 @@ iff nd assignend +uint diff --git a/test/compilationTests/zeppelin/token/VestedToken.sol b/test/compilationTests/zeppelin/token/VestedToken.sol index 2cd607bc..c9469f16 100644 --- a/test/compilationTests/zeppelin/token/VestedToken.sol +++ b/test/compilationTests/zeppelin/token/VestedToken.sol @@ -234,7 +234,7 @@ contract VestedToken is StandardToken, LimitedTransferToken { } /** - * @dev Calculate the date when the holder can trasfer all its tokens + * @dev Calculate the date when the holder can transfer all its tokens * @param holder address The address of the holder * @return An uint256 representing the date of the last transferable tokens. */ |