Add ecma_new_ecma_string version that takes buffer with specified number of characters, instead of zero-terminated string.

JerryScript-DCO-1.0-Signed-off-by: Szilard Ledan [email protected]
JerryScript-DCO-1.0-Signed-off-by: László Langó [email protected]

Author: LaszloLango

jerry-core/ecma/base/ecma-helpers-string.cpp

@@ -455,6 +455,54 @@ ecma_init_ecma_string_from_magic_string_ex_id (ecma_string_t *string_p, /**< des
   string_p->u.magic_string_ex_id = magic_string_ex_id;
 } /* ecma_init_ecma_string_from_magic_string_ex_id */
 
+/**
+ * Allocate new ecma-string and fill it with specified number of characters from specified buffer
+ *
+ * @return pointer to ecma-string descriptor
+ */
+ecma_string_t*
+ecma_new_ecma_string (const ecma_char_t *string_p, /**< input string */
+                      const ecma_length_t length) /**< number of characters */
+{
+  JERRY_ASSERT (string_p != NULL);
+  JERRY_ASSERT (length > 0 && length <= ecma_zt_string_length (string_p));
+
+  if (length != ecma_zt_string_length (string_p))
+  {
+    /* FIXME: update this when 'ecma_is_charset_magic' interface is added */
+    ecma_char_t *zt_str_p = (ecma_char_t *) mem_heap_alloc_block ((size_t) (length + 1), MEM_HEAP_ALLOC_SHORT_TERM);
+    memcpy (zt_str_p, string_p, length * sizeof (ecma_char_t));
+    zt_str_p[length] = 0;
+
+    ecma_magic_string_id_t magic_string_id;
+    if (ecma_is_zt_string_magic (zt_str_p, &magic_string_id))
+    {
+      mem_heap_free_block (zt_str_p);
+      return ecma_get_magic_string (magic_string_id);
+    }
+
+    ecma_magic_string_ex_id_t magic_string_ex_id;
+    if (ecma_is_zt_ex_string_magic (zt_str_p, &magic_string_ex_id))
+    {
+      mem_heap_free_block (zt_str_p);
+      return ecma_get_magic_string_ex (magic_string_ex_id);
+    }
+    mem_heap_free_block (zt_str_p);
+  }
+
+  ecma_string_t *string_desc_p = ecma_alloc_string ();
+  string_desc_p->refs = 1;
+  string_desc_p->is_stack_var = false;
+  string_desc_p->container = ECMA_STRING_CONTAINER_HEAP_CHUNKS;
+  string_desc_p->hash = ecma_chars_buffer_calc_hash_last_chars (string_p, length);
+  string_desc_p->u.common_field = 0;
+
+  ecma_collection_header_t *collection_p = ecma_new_chars_collection (string_p, length);
+  ECMA_SET_NON_NULL_POINTER (string_desc_p->u.collection_cp, collection_p);
+
+  return string_desc_p;
+} /* ecma_new_ecma_string */
+
 /**
  * Allocate new ecma-string and fill it with characters from specified buffer
  *
@@ -485,19 +533,7 @@ ecma_new_ecma_string (const ecma_char_t *string_p) /**< zero-terminated string *
     length++;
   }
 
-  JERRY_ASSERT (length > 0);
-
-  ecma_string_t* string_desc_p = ecma_alloc_string ();
-  string_desc_p->refs = 1;
-  string_desc_p->is_stack_var = false;
-  string_desc_p->container = ECMA_STRING_CONTAINER_HEAP_CHUNKS;
-  string_desc_p->hash = ecma_chars_buffer_calc_hash_last_chars (string_p, length);
-
-  string_desc_p->u.common_field = 0;
-  ecma_collection_header_t *collection_p = ecma_new_chars_collection (string_p, length);
-  ECMA_SET_NON_NULL_POINTER (string_desc_p->u.collection_cp, collection_p);
-
-  return string_desc_p;
+  return ecma_new_ecma_string (string_p, length);
 } /* ecma_new_ecma_string */
 
 /**

jerry-core/ecma/base/ecma-helpers.h

@@ -110,6 +110,7 @@ extern bool ecma_is_completion_value_normal_false (ecma_completion_value_t value
 extern bool ecma_is_completion_value_empty (ecma_completion_value_t value);
 
 /* ecma-helpers-string.cpp */
+extern ecma_string_t* ecma_new_ecma_string (const ecma_char_t *string_p, const ecma_length_t length);
 extern ecma_string_t* ecma_new_ecma_string (const ecma_char_t *string_p);
 extern ecma_string_t* ecma_new_ecma_string_from_uint32 (uint32_t uint_number);
 extern ecma_string_t* ecma_new_ecma_string_from_number (ecma_number_t number);