Prefer mobileType() to check rational range.

3 files changed, 23 insertions, 26 deletions

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 264fee6b..f28e08ab 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -772,12 +772,17 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 		{
 			// Infer type from value.
 			solAssert(!var.typeName(), "");
-			if (
-				valueComponentType->category() == Type::Category::RationalNumber &&
-				!dynamic_pointer_cast<RationalNumberType const>(valueComponentType)->mobileType()
-			)
-				fatalTypeError(_statement.initialValue()->location(), "Invalid rational " + valueComponentType->toString() + ".");
 			var.annotation().type = valueComponentType->mobileType();
+			if (!var.annotation().type)
+				if (valueComponentType->category() == Type::Category::RationalNumber)
+					fatalTypeError(
+						_statement.initialValue()->location(),
+						"Invalid rational " +
+						valueComponentType->toString() +
+						" (absolute value too large or divison by zero)."
+					);
+				else
+					solAssert(false, "");
 			var.accept(*this);
 		}
 		else
@@ -787,8 +792,8 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 			{
 				if (
 					valueComponentType->category() == Type::Category::RationalNumber &&
-					dynamic_pointer_cast<RationalNumberType const>(valueComponentType)->denominator() != 1 &&
-					!!valueComponentType->mobileType()
+					dynamic_cast<RationalNumberType const&>(*valueComponentType).denominator() != 1 &&
+					valueComponentType->mobileType()
 				)
 					typeError(
 						_statement.location(),
@@ -818,10 +823,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 void TypeChecker::endVisit(ExpressionStatement const& _statement)
 {
 	if (type(_statement.expression())->category() == Type::Category::RationalNumber)
-		if (
-			!dynamic_pointer_cast<RationalNumberType const>(type(_statement.expression()))->integerType() && 
-			!dynamic_pointer_cast<RationalNumberType const>(type(_statement.expression()))->fixedPointType()
-		)
+		if (!dynamic_cast<RationalNumberType const&>(*type(_statement.expression())).mobileType())
 			typeError(_statement.expression().location(), "Invalid rational number.");
 }
 
@@ -1128,8 +1130,8 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 			if (functionType->takesArbitraryParameters())
 			{
 				if (auto t = dynamic_cast<RationalNumberType const*>(argType.get()))
-					if (!t->integerType() && !t->fixedPointType())
-						typeError(arguments[i]->location(), "Rational number too large.");
+					if (!t->mobileType())
+						typeError(arguments[i]->location(), "Invalid rational number (too large or division by zero).");
 			}
 			else if (!type(*arguments[i])->isImplicitlyConvertibleTo(*parameterTypes[i]))
 				typeError(
@@ -1367,7 +1369,7 @@ bool TypeChecker::visit(IndexAccess const& _access)
 				solAssert(!numberType->denominator() != 1 ,"Invalid type for array access.");
 				if (!actualType.isDynamicallySized() && actualType.length() <= numberType->literalValue(nullptr))
 					typeError(_access.location(), "Out of bounds array access.");
-			}				
+			}
 		}
 		resultType = actualType.baseType();
 		isLValue = actualType.location() != DataLocation::CallData;
@@ -1521,7 +1523,7 @@ void TypeChecker::expectType(Expression const& _expression, Type const& _expecte
 		if (
 			type(_expression)->category() == Type::Category::RationalNumber &&
 			dynamic_pointer_cast<RationalNumberType const>(type(_expression))->denominator() != 1 &&
-			!!type(_expression)->mobileType()
+			type(_expression)->mobileType()
 		)
 			typeError(
 				_expression.location(),
@@ -1531,7 +1533,7 @@ void TypeChecker::expectType(Expression const& _expression, Type const& _expecte
 				_expectedType.toString() +
 				". Try converting to type " +
 				type(_expression)->mobileType()->toString() +
-				" or using an explicit conversion." 
+				" or use an explicit conversion."
 			);
 		else
 			typeError(
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 1dbb70e2..c2ebecb5 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -766,20 +766,15 @@ u256 RationalNumberType::literalValue(Literal const*) const
 TypePointer RationalNumberType::mobileType() const
 {
 	if (m_value.denominator() == 1)
-	{
-		auto intType = integerType();
-		solAssert(!!intType, "mobileType called with invalid integer constant " + toString(false));
-		return intType;
-	}
-	auto fixType = fixedPointType();
-	solAssert(!!fixType, "mobileType called with invalid fixed constant " + toString(false));
-	return fixType;
+		return integerType();
+	else
+		return fixedPointType();
 }
 
 //TODO: combine integerType() and fixedPointType() into one function
 shared_ptr<IntegerType const> RationalNumberType::integerType() const
 {
-	solAssert(m_value.denominator() == 1, "Non integer type found.");
+	solAssert(m_value.denominator() == 1, "integerType() called for fractional number.");
 	bigint value = integerPart();
 	bool negative = (value < 0);
 	if (negative) // convert to positive number of same bit requirements
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 5e826684..c3095c97 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -205,7 +205,7 @@ public:
 	virtual unsigned sizeOnStack() const { return 1; }
 	/// @returns the mobile (in contrast to static) type corresponding to the given type.
 	/// This returns the corresponding integer type for ConstantTypes and the pointer type
-	/// for storage reference types.
+	/// for storage reference types. Might return a null pointer if there is no fitting type.
 	virtual TypePointer mobileType() const { return shared_from_this(); }
 	/// @returns true if this is a non-value type and the data of this type is stored at the
 	/// given location.