From b34428249a24c29e17de8636c2d3011d95d052cc Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 30 Apr 2018 22:56:30 +0100
Subject: Change numBits to unsigned IntegerType
---
libsolidity/analysis/TypeChecker.cpp | 3 ++-
libsolidity/ast/Types.cpp | 10 +++++-----
libsolidity/ast/Types.h | 6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)
(limited to 'libsolidity')
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 7ea10c5b..82421749 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1200,8 +1200,9 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
string extension;
if (auto type = dynamic_cast<IntegerType const*>(var.annotation().type.get()))
{
- int numBits = type->numBits();
+ unsigned numBits = type->numBits();
bool isSigned = type->isSigned();
+ solAssert(numBits > 0, "");
string minValue;
string maxValue;
if (isSigned)
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 56d41974..f41a4a37 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -425,14 +425,14 @@ bool isValidShiftAndAmountType(Token::Value _operator, Type const& _shiftAmountT
}
-IntegerType::IntegerType(int _bits, IntegerType::Modifier _modifier):
+IntegerType::IntegerType(unsigned _bits, IntegerType::Modifier _modifier):
m_bits(_bits), m_modifier(_modifier)
{
if (isAddress())
solAssert(m_bits == 160, "");
solAssert(
m_bits > 0 && m_bits <= 256 && m_bits % 8 == 0,
- "Invalid bit number for integer type: " + dev::toString(_bits)
+ "Invalid bit number for integer type: " + dev::toString(m_bits)
);
}
@@ -584,7 +584,7 @@ MemberList::MemberMap IntegerType::nativeMembers(ContractDefinition const*) cons
{
if (isAddress())
return {
- {"balance", make_shared<IntegerType >(256)},
+ {"balance", make_shared<IntegerType>(256)},
{"call", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareCall, true, StateMutability::Payable)},
{"callcode", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareCallCode, true, StateMutability::Payable)},
{"delegatecall", make_shared<FunctionType>(strings(), strings{"bool"}, FunctionType::Kind::BareDelegateCall, true)},
@@ -696,7 +696,7 @@ TypePointer FixedPointType::binaryOperatorResult(Token::Value _operator, TypePoi
std::shared_ptr<IntegerType> FixedPointType::asIntegerType() const
{
- return std::make_shared<IntegerType>(numBits(), isSigned() ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned);
+ return make_shared<IntegerType>(numBits(), isSigned() ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned);
}
tuple<bool, rational> RationalNumberType::parseRational(string const& _value)
@@ -850,7 +850,7 @@ bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
if (isFractional())
return false;
IntegerType const& targetType = dynamic_cast<IntegerType const&>(_convertTo);
- int forSignBit = (targetType.isSigned() ? 1 : 0);
+ unsigned forSignBit = (targetType.isSigned() ? 1 : 0);
if (m_value > rational(0))
{
if (m_value.numerator() <= (u256(-1) >> (256 - targetType.numBits() + forSignBit)))
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 7e6a93b5..d39c395a 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -319,7 +319,7 @@ public:
};
virtual Category category() const override { return Category::Integer; }
- explicit IntegerType(int _bits, Modifier _modifier = Modifier::Unsigned);
+ explicit IntegerType(unsigned _bits, Modifier _modifier = Modifier::Unsigned);
virtual std::string richIdentifier() const override;
virtual bool isImplicitlyConvertibleTo(Type const& _convertTo) const override;
@@ -342,7 +342,7 @@ public:
virtual TypePointer encodingType() const override { return shared_from_this(); }
virtual TypePointer interfaceType(bool) const override { return shared_from_this(); }
- int numBits() const { return m_bits; }
+ unsigned numBits() const { return m_bits; }
bool isAddress() const { return m_modifier == Modifier::Address; }
bool isSigned() const { return m_modifier == Modifier::Signed; }
@@ -350,7 +350,7 @@ public:
bigint maxValue() const;
private:
- int m_bits;
+ unsigned m_bits;
Modifier m_modifier;
};
--
cgit v1.2.3