Rebase the function of unescape to cesu8

JerryScript-DCO-1.0-Signed-off-by: Szilard Ledan szledan.u-szeged@partner.samsung.com

Author: szledan

jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp

@@ -1390,7 +1390,8 @@ ecma_builtin_global_object_unescape (ecma_value_t this_arg __attr_unused___, /**
   ssize_t sz = ecma_string_to_utf8_string (input_string_p, input_start_p, (ssize_t) (input_size));
   JERRY_ASSERT (sz >= 0);
 
-  lit_utf8_iterator_t iterator = lit_utf8_iterator_create (input_start_p, input_size);
+  lit_utf8_byte_t *input_curr_p = input_start_p;
+  lit_utf8_byte_t *input_end_p = input_start_p + input_size;
   /* 4. */
   /* The length of input string is always greater than output string
    * so we re-use the input string buffer.
@@ -1409,30 +1410,29 @@ ecma_builtin_global_object_unescape (ecma_value_t this_arg __attr_unused___, /**
    * 8    found valid '%uwxyz' pattern
    */
   uint8_t status = 0;
-  lit_code_point_t high_surrogate = 0;
-  lit_code_point_t hex_digits = 0;
+  ecma_char_t hex_digits = 0;
   /* 5. */
-  while (!lit_utf8_iterator_is_eos (&iterator))
+  while (input_curr_p < input_end_p)
   {
     /* 6. */
-    lit_code_point_t code_point = lit_utf8_iterator_read_next (&iterator);
+    ecma_char_t chr = lit_utf8_read_next (&input_curr_p);
 
     /* 7-8. */
-    if (status == 0 && code_point == LIT_CHAR_PERCENT)
+    if (status == 0 && chr == LIT_CHAR_PERCENT)
     {
       /* Found '%' char, start of escape sequence. */
       status = 1;
     }
     /* 9-10. */
-    else if (status == 1 && code_point == LIT_CHAR_LOWERCASE_U)
+    else if (status == 1 && chr == LIT_CHAR_LOWERCASE_U)
     {
       /* Found 'u' char after '%'. */
       status = 4;
     }
-    else if (status > 0 && lit_char_is_hex_digit ((ecma_char_t) code_point))
+    else if (status > 0 && lit_char_is_hex_digit (chr))
     {
       /* Found hexadecimal digit in escape sequence. */
-      hex_digits = hex_digits * 16 + lit_char_hex_to_int ((ecma_char_t) code_point);
+      hex_digits = (ecma_char_t) (hex_digits * 16 + (ecma_char_t) lit_char_hex_to_int (chr));
       status++;
     }
 
@@ -1441,34 +1441,14 @@ ecma_builtin_global_object_unescape (ecma_value_t this_arg __attr_unused___, /**
     {
       output_char_p -= (status == 3) ? 2 : 5;
       status = 0;
-      code_point = (ecma_char_t) hex_digits;
+      chr = hex_digits;
       hex_digits = 0;
     }
 
-    /* Handle surrogate pairs. */
-    bool is_non_bmp_middle = iterator.buf_pos.is_non_bmp_middle;
-    if (!high_surrogate && lit_is_code_unit_high_surrogate ((ecma_char_t) code_point))
-    {
-      high_surrogate = code_point;
-
-      if (is_non_bmp_middle)
-      {
-        code_point = lit_utf8_iterator_read_next (&iterator);
-      }
-    }
-
-    if (high_surrogate && lit_is_code_unit_low_surrogate ((ecma_char_t) code_point))
-    {
-      output_char_p -= is_non_bmp_middle ? 0 : 3;
-      code_point = lit_convert_surrogate_pair_to_code_point ((ecma_char_t) high_surrogate,
-                                                             (ecma_char_t) code_point);
-      high_surrogate = 0;
-    }
-
     /* Copying character. */
-    lit_utf8_size_t lit_size = lit_code_point_to_utf8 (code_point, output_char_p);
+    lit_utf8_size_t lit_size = lit_code_unit_to_utf8 (chr, output_char_p);
     output_char_p += lit_size;
-    JERRY_ASSERT (output_char_p - input_start_p <= iterator.buf_pos.offset);
+    JERRY_ASSERT (output_char_p <= input_curr_p);
   }
 
   lit_utf8_size_t output_length = (lit_utf8_size_t) (output_char_p - input_start_p);