Merge pull request #4480 from ethereum/fixZeroWithExponent

Fix literals with exponents with mantissa of zero.

1 files changed, 11 insertions, 8 deletions

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 0a4f199d..dd0736e9 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -771,20 +771,23 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
 		}
 		else if (expPoint != _literal.value().end())
 		{
-			// Parse base and exponent. Checks numeric limit.
-			bigint exp = bigint(string(expPoint + 1, _literal.value().end()));
+			// Parse mantissa and exponent. Checks numeric limit.
+			tuple<bool, rational> mantissa = parseRational(string(_literal.value().begin(), expPoint));
 
-			if (exp > numeric_limits<int32_t>::max() || exp < numeric_limits<int32_t>::min())
+			if (!get<0>(mantissa))
 				return make_tuple(false, rational(0));
+			value = get<1>(mantissa);
 
-			uint32_t expAbs = bigint(abs(exp)).convert_to<uint32_t>();
-
+			// 0E... is always zero.
+			if (value == 0)
+				return make_tuple(true, rational(0));
 
-			tuple<bool, rational> base = parseRational(string(_literal.value().begin(), expPoint));
+			bigint exp = bigint(string(expPoint + 1, _literal.value().end()));
 
-			if (!get<0>(base))
+			if (exp > numeric_limits<int32_t>::max() || exp < numeric_limits<int32_t>::min())
 				return make_tuple(false, rational(0));
-			value = get<1>(base);
+
+			uint32_t expAbs = bigint(abs(exp)).convert_to<uint32_t>();
 
 			if (exp < 0)
 			{