aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-09-24 19:52:33 +0800
committerGitHub <noreply@github.com>2018-09-24 19:52:33 +0800
commit32112d64801ce559f113ef597cc29469c0dab770 (patch)
treed4b0bfa3bfc97a9ae0e68b2036ab56c111c624a5
parentd38c9764664d74088244d6ff9e61bf29c50e6402 (diff)
parentf347dee812eed22fa5cf59801c05a701333b70e2 (diff)
downloaddexon-solidity-32112d64801ce559f113ef597cc29469c0dab770.tar.gz
dexon-solidity-32112d64801ce559f113ef597cc29469c0dab770.tar.zst
dexon-solidity-32112d64801ce559f113ef597cc29469c0dab770.zip
Merge pull request #5041 from liangdzou/fix_typo_in_doc
fix typo in docs and comments
-rw-r--r--libjulia/backends/evm/AbstractAssembly.h2
-rw-r--r--libsolidity/ast/Types.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libjulia/backends/evm/AbstractAssembly.h b/libjulia/backends/evm/AbstractAssembly.h
index 6b1b5c23..b6818923 100644
--- a/libjulia/backends/evm/AbstractAssembly.h
+++ b/libjulia/backends/evm/AbstractAssembly.h
@@ -103,7 +103,7 @@ enum class IdentifierContext { LValue, RValue };
struct ExternalIdentifierAccess
{
using Resolver = std::function<size_t(solidity::assembly::Identifier const&, IdentifierContext, bool /*_crossesFunctionBoundary*/)>;
- /// Resolve a an external reference given by the identifier in the given context.
+ /// Resolve an external reference given by the identifier in the given context.
/// @returns the size of the value (number of stack slots) or size_t(-1) if not found.
Resolver resolve;
using CodeGenerator = std::function<void(solidity::assembly::Identifier const&, IdentifierContext, julia::AbstractAssembly&)>;
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index f49e1222..c97ee657 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -666,7 +666,7 @@ TypePointer IntegerType::binaryOperatorResult(Token::Value _operator, TypePointe
return TypePointer();
}
- auto commonType = Type::commonType(shared_from_this(), _other); //might be a integer or fixed point
+ auto commonType = Type::commonType(shared_from_this(), _other); //might be an integer or fixed point
if (!commonType)
return TypePointer();