|
17 | 17 | #include "ecma-alloc.h"
|
18 | 18 | #include "ecma-builtin-helpers.h"
|
19 | 19 | #include "ecma-conversion.h"
|
| 20 | +#include "ecma-gc.h" |
20 | 21 | #include "ecma-globals.h"
|
21 | 22 | #include "ecma-helpers.h"
|
22 | 23 | #include "ecma-try-catch-macro.h"
|
@@ -423,7 +424,7 @@ ecma_builtin_date_utc (ecma_value_t this_arg __attr_unused___, /**< this argumen
|
423 | 424 |
|
424 | 425 | ECMA_TRY_CATCH (time_value, ecma_date_construct_helper (args, args_number), ret_value);
|
425 | 426 |
|
426 |
| - ecma_number_t *time_p = ecma_get_number_from_completion_value (time_value); |
| 427 | + ecma_number_t *time_p = ecma_get_number_from_value (time_value); |
427 | 428 | ecma_number_t *time_clip_p = ecma_alloc_number ();
|
428 | 429 | *time_clip_p = ecma_date_time_clip (*time_p);
|
429 | 430 | ret_value = ecma_make_normal_completion_value (ecma_make_number_value (time_clip_p));
|
@@ -458,25 +459,119 @@ ecma_builtin_date_now (ecma_value_t this_arg __attr_unused___) /**< this argumen
|
458 | 459 | /**
|
459 | 460 | * Handle calling [[Call]] of built-in Date object
|
460 | 461 | *
|
| 462 | + * See also: |
| 463 | + * ECMA-262 v5, 15.9.2.1 |
| 464 | + * |
461 | 465 | * @return completion-value
|
462 | 466 | */
|
463 | 467 | ecma_completion_value_t
|
464 | 468 | ecma_builtin_date_dispatch_call (const ecma_value_t *arguments_list_p, /**< arguments list */
|
465 | 469 | ecma_length_t arguments_list_len) /**< number of arguments */
|
466 | 470 | {
|
467 |
| - ECMA_BUILTIN_CP_UNIMPLEMENTED (arguments_list_p, arguments_list_len); |
| 471 | + /* FIXME: |
| 472 | + * Fix this, after Date.prototype.toString is finished. |
| 473 | + */ |
| 474 | + return ecma_builtin_date_dispatch_construct (arguments_list_p, arguments_list_len); |
468 | 475 | } /* ecma_builtin_date_dispatch_call */
|
469 | 476 |
|
470 | 477 | /**
|
471 | 478 | * Handle calling [[Construct]] of built-in Date object
|
472 | 479 | *
|
| 480 | + * See also: |
| 481 | + * ECMA-262 v5, 15.9.3.1 |
| 482 | + * |
473 | 483 | * @return completion-value
|
474 | 484 | */
|
475 | 485 | ecma_completion_value_t
|
476 | 486 | ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**< arguments list */
|
477 | 487 | ecma_length_t arguments_list_len) /**< number of arguments */
|
478 | 488 | {
|
479 |
| - ECMA_BUILTIN_CP_UNIMPLEMENTED (arguments_list_p, arguments_list_len); |
| 489 | + ecma_completion_value_t ret_value = ecma_make_empty_completion_value (); |
| 490 | + ecma_number_t *prim_value_num_p = NULL; |
| 491 | + |
| 492 | + ecma_object_t *prototype_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_DATE_PROTOTYPE); |
| 493 | + ecma_object_t *obj_p = ecma_create_object (prototype_obj_p, |
| 494 | + true, |
| 495 | + ECMA_OBJECT_TYPE_GENERAL); |
| 496 | + ecma_deref_object (prototype_obj_p); |
| 497 | + |
| 498 | + if (arguments_list_len == 0) |
| 499 | + { |
| 500 | + ECMA_TRY_CATCH (parse_res_value, |
| 501 | + ecma_builtin_date_now (ecma_make_object_value (obj_p)), |
| 502 | + ret_value); |
| 503 | + |
| 504 | + prim_value_num_p = ecma_alloc_number (); |
| 505 | + *prim_value_num_p = *ecma_get_number_from_value (parse_res_value); |
| 506 | + |
| 507 | + ECMA_FINALIZE (parse_res_value) |
| 508 | + } |
| 509 | + else if (arguments_list_len == 1) |
| 510 | + { |
| 511 | + ECMA_TRY_CATCH (prim_comp_value, |
| 512 | + ecma_op_to_primitive (arguments_list_p[0], ECMA_PREFERRED_TYPE_NUMBER), |
| 513 | + ret_value); |
| 514 | + |
| 515 | + if (ecma_is_value_string (prim_comp_value)) |
| 516 | + { |
| 517 | + ECMA_TRY_CATCH (parse_res_value, |
| 518 | + ecma_builtin_date_parse (ecma_make_object_value (obj_p), prim_comp_value), |
| 519 | + ret_value); |
| 520 | + |
| 521 | + prim_value_num_p = ecma_alloc_number (); |
| 522 | + *prim_value_num_p = *ecma_get_number_from_value (parse_res_value); |
| 523 | + |
| 524 | + ECMA_FINALIZE (parse_res_value); |
| 525 | + } |
| 526 | + else |
| 527 | + { |
| 528 | + ECMA_TRY_CATCH (prim_value, ecma_op_to_number (arguments_list_p[0]), ret_value); |
| 529 | + |
| 530 | + prim_value_num_p = ecma_alloc_number (); |
| 531 | + *prim_value_num_p = *ecma_get_number_from_value (prim_value); |
| 532 | + |
| 533 | + ECMA_FINALIZE (prim_value); |
| 534 | + } |
| 535 | + |
| 536 | + ECMA_FINALIZE (prim_comp_value); |
| 537 | + } |
| 538 | + else if (arguments_list_len >= 2) |
| 539 | + { |
| 540 | + ECMA_TRY_CATCH (time_value, |
| 541 | + ecma_date_construct_helper (arguments_list_p, arguments_list_len), |
| 542 | + ret_value); |
| 543 | + |
| 544 | + ecma_number_t *time_p = ecma_get_number_from_value (time_value); |
| 545 | + prim_value_num_p = ecma_alloc_number (); |
| 546 | + *prim_value_num_p = ecma_date_time_clip (ecma_date_utc (*time_p)); |
| 547 | + |
| 548 | + ECMA_FINALIZE (time_value); |
| 549 | + } |
| 550 | + else |
| 551 | + { |
| 552 | + prim_value_num_p = ecma_alloc_number (); |
| 553 | + *prim_value_num_p = ecma_number_make_nan (); |
| 554 | + } |
| 555 | + |
| 556 | + if (ecma_is_completion_value_empty (ret_value)) |
| 557 | + { |
| 558 | + ecma_property_t *class_prop_p = ecma_create_internal_property (obj_p, |
| 559 | + ECMA_INTERNAL_PROPERTY_CLASS); |
| 560 | + class_prop_p->u.internal_property.value = LIT_MAGIC_STRING_DATE_UL; |
| 561 | + |
| 562 | + ecma_property_t *prim_value_prop_p = ecma_create_internal_property (obj_p, |
| 563 | + ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE); |
| 564 | + ECMA_SET_POINTER (prim_value_prop_p->u.internal_property.value, prim_value_num_p); |
| 565 | + |
| 566 | + ret_value = ecma_make_normal_completion_value (ecma_make_object_value (obj_p)); |
| 567 | + } |
| 568 | + else |
| 569 | + { |
| 570 | + JERRY_ASSERT (ecma_is_completion_value_throw (ret_value)); |
| 571 | + ecma_deref_object (obj_p); |
| 572 | + } |
| 573 | + |
| 574 | + return ret_value; |
480 | 575 | } /* ecma_builtin_date_dispatch_construct */
|
481 | 576 |
|
482 | 577 | /**
|
|
0 commit comments