From 7be18f702b7adc616712808373fe8dffca5c964c Mon Sep 17 00:00:00 2001 From: "lrn@chromium.org" Date: Fri, 26 Nov 2010 11:48:35 +0000 Subject: [PATCH] make DateParser::TimeComposer handle 1-2 digits millisecond values see http://code.google.com/p/v8/issues/detail?id=944 This patch makes DateParser::TimeComposer process times that have millisecond values with only 1 or 2 digits. Without this patch, Date.parse("2010-11-25T22:02:30.5") returns 1290690150005 and Date.parse("2010-11-25T22:02:30.5") == Date.parse("2010-11-25T22:02:30.005") evaluates to true. With this patch, Date.parse("2010-11-25T22:02:30.5") returns 1290690150500 instead, and Date.parse("2010-11-25T22:02:30.5") == Date.parse("2010-11-25T22:02:30.005") evaluates to false. Review URL: http://codereview.chromium.org/5336005 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5893 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/dateparser-inl.h | 2 +- src/dateparser.h | 12 ++++++++++ test/mjsunit/regress/regress-944.js | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-944.js diff --git a/src/dateparser-inl.h b/src/dateparser-inl.h index e52cc94..ac28c62 100644 --- a/src/dateparser-inl.h +++ b/src/dateparser-inl.h @@ -59,7 +59,7 @@ bool DateParser::Parse(Vector str, FixedArray* out) { } else if (in.Skip('.') && time.IsExpecting(n)) { time.Add(n); if (!in.IsAsciiDigit()) return false; - int n = in.ReadUnsignedNumber(); + int n = in.ReadMilliseconds(); time.AddFinal(n); } else if (tz.IsExpecting(n)) { tz.SetAbsoluteMinute(n); diff --git a/src/dateparser.h b/src/dateparser.h index 28053f4..40e56f3 100644 --- a/src/dateparser.h +++ b/src/dateparser.h @@ -87,6 +87,18 @@ class DateParser : public AllStatic { return n; } + // Read a string of digits, take the first three or fewer as an unsigned + // number of milliseconds, and ignore any digits after the first three. + int ReadMilliseconds() { + has_read_number_ = true; + int n = 0; + int power; + for (power = 100; IsAsciiDigit(); Next(), power = power / 10) { + n = n + power * (ch_ - '0'); + } + return n; + } + // Read a word (sequence of chars. >= 'A'), fill the given buffer with a // lower-case prefix, and pad any remainder of the buffer with zeroes. // Return word length. diff --git a/test/mjsunit/regress/regress-944.js b/test/mjsunit/regress/regress-944.js new file mode 100644 index 0000000..d165336 --- /dev/null +++ b/test/mjsunit/regress/regress-944.js @@ -0,0 +1,46 @@ +// Copyright 2010 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Check for parsing of proper ES5 15.9.1.15 (ISO 8601 / RFC 3339) time +// strings that contain millisecond values with exactly 3 digits (as is +// required by the spec format if the string has milliseconds at all). +assertEquals(1290722550521, Date.parse("2010-11-25T22:02:30.521Z")); + +// Check for parsing of extension/generalization of the ES5 15.9.1.15 spec +// format where millisecond values have only 1 or 2 digits. +assertEquals(1290722550500, Date.parse("2010-11-25T22:02:30.5Z")); +assertEquals(1290722550520, Date.parse("2010-11-25T22:02:30.52Z")); +assertFalse(Date.parse("2010-11-25T22:02:30.5Z") === Date.parse("2010-11-25T22:02:30.005Z")); + +// Check that we truncate millisecond values having more than 3 digits. +assertEquals(Date.parse("2010-11-25T22:02:30.1005Z"), Date.parse("2010-11-25T22:02:30.100Z")); + +// Check that we accept lots of digits. +assertEquals(Date.parse("2010-11-25T22:02:30.999Z"), Date.parse("2010-11-25T22:02:30.99999999999999999999999999999999999999999999999999999999999999999999999999999999999999Z")); + +// Fail if there's a decimal point but zero digits for (expected) milliseconds. +assertTrue(isNaN(Date.parse("2010-11-25T22:02:30.Z"))); -- 2.7.4