Implement Date.prototype.toISOString()

JerryScript-DCO-1.0-Signed-off-by: Roland Takacs rtakacs.u-szeged@partner.samsung.com

Author: Roland Takacs

jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.cpp

@@ -92,16 +92,16 @@ ecma_date_insert_num_with_sep (ecma_string_t **str_p, /**< input/output string *
 } /* ecma_date_insert_num_with_sep */
 
 /**
- * The Date.prototype object's 'toString' routine
+ * The Date.prototype object's 'toISOString' routine
  *
  * See also:
- *          ECMA-262 v5, 15.9.5.2
+ *          ECMA-262 v5, 15.9.5.43
  *
  * @return completion value
  *         Returned value must be freed with ecma_free_completion_value.
  */
 static ecma_completion_value_t
-ecma_builtin_date_prototype_to_string (ecma_value_t this_arg) /**< this argument */
+ecma_builtin_date_prototype_to_iso_string (ecma_value_t this_arg) /**< this argument */
 {
   ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
 
@@ -130,7 +130,12 @@ ecma_builtin_date_prototype_to_string (ecma_value_t this_arg) /**< this argument
     else
     {
       ecma_number_t milliseconds = ecma_date_ms_from_time (*prim_value_num_p);
-      ecma_string_t *output_str_p = ecma_new_ecma_string_from_number (milliseconds);
+      ecma_string_t *msec_str_p = ecma_new_ecma_string_from_number (milliseconds);
+      ecma_string_t *time_zone_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_TIME_ZONE_U);
+
+      ecma_string_t *output_str_p = ecma_concat_ecma_strings (msec_str_p, time_zone_str_p);
+      ecma_deref_ecma_string (msec_str_p);
+      ecma_deref_ecma_string (time_zone_str_p);
       ecma_date_insert_leading_zeros (&output_str_p, milliseconds, 3);
 
       ecma_number_t seconds = ecma_date_sec_from_time (*prim_value_num_p);
@@ -163,6 +168,21 @@ ecma_builtin_date_prototype_to_string (ecma_value_t this_arg) /**< this argument
   }
 
   return ret_value;
+} /* ecma_builtin_date_prototype_to_iso_string */
+
+/**
+ * The Date.prototype object's 'toString' routine
+ *
+ * See also:
+ *          ECMA-262 v5, 15.9.5.2
+ *
+ * @return completion value
+ *         Returned value must be freed with ecma_free_completion_value.
+ */
+static ecma_completion_value_t
+ecma_builtin_date_prototype_to_string (ecma_value_t this_arg) /**< this argument */
+{
+  return ecma_builtin_date_prototype_to_iso_string (this_arg);
 } /* ecma_builtin_date_prototype_to_string */
 
 /**
@@ -1195,21 +1215,6 @@ ecma_builtin_date_prototype_to_utc_string (ecma_value_t this_arg) /**< this argu
   ECMA_BUILTIN_CP_UNIMPLEMENTED (this_arg);
 } /* ecma_builtin_date_prototype_to_utc_string */
 
-/**
- * The Date.prototype object's 'toISOString' routine
- *
- * See also:
- *          ECMA-262 v5, 15.9.5.43
- *
- * @return completion value
- *         Returned value must be freed with ecma_free_completion_value.
- */
-static ecma_completion_value_t
-ecma_builtin_date_prototype_to_iso_string (ecma_value_t this_arg) /**< this argument */
-{
-  ECMA_BUILTIN_CP_UNIMPLEMENTED (this_arg);
-} /* ecma_builtin_date_prototype_to_iso_string */
-
 /**
  * The Date.prototype object's 'toJSON' routine
  *

jerry-core/lit/lit-magic-strings.inc.h

@@ -219,6 +219,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_G_CHAR, "g")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_I_CHAR, "i")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_M_CHAR, "m")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TIME_SEP_U, "T")
+LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TIME_ZONE_U, "Z")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SLASH_CHAR, "/")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BACKSLASH_CHAR, "\\")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EMPTY_NON_CAPTURE_GROUP, "(?:)")

tests/jerry/date-tostring.js

@@ -14,8 +14,8 @@
 // limitations under the License.
 
 assert (new Date (NaN) == "Invalid Date");
-assert (new Date ("2015-02-13") == "2015-02-13T00:00:00.000");
-assert (new Date ("2015-07-08T11:29:05.023") == "2015-07-08T11:29:05.023");
+assert (new Date ("2015-02-13") == "2015-02-13T00:00:00.000Z");
+assert (new Date ("2015-07-08T11:29:05.023") == "2015-07-08T11:29:05.023Z");
 
 try
 {
@@ -32,6 +32,10 @@ assert (new Date (NaN).toDateString () == "Invalid Date");
 assert (new Date ("2015-02-13").toDateString () == "2015-02-13");
 assert (new Date ("2015-07-08T11:29:05.023").toDateString () == "2015-07-08");
 
+assert (new Date (NaN).toISOString () == "Invalid Date");
+assert (new Date ("2015-07-16").toISOString () == "2015-07-16T00:00:00.000Z");
+assert (new Date ("2015-07-16T11:29:05.023").toISOString () == "2015-07-16T11:29:05.023Z");
+
 try
 {
   Date.prototype.toDateString.call(-1);