diff options
| author | chriseth <chris@ethereum.org> | 2018-05-07 14:11:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 14:11:21 +0800 |
| commit | 6db7e09afdb53bd8d31512ee2a1227b93e46e41a (patch) | |
| tree | 680b0eee5ce53ed427afa55989b72d73cf7afc7f | |
| parent | 8d666e180d5e109be55b381918014e1c090bd307 (diff) | |
| parent | 51b4dc37522f82c0fe4549c7cb24b1567ee1b316 (diff) | |
| download | dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar.gz dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar.bz2 dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar.lz dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar.xz dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.tar.zst dexon-solidity-6db7e09afdb53bd8d31512ee2a1227b93e46e41a.zip | |
Merge pull request #4077 from njwest/grammar-fix
fixed grammar in error in CompilerUtils.cpp line 399, 'less variables…
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index fc1ff0eb..a39e799c 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -110,7 +110,7 @@ void CompilerUtils::loadFromMemoryDynamic( bool _padToWordBoundaries, bool _keepUpdatedMemoryOffset ) -{ +{ if (_keepUpdatedMemoryOffset) m_context << Instruction::DUP1; @@ -396,7 +396,7 @@ void CompilerUtils::encodeToMemory( // leave end_of_mem as dyn head pointer m_context << Instruction::DUP1 << u256(32) << Instruction::ADD; dynPointers++; - solAssert((argSize + dynPointers) < 16, "Stack too deep, try using less variables."); + solAssert((argSize + dynPointers) < 16, "Stack too deep, try using fewer variables."); } else { @@ -741,7 +741,7 @@ void CompilerUtils::convertType( else if (targetTypeCategory == Type::Category::FixedPoint) { solAssert( - stackTypeCategory == Type::Category::Integer || + stackTypeCategory == Type::Category::Integer || stackTypeCategory == Type::Category::RationalNumber || stackTypeCategory == Type::Category::FixedPoint, "Invalid conversion to FixedMxNType requested." |