cerc-io/solidity
15
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

Change totalBits and fractionalDigits to unsigned in FixedPointType

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-04-30 22:50:27 +01:00 committed by daniel
parent 72c3b3a242
commit 2c00ebbee1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/ast/Types.cpp
View File

@ -595,13 +595,13 @@ MemberList::MemberMap IntegerType::nativeMembers(ContractDefinition const*) cons
return MemberList::MemberMap(); return MemberList::MemberMap();
} }
FixedPointType::FixedPointType(int _totalBits, int _fractionalDigits, FixedPointType::Modifier _modifier): FixedPointType::FixedPointType(unsigned _totalBits, unsigned _fractionalDigits, FixedPointType::Modifier _modifier):
m_totalBits(_totalBits), m_fractionalDigits(_fractionalDigits), m_modifier(_modifier) m_totalBits(_totalBits), m_fractionalDigits(_fractionalDigits), m_modifier(_modifier)
{ {
solAssert( solAssert(
8 <= m_totalBits && m_totalBits <= 256 && m_totalBits % 8 == 0 && 8 <= m_totalBits && m_totalBits <= 256 && m_totalBits % 8 == 0 &&
0 <= m_fractionalDigits && m_fractionalDigits <= 80, 0 <= m_fractionalDigits && m_fractionalDigits <= 80,
"Invalid bit number(s) for fixed type: " + "Invalid bit number(s) for fixed type: " +
dev::toString(_totalBits) + "x" + dev::toString(_fractionalDigits) dev::toString(_totalBits) + "x" + dev::toString(_fractionalDigits)
); );
} }

10
libsolidity/ast/Types.h
View File

@ -366,7 +366,7 @@ public:
}; };
virtual Category category() const override { return Category::FixedPoint; } virtual Category category() const override { return Category::FixedPoint; }
explicit FixedPointType(int _totalBits, int _fractionalDigits, Modifier _modifier = Modifier::Unsigned); explicit FixedPointType(unsigned _totalBits, unsigned _fractionalDigits, Modifier _modifier = Modifier::Unsigned);
virtual std::string richIdentifier() const override; virtual std::string richIdentifier() const override;
virtual bool isImplicitlyConvertibleTo(Type const& _convertTo) const override; virtual bool isImplicitlyConvertibleTo(Type const& _convertTo) const override;
@ -386,9 +386,9 @@ public:
virtual TypePointer interfaceType(bool) const override { return shared_from_this(); } virtual TypePointer interfaceType(bool) const override { return shared_from_this(); }
/// Number of bits used for this type in total. /// Number of bits used for this type in total.
int numBits() const { return m_totalBits; } unsigned numBits() const { return m_totalBits; }
/// Number of decimal digits after the radix point. /// Number of decimal digits after the radix point.
int fractionalDigits() const { return m_fractionalDigits; } unsigned fractionalDigits() const { return m_fractionalDigits; }
bool isSigned() const { return m_modifier == Modifier::Signed; } bool isSigned() const { return m_modifier == Modifier::Signed; }
/// @returns the largest integer value this type con hold. Note that this is not the /// @returns the largest integer value this type con hold. Note that this is not the
/// largest value in general. /// largest value in general.
@ -401,8 +401,8 @@ public:
std::shared_ptr<IntegerType> asIntegerType() const; std::shared_ptr<IntegerType> asIntegerType() const;
private: private:
int m_totalBits; unsigned m_totalBits;
int m_fractionalDigits; unsigned m_fractionalDigits;
Modifier m_modifier; Modifier m_modifier;
}; };