Skip to content

Commit cd462fb

Browse files
committed
Fix magic string names
JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
1 parent c9f40f5 commit cd462fb

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

jerry-core/ecma/base/ecma-magic-strings.inc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_FUNCTION, "function")
3434
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LENGTH, "length")
3535
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_SOURCE, "source")
3636
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_GLOBAL, "global")
37-
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_IGNORECASE, "ignoreCase")
37+
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_IGNORECASE_UL, "ignoreCase")
3838
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_MULTILINE, "multiline")
3939
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INDEX, "index")
4040
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INPUT, "input")
41-
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LASTINDEX, "lastIndex")
41+
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_LASTINDEX_UL, "lastIndex")
4242
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_NAN, "NaN")
4343
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_INFINITY_UL, "Infinity")
4444
ECMA_MAGIC_STRING_DEF (ECMA_MAGIC_STRING_UNDEFINED_UL, "Undefined")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ ecma_builtin_regexp_prototype_to_string (ecma_value_t this_arg) /**< this argume
168168
}
169169

170170
/* Check the ignoreCase flag */
171-
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE);
171+
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE_UL);
172172
ecma_property_t* ignorecase_prop = ecma_op_object_get_property (obj_p, magic_string_p);
173173
ecma_deref_ecma_string (magic_string_p);
174174

jerry-core/ecma/builtin-objects/ecma-builtin-regexp.inc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SIMPLE_VALUE (ECMA_MAGIC_STRING_GLOBAL,
6363
ECMA_PROPERTY_NOT_CONFIGURABLE)
6464

6565
// ECMA-262 v5, 15.10.7.3
66-
SIMPLE_VALUE (ECMA_MAGIC_STRING_IGNORECASE,
66+
SIMPLE_VALUE (ECMA_MAGIC_STRING_IGNORECASE_UL,
6767
ECMA_SIMPLE_VALUE_FALSE,
6868
ECMA_PROPERTY_NOT_WRITABLE,
6969
ECMA_PROPERTY_NOT_ENUMERABLE,
@@ -76,7 +76,7 @@ SIMPLE_VALUE (ECMA_MAGIC_STRING_MULTILINE,
7676
ECMA_PROPERTY_NOT_CONFIGURABLE)
7777

7878
// ECMA-262 v5, 15.10.7.5
79-
NUMBER_VALUE (ECMA_MAGIC_STRING_LASTINDEX,
79+
NUMBER_VALUE (ECMA_MAGIC_STRING_LASTINDEX_UL,
8080
0,
8181
ECMA_PROPERTY_NOT_WRITABLE,
8282
ECMA_PROPERTY_NOT_ENUMERABLE,

jerry-core/ecma/operations/ecma-regexp-object.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ ecma_op_create_regexp_object (ecma_string_t *pattern_p, /**< input pattern */
165165
ecma_set_named_data_property_value (global_prop_p, ecma_make_simple_value (prop_value));
166166

167167
/* Set ignoreCase property. ECMA-262 v5, 15.10.7.3*/
168-
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE);
168+
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_IGNORECASE_UL);
169169
ecma_property_t *ignorecase_prop_p = ecma_create_named_data_property (obj_p,
170170
magic_string_p,
171171
false, false, false);
@@ -184,7 +184,7 @@ ecma_op_create_regexp_object (ecma_string_t *pattern_p, /**< input pattern */
184184
ecma_set_named_data_property_value (multiline_prop_p, ecma_make_simple_value (prop_value));
185185

186186
/* Set lastIndex property. ECMA-262 v5, 15.10.7.5*/
187-
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
187+
magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
188188
ecma_property_t *lastindex_prop_p = ecma_create_named_data_property (obj_p,
189189
magic_string_p,
190190
true, false, false);
@@ -1131,7 +1131,7 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
11311131

11321132
if (re_ctx.flags & RE_FLAG_GLOBAL)
11331133
{
1134-
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
1134+
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
11351135
ecma_property_t *lastindex_prop_p = ecma_op_object_get_property (obj_p, magic_str_p);
11361136
ecma_number_t *lastindex_num_p = ecma_get_number_from_value (lastindex_prop_p->u.named_data_property.value);
11371137
index = ecma_number_to_int32 (*lastindex_num_p);
@@ -1146,7 +1146,7 @@ ecma_regexp_exec_helper (ecma_object_t *obj_p, /**< RegExp object */
11461146
{
11471147
if (index < 0 || index > input_length)
11481148
{
1149-
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
1149+
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
11501150
ecma_number_t *lastindex_num_p = ecma_alloc_number ();
11511151
*lastindex_num_p = ECMA_NUMBER_ZERO;
11521152
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 */
11731173

11741174
if (re_ctx.flags & RE_FLAG_GLOBAL)
11751175
{
1176-
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX);
1176+
ecma_string_t *magic_str_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LASTINDEX_UL);
11771177
ecma_number_t *lastindex_num_p = ecma_alloc_number ();
11781178
*lastindex_num_p = ((ecma_number_t) (sub_str_p - re_ctx.input_start_p));
11791179
ecma_op_object_put (obj_p, magic_str_p, ecma_make_number_value (lastindex_num_p), true);

0 commit comments

Comments
 (0)