Merge pull request #4077 from njwest/grammar-fix

fixed grammar in error in CompilerUtils.cpp line 399, 'less variables…
This commit is contained in:
chriseth 2018-05-07 08:11:21 +02:00 committed by GitHub
commit 6db7e09afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -110,7 +110,7 @@ void CompilerUtils::loadFromMemoryDynamic(
bool _padToWordBoundaries, bool _padToWordBoundaries,
bool _keepUpdatedMemoryOffset bool _keepUpdatedMemoryOffset
) )
{ {
if (_keepUpdatedMemoryOffset) if (_keepUpdatedMemoryOffset)
m_context << Instruction::DUP1; m_context << Instruction::DUP1;
@ -396,7 +396,7 @@ void CompilerUtils::encodeToMemory(
// leave end_of_mem as dyn head pointer // leave end_of_mem as dyn head pointer
m_context << Instruction::DUP1 << u256(32) << Instruction::ADD; m_context << Instruction::DUP1 << u256(32) << Instruction::ADD;
dynPointers++; dynPointers++;
solAssert((argSize + dynPointers) < 16, "Stack too deep, try using less variables."); solAssert((argSize + dynPointers) < 16, "Stack too deep, try using fewer variables.");
} }
else else
{ {
@ -741,7 +741,7 @@ void CompilerUtils::convertType(
else if (targetTypeCategory == Type::Category::FixedPoint) else if (targetTypeCategory == Type::Category::FixedPoint)
{ {
solAssert( solAssert(
stackTypeCategory == Type::Category::Integer || stackTypeCategory == Type::Category::Integer ||
stackTypeCategory == Type::Category::RationalNumber || stackTypeCategory == Type::Category::RationalNumber ||
stackTypeCategory == Type::Category::FixedPoint, stackTypeCategory == Type::Category::FixedPoint,
"Invalid conversion to FixedMxNType requested." "Invalid conversion to FixedMxNType requested."