Fix magic string names

JerryScript-DCO-1.0-Signed-off-by: László Langó [email protected]
jerryscript-project · Jun 12, 2015 · cd462fb · cd462fb
1 parent c9f40f5
commit cd462fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/jerry-core/ecma/base/ecma-magic-strings.inc.h b/jerry-core/ecma/base/ecma-magic-strings.inc.h
@@ -34,11 +34,11 @@ ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_FUNCTION, "function")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LENGTH, "length")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_SOURCE, "source")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_GLOBAL, "global")
-ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_IGNORECASE, "ignoreCase")
+ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_IGNORECASE_UL, "ignoreCase")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_MULTILINE, "multiline")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INDEX, "index")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INPUT, "input")
-ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LASTINDEX, "lastIndex")
+ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LASTINDEX_UL, "lastIndex")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_NAN, "NaN")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INFINITY_UL, "Infinity")
 ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_UNDEFINED_UL, "Undefined")

diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp
@@ -168,7 +168,7 @@ ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argume
   }
 
   /* Check the ignoreCase flag */
-  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE);
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE_UL);
   ecma_property_t* ignorecase_prop = ecma_op_object_get_property (obj_p, magic_string_p);
   ecma_deref_ecma_string (magic_string_p);
 

diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h
@@ -63,7 +63,7 @@ SIMPLE_VALUE (ECMA_MAGIC_STRING_GLOBAL,
               ECMA_PROPERTY_NOT_CONFIGURABLE)
 
 // ECMA-262 v5, 15.10.7.3
-SIMPLE_VALUE (ECMA_MAGIC_STRING_IGNORECASE,
+SIMPLE_VALUE (ECMA_MAGIC_STRING_IGNORECASE_UL,
               ECMA_SIMPLE_VALUE_FALSE,
               ECMA_PROPERTY_NOT_WRITABLE,
               ECMA_PROPERTY_NOT_ENUMERABLE,
@@ -76,7 +76,7 @@ SIMPLE_VALUE (ECMA_MAGIC_STRING_MULTILINE,
               ECMA_PROPERTY_NOT_CONFIGURABLE)
 
 // ECMA-262 v5, 15.10.7.5
-NUMBER_VALUE (ECMA_MAGIC_STRING_LASTINDEX,
+NUMBER_VALUE (ECMA_MAGIC_STRING_LASTINDEX_UL,
               0,
               ECMA_PROPERTY_NOT_WRITABLE,
               ECMA_PROPERTY_NOT_ENUMERABLE,

diff --git a/jerry-core/ecma/operations/ecma-regexp-object.cpp b/jerry-core/ecma/operations/ecma-regexp-object.cpp
@@ -165,7 +165,7 @@ ecma_op_create_regexp_object (ecma_string_t *pattern_p, /**< input pattern */
   ecma_set_named_data_property_value (global_prop_p, ecma_make_simple_value (prop_value));
 
   /* Set ignoreCase property. ECMA-262 v5, 15.10.7.3*/
-  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE);
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE_UL);
   ecma_property_t *ignorecase_prop_p = ecma_create_named_data_property (obj_p,
                                                                         magic_string_p,
                                                                         false, false, false);
@@ -184,7 +184,7 @@ ecma_op_create_regexp_object (ecma_string_t *pattern_p, /**< input pattern */
   ecma_set_named_data_property_value (multiline_prop_p, ecma_make_simple_value (prop_value));
 
   /* Set lastIndex property. ECMA-262 v5, 15.10.7.5*/
-  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
+  magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
   ecma_property_t *lastindex_prop_p = ecma_create_named_data_property (obj_p,
                                                                        magic_string_p,
                                                                        true, false, false);
@@ -1131,7 +1131,7 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
 
   if (re_ctx.flags & RE_FLAG_GLOBAL)
   {
-    ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
+    ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
     ecma_property_t *lastindex_prop_p = ecma_op_object_get_property (obj_p, magic_str_p);
     ecma_number_t *lastindex_num_p = ecma_get_number_from_value (lastindex_prop_p->u.named_data_property.value);
     index = ecma_number_to_int32 (*lastindex_num_p);
@@ -1146,7 +1146,7 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
   {
     if (index < 0 || index > input_length)
     {
-      ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
+      ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
       ecma_number_t *lastindex_num_p = ecma_alloc_number ();
       *lastindex_num_p = ECMA_NUMBER_ZERO;
       ecma_op_object_put (obj_p, magic_str_p, ecma_make_number_value (lastindex_num_p), true);
@@ -1173,7 +1173,7 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
 
   if (re_ctx.flags & RE_FLAG_GLOBAL)
   {
-    ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
+    ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
     ecma_number_t *lastindex_num_p = ecma_alloc_number ();
     *lastindex_num_p = ((ecma_number_t) (sub_str_p - re_ctx.input_start_p));
     ecma_op_object_put (obj_p, magic_str_p, ecma_make_number_value (lastindex_num_p), true);