cerc-io/solidity
16
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 #5144 from ethereum/fixHexTypo

Browse Source 
Fix typos.
This commit is contained in:
chriseth 2018-10-04 13:52:01 +02:00 committed by GitHub
commit 1a36de62b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/solidity-by-example.rst
View File

@ -242,7 +242,7 @@ activate themselves.
mapping(address => uint) pendingReturns; mapping(address => uint) pendingReturns;
// Set to true at the end, disallows any change. // Set to true at the end, disallows any change.
// By defaul initialized to `false`. // By default initialized to `false`.
bool ended; bool ended;
// Events that will be emitted on changes. // Events that will be emitted on changes.

4
docs/types.rst
View File

@ -499,9 +499,9 @@ terminate the string literal. Newline only terminates the string literal if it i
Hexadecimal Literals 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 .. index:: enum

2
libevmasm/CommonSubexpressionEliminator.cpp
View File

@ -160,7 +160,7 @@ AssemblyItems CSECodeGenerator::generateCode(
if (seqNr < _initialSequenceNumber) if (seqNr < _initialSequenceNumber)
// Invalid sequenced operation. // Invalid sequenced operation.
// @todo quick fix for now. Proper fix needs to choose representative with higher // @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()); BOOST_THROW_EXCEPTION(StackTooDeepException());
sequencedExpressions.insert(make_pair(seqNr, id)); sequencedExpressions.insert(make_pair(seqNr, id));
} }

8
libsolidity/analysis/ViewPureChecker.cpp
View File

@ -292,11 +292,11 @@ void ViewPureChecker::endVisit(FunctionCall const& _functionCall)
if (_functionCall.annotation().kind != FunctionCallKind::FunctionCall) if (_functionCall.annotation().kind != FunctionCallKind::FunctionCall)
return; 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. // We only require "nonpayable" to call a payble function.
if (mut == StateMutability::Payable) if (mutability == StateMutability::Payable)
mut = StateMutability::NonPayable; mutability = StateMutability::NonPayable;
reportMutability(mut, _functionCall.location()); reportMutability(mutability, _functionCall.location());
} }
bool ViewPureChecker::visit(MemberAccess const& _memberAccess) bool ViewPureChecker::visit(MemberAccess const& _memberAccess)

2
libsolidity/codegen/CompilerUtils.h
View File

@ -260,7 +260,7 @@ public:
/// Stack post: <shifted_value> /// Stack post: <shifted_value>
void rightShiftNumberOnStack(unsigned _bits); 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(); void computeHashStatic();
/// Bytes we need to the start of call data. /// Bytes we need to the start of call data.

2
libsolidity/parsing/Scanner.cpp
View File

@ -601,7 +601,7 @@ void Scanner::scanToken()
{ {
tie(token, m, n) = scanIdentifierOrKeyword(); tie(token, m, n) = scanIdentifierOrKeyword();
// Special case for hexademical literals // Special case for hexadecimal literals
if (token == Token::Hex) if (token == Token::Hex)
{ {
// reset // reset

1
scripts/codespell_whitelist.txt
View File

@ -1,3 +1,4 @@
iff iff
nd nd
assignend assignend
uint

2
test/compilationTests/zeppelin/token/VestedToken.sol
View File

@ -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 * @param holder address The address of the holder
* @return An uint256 representing the date of the last transferable tokens. * @return An uint256 representing the date of the last transferable tokens.
*/ */