Implement Date.parse

LaszloLango · LaszloLango · commit cadc8f40d4ea · 2015-07-07T08:25:29.000+02:00
JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp
@@ -15,8 +15,11 @@
  */
 
 #include "ecma-alloc.h"
+#include "ecma-builtin-helpers.h"
+#include "ecma-conversion.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
+#include "ecma-try-catch-macro.h"
 
 #ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN
 
@@ -37,20 +40,253 @@
  * @{
  */
 
+/**
+ * Helper function to try to parse a part of a date string
+ *
+ * @return NaN if cannot read from string, ToNumber() otherwise
+ */
+static ecma_number_t
+ecma_date_parse_date_chars (lit_utf8_iterator_t *iter, /**< iterator of the utf8 string */
+                            uint32_t num_of_chars) /**< number of characters to read and convert */
+{
+  JERRY_ASSERT (num_of_chars > 0);
+
+  lit_utf8_size_t copy_size = 0;
+  const lit_utf8_byte_t *str_start_p = iter->buf_p + iter->buf_pos.offset;
+
+  while (num_of_chars--)
+  {
+    if (lit_utf8_iterator_is_eos (iter)
+        || !lit_char_is_unicode_digit (lit_utf8_iterator_peek_next (iter)))
+    {
+      return ecma_number_make_nan ();
+    }
+
+    copy_size += lit_get_unicode_char_size_by_utf8_first_byte (*(iter->buf_p + iter->buf_pos.offset));
+    lit_utf8_iterator_incr (iter);
+  }
+
+  return ecma_utf8_string_to_number (str_start_p, copy_size);
+} /* ecma_date_parse_date_chars */
+
 /**
  * The Date object's 'parse' routine
  *
  * See also:
  *          ECMA-262 v5, 15.9.4.2
+ *          ECMA-262 v5, 15.9.1.15
  *
  * @return completion value
  *         Returned value must be freed with ecma_free_completion_value.
  */
 static ecma_completion_value_t
-ecma_builtin_date_parse (ecma_value_t this_arg, /**< this argument */
+ecma_builtin_date_parse (ecma_value_t this_arg __attr_unused___, /**< this argument */
                          ecma_value_t arg) /**< string */
 {
-  ECMA_BUILTIN_CP_UNIMPLEMENTED (this_arg, arg);
+  ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
+  ecma_number_t *date_num_p = ecma_alloc_number ();
+  *date_num_p = ecma_number_make_nan ();
+
+  /* Date Time String fromat (ECMA-262 v5, 15.9.1.15) */
+  ECMA_TRY_CATCH (date_str_value,
+                  ecma_op_to_string (arg),
+                  ret_value);
+
+  ecma_string_t *date_str_p = ecma_get_string_from_value (date_str_value);
+
+  lit_utf8_size_t date_str_size = ecma_string_get_size (date_str_p);
+  MEM_DEFINE_LOCAL_ARRAY (date_start_p, date_str_size, lit_utf8_byte_t);
+
+  ecma_string_to_utf8_string (date_str_p, date_start_p, (ssize_t) date_str_size);
+  lit_utf8_iterator_t iter = lit_utf8_iterator_create (date_start_p, date_str_size);
+
+  /* 1. read year */
+  ecma_number_t year = ecma_date_parse_date_chars (&iter, 4);
+
+  if (!ecma_number_is_nan (year)
+      && year >= 0)
+  {
+    ecma_number_t month = ECMA_NUMBER_ONE;
+    ecma_number_t day = ECMA_NUMBER_ONE;
+    ecma_number_t time = ECMA_NUMBER_ZERO;
+
+    /* 2. read month if any */
+    if (!lit_utf8_iterator_is_eos (&iter)
+        && lit_utf8_iterator_peek_next (&iter) == '-')
+    {
+      /* eat up '-' */
+      lit_utf8_iterator_incr (&iter);
+      month = ecma_date_parse_date_chars (&iter, 2);
+
+      if (month > 12 || month < 1)
+      {
+        month = ecma_number_make_nan ();
+      }
+    }
+
+    /* 3. read day if any */
+    if (!lit_utf8_iterator_is_eos (&iter)
+        && lit_utf8_iterator_peek_next (&iter) == '-')
+    {
+      /* eat up '-' */
+      lit_utf8_iterator_incr (&iter);
+      day = ecma_date_parse_date_chars (&iter, 2);
+
+      if (day < 1 || day > 31)
+      {
+        day = ecma_number_make_nan ();
+      }
+    }
+
+    /* 4. read time if any */
+    if (!lit_utf8_iterator_is_eos (&iter)
+        && lit_utf8_iterator_peek_next (&iter) == 'T')
+    {
+      ecma_number_t hours = ECMA_NUMBER_ZERO;
+      ecma_number_t minutes = ECMA_NUMBER_ZERO;
+      ecma_number_t seconds = ECMA_NUMBER_ZERO;
+      ecma_number_t milliseconds = ECMA_NUMBER_ZERO;
+
+      ecma_length_t num_of_visited_chars = lit_utf8_iterator_get_index (&iter);
+      ecma_length_t date_str_len = lit_utf8_string_length (iter.buf_p, iter.buf_size) - 1;
+
+      if ((date_str_len - num_of_visited_chars) >= 5)
+      {
+        /* eat up 'T' */
+        lit_utf8_iterator_incr (&iter);
+
+        /* 4.1 read hours and minutes */
+        hours = ecma_date_parse_date_chars (&iter, 2);
+
+        if (hours < 0 || hours > 24)
+        {
+          hours = ecma_number_make_nan ();
+        }
+        else if (hours == 24)
+        {
+          hours = ECMA_NUMBER_ZERO;
+        }
+
+        /* eat up ':' */
+        lit_utf8_iterator_incr (&iter);
+
+        minutes = ecma_date_parse_date_chars (&iter, 2);
+
+        if (minutes < 0 || minutes > 59)
+        {
+          minutes = ecma_number_make_nan ();
+        }
+
+        /* 4.2 read seconds if any */
+        if (!lit_utf8_iterator_is_eos (&iter) && lit_utf8_iterator_peek_next (&iter) == ':')
+        {
+          /* eat up ':' */
+          lit_utf8_iterator_incr (&iter);
+          seconds = ecma_date_parse_date_chars (&iter, 2);
+
+          if (seconds < 0 || seconds > 59)
+          {
+            seconds = ecma_number_make_nan ();
+          }
+
+          /* 4.3 read milliseconds if any */
+          if (!lit_utf8_iterator_is_eos (&iter) && lit_utf8_iterator_peek_next (&iter) == '.')
+          {
+            /* eat up '.' */
+            lit_utf8_iterator_incr (&iter);
+            milliseconds = ecma_date_parse_date_chars (&iter, 3);
+
+            if (milliseconds < 0)
+            {
+              milliseconds = ecma_number_make_nan ();
+            }
+          }
+        }
+
+        time = ecma_date_make_time (hours, minutes, seconds, milliseconds);
+      }
+      else
+      {
+        time = ecma_number_make_nan ();
+      }
+
+      /* 4.4 read timezone if any */
+      if (!lit_utf8_iterator_is_eos (&iter)
+          && lit_utf8_iterator_peek_next (&iter) == 'Z'
+          && !ecma_number_is_nan (time))
+      {
+        lit_utf8_iterator_incr (&iter);
+        time = ecma_date_utc (ecma_date_make_time (hours,
+                                                   minutes,
+                                                   seconds,
+                                                   milliseconds));
+      }
+      else if (!lit_utf8_iterator_is_eos (&iter)
+               && (lit_utf8_iterator_peek_next (&iter) == '+'
+                   || lit_utf8_iterator_peek_next (&iter) == '-'))
+      {
+        ecma_length_t num_of_visited_chars = lit_utf8_iterator_get_index (&iter);
+        ecma_length_t date_str_len = lit_utf8_string_length (iter.buf_p, iter.buf_size) - 1;
+
+        if ((date_str_len - num_of_visited_chars) == 5)
+        {
+          bool is_negative = false;
+
+          if (lit_utf8_iterator_peek_next (&iter) == '-')
+          {
+            is_negative = true;
+          }
+
+          /* eat up '+/-' */
+          lit_utf8_iterator_incr (&iter);
+
+          /* read hours and minutes */
+          hours = ecma_date_parse_date_chars (&iter, 2);
+
+          if (hours < 0 || hours > 24)
+          {
+            hours = ecma_number_make_nan ();
+          }
+          else if (hours == 24)
+          {
+            hours = ECMA_NUMBER_ZERO;
+          }
+
+          /* eat up ':' */
+          lit_utf8_iterator_incr (&iter);
+
+          minutes = ecma_date_parse_date_chars (&iter, 2);
+
+          if (minutes < 0 || minutes > 59)
+          {
+            minutes = ecma_number_make_nan ();
+          }
+
+          if (is_negative)
+          {
+            time += ecma_date_make_time (hours, minutes, ECMA_NUMBER_ZERO, ECMA_NUMBER_ZERO);
+          }
+          else
+          {
+            time -= ecma_date_make_time (hours, minutes, ECMA_NUMBER_ZERO, ECMA_NUMBER_ZERO);
+          }
+        }
+      }
+    }
+
+    if (lit_utf8_iterator_is_eos (&iter))
+    {
+      ecma_number_t date = ecma_date_make_day (year, month - 1, day);
+      *date_num_p = ecma_date_make_date (date, time);
+    }
+  }
+
+  ret_value = ecma_make_normal_completion_value (ecma_make_number_value (date_num_p));
+
+  MEM_FINALIZE_LOCAL_ARRAY (date_start_p);
+  ECMA_FINALIZE (date_str_value);
+
+  return ret_value;
 } /* ecma_builtin_date_parse */
 
 /**
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp
@@ -215,7 +215,7 @@ ecma_date_in_leap_year (ecma_number_t time) /**< time value */
     return time; /* time is NaN */
   }
 
-  return ecma_date_days_in_year (ecma_date_time_from_year (time)) - 365;
+  return ecma_date_days_in_year (ecma_date_year_from_time (time)) - 365;
 } /* ecma_date_in_leap_year */
 
 /**
diff --git a/tests/jerry/date-parse.js b/tests/jerry/date-parse.js
@@ -0,0 +1,99 @@
+// Copyright 2015 Samsung Electronics Co., Ltd.
+// Copyright 2015 University of Szeged.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var wrongFormats = ["",
+                    "2",
+                    "20",
+                    "201",
+                    "2015-",
+                    "2015-01-",
+                    "2015-01-01-",
+                    "qwerty",
+                    "2015-01-01T",
+                    "2015-01-01T1:1",
+                    "2015-01-01T01",
+                    "2015-01-01T01",
+                    "2015-01-01T01:01F",
+                    "T2015",
+                    "2015-01-01Z",
+                    "2015-01-01+01:00",
+                    "2015-01-01T00:00+01",
+                    "2015-01-01T00:00+1",
+                    "2015-01-01T00:00-01",
+                    "2015-01-01T00:00.000",
+                    "2015-01-01T00:00:",
+                    "2015-01-01T00:",
+                    "2015-01-01T00:00:00.1",
+                    "2015-01-01T00:00:00.01",
+                    "2015-01-01T00:00+01:00Z",
+                    "2015/01/01",
+                    "2015-01-32",
+                    "2015--1",
+                    "2015-13",
+                    "2015-01--1",
+                    "-215",
+                    "-215-01-01",
+                    "2015-01-00",
+                    "2015-01-01T25:00",
+                    "2015-01-01T00:60",
+                    "2015-01-01T-1:00",
+                    "2015-01-01T00:-1",
+                    "2e+3"];
+
+for (i in wrongFormats) {
+  var d = Date.parse(wrongFormats[i]);
+  assert (isNaN(d));
+}
+
+var d;
+
+d = Date.parse(undefined);
+assert (isNaN(d));
+
+d = Date.parse({});
+assert (isNaN(d));
+
+d = Date.parse(2000 + 15);
+assert (d == 1420070400000);
+
+d = Date.parse("2015");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01-01");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01T00:00");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01T00:00:00");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01T00:00:00.000");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01T24:00:00.000");
+assert (d == 1420070400000);
+
+d = Date.parse("2015-01T00:00:00.000+03:00");
+assert (d == 1420059600000);
+
+d = Date.parse("2015-01T00:00:00.000-03:00");
+assert (d == 1420081200000);
+
+d = Date.parse("2015-07-03T14:35:43.123+01:30");
+assert (d == 1435928743123);

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ ecma_date_in_leap_year (ecma_number_t time) /*< time value /`
`215`	`215`	`return time; /* time is NaN */`
`216`	`216`	`}`
`217`	`217`
`218`		`- return ecma_date_days_in_year (ecma_date_time_from_year (time)) - 365;`
	`218`	`+ return ecma_date_days_in_year (ecma_date_year_from_time (time)) - 365;`
`219`	`219`	`} /* ecma_date_in_leap_year */`
`220`	`220`
`221`	`221`	`/**`