Remove redundant emptiness check from genericParseNumber

third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp

 /*
  * Copyright (C) 2002, 2003 The Karbon Developers
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007, 2009, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 24 matching lines @@
 }
 
 // We use this generic parseNumber function to allow the Path parsing code to work
 // at a higher precision internally, without any unnecessary runtime cost or code
 // complexity.
 template <typename CharType, typename FloatType>
 static bool genericParseNumber(const CharType*& ptr, const CharType* end, FloatType& number, WhitespaceMode mode)
 {
     FloatType integer, decimal, frac, exponent;
     int sign, expsign;
-    const CharType* start = ptr;
 
     exponent = 0;
     integer = 0;
     frac = 1;
     decimal = 0;
     sign = 1;
     expsign = 1;
 
     if (mode & AllowLeadingWhitespace)
         skipOptionalSVGSpaces(ptr, end);
 
     // read the sign
     if (ptr < end && *ptr == '+')
         ptr++;
     else if (ptr < end && *ptr == '-') {
         ptr++;
         sign = -1;
     }
 
+    const CharType* digitsStart = ptr;
     if (ptr == end || ((*ptr < '0' || *ptr > '9') && *ptr != '.'))
         // The first character of a number must be one of [0-9+-.]
         return false;
 
     // read the integer part, build right-to-left
     const CharType* ptrStartIntPart = ptr;
     while (ptr < end && *ptr >= '0' && *ptr <= '9')
         ++ptr; // Advance to first non-digit.
 
     if (ptr != ptrStartIntPart) {
@@ skipping 12 matching lines @@
         ptr++;
 
         // There must be a least one digit following the .
         if (ptr >= end || *ptr < '0' || *ptr > '9')
             return false;
 
         while (ptr < end && *ptr >= '0' && *ptr <= '9')
             decimal += (*(ptr++) - '0') * (frac *= static_cast<FloatType>(0.1));
     }
 
+    // When we get here we should have consumed either a digit for the integer
+    // part or a fractional part (with at least one digit after the '.'.)
+    ASSERT_UNUSED(digitsStart, digitsStart != ptr);

[pdr., 2016/01/13 18:58:11]

Can we reuse/rename ptrStartIntPart and change this to a regular ol' assertion?

[fs, 2016/01/13 19:16:27]

Yepp. Like so.

+
     // read the exponent part
-    if (ptr != start && ptr + 1 < end && (*ptr == 'e' || *ptr == 'E')
+    if (ptr + 1 < end && (*ptr == 'e' || *ptr == 'E')
         && (ptr[1] != 'x' && ptr[1] != 'm')) {
         ptr++;
 
         // read the sign of the exponent
         if (*ptr == '+')
             ptr++;
         else if (*ptr == '-') {
             ptr++;
             expsign = -1;
         }
@@ skipping 15 matching lines @@
     number = integer + decimal;
     number *= sign;
 
     if (exponent)
         number *= static_cast<FloatType>(pow(10.0, expsign * static_cast<int>(exponent)));
 
     // Don't return Infinity() or NaN().
     if (!isValidRange(number))
         return false;
 
-    if (start == ptr)
-        return false;
-
     if (mode & AllowTrailingWhitespace)
         skipOptionalSVGSpacesOrDelimiter(ptr, end);
 
     return true;
 }
 
 bool parseNumber(const LChar*& ptr, const LChar* end, float& number, WhitespaceMode mode)
 {
     return genericParseNumber(ptr, end, number, mode);
 }
@@ skipping 93 matching lines @@
         const LChar* ptr = string.characters8();
         const LChar* end = ptr + string.length();
         return genericParseNumberOrPercentage(ptr, end, number);
     }
     const UChar* ptr = string.characters16();
     const UChar* end = ptr + string.length();
     return genericParseNumberOrPercentage(ptr, end, number);
 }
 
 }