YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming rest camelCase-named identifiers according to underscore_named_value-naming.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-07-23 14:07:45 +04:00
parent 79f3d97434
commit 1796b9d903
22 changed files with 731 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaoperations/ecma-comparison.c
+12 -12
View File
@@ -39,16 +39,16 @@ ecma_abstract_equality_compare(ecma_value_t x, /**< first operand */
const bool is_x_undefined = ecma_is_value_undefined( x);
const bool is_x_null = ecma_is_value_null( x);
const bool is_x_boolean = ecma_is_value_boolean( x);
const bool is_x_number = ( x.ValueType == ECMA_TYPE_NUMBER );
const bool is_x_string = ( x.ValueType == ECMA_TYPE_STRING );
const bool is_x_object = ( x.ValueType == ECMA_TYPE_OBJECT );
const bool is_x_number = ( x.value_type == ECMA_TYPE_NUMBER );
const bool is_x_string = ( x.value_type == ECMA_TYPE_STRING );
const bool is_x_object = ( x.value_type == ECMA_TYPE_OBJECT );
const bool is_y_undefined = ecma_is_value_undefined( y);
const bool is_y_null = ecma_is_value_null( y);
const bool is_y_boolean = ecma_is_value_boolean( y);
const bool is_y_number = ( y.ValueType == ECMA_TYPE_NUMBER );
const bool is_y_string = ( y.ValueType == ECMA_TYPE_STRING );
const bool is_y_object = ( y.ValueType == ECMA_TYPE_OBJECT );
const bool is_y_number = ( y.value_type == ECMA_TYPE_NUMBER );
const bool is_y_string = ( y.value_type == ECMA_TYPE_STRING );
const bool is_y_object = ( y.value_type == ECMA_TYPE_OBJECT );
const bool is_types_equal = ( ( is_x_undefined && is_y_undefined )
|| ( is_x_null && is_y_null )
@@ -68,26 +68,26 @@ ecma_abstract_equality_compare(ecma_value_t x, /**< first operand */
return true;
} else if ( is_x_number )
{ // c.
ecma_number_t x_num = *(ecma_number_t*)( ecma_get_pointer(x.Value) );
ecma_number_t y_num = *(ecma_number_t*)( ecma_get_pointer(y.Value) );
ecma_number_t x_num = *(ecma_number_t*)( ecma_get_pointer(x.value) );
ecma_number_t y_num = *(ecma_number_t*)( ecma_get_pointer(y.value) );
TODO( Implement according to ECMA );
return (x_num == y_num);
} else if ( is_x_string )
{ // d.
ecma_array_first_chunk_t* x_str = (ecma_array_first_chunk_t*)( ecma_get_pointer(x.Value) );
ecma_array_first_chunk_t* y_str = (ecma_array_first_chunk_t*)( ecma_get_pointer(y.Value) );
ecma_array_first_chunk_t* x_str = (ecma_array_first_chunk_t*)( ecma_get_pointer(x.value) );
ecma_array_first_chunk_t* y_str = (ecma_array_first_chunk_t*)( ecma_get_pointer(y.value) );
return ecma_compare_ecma_string_to_ecma_string( x_str, y_str);
} else if ( is_x_boolean )
{ // e.
return ( x.Value == y.Value );
return ( x.value == y.value );
} else
{ // f.
JERRY_ASSERT( is_x_object );
return ( x.Value == y.Value );
return ( x.value == y.value );
}
} else if ( ( is_x_null && is_y_undefined )
|| ( is_x_undefined && is_y_null ) )
src/libecmaoperations/ecma-conversion.c
+4 -4
View File
@@ -40,11 +40,11 @@
ecma_completion_value_t
ecma_op_check_object_coercible( ecma_value_t value) /**< ecma-value */
{
switch ( (ecma_type_t)value.ValueType )
switch ( (ecma_type_t)value.value_type )
{
case ECMA_TYPE_SIMPLE:
{
switch ( (ecma_simple_value_t)value.Value )
switch ( (ecma_simple_value_t)value.value )
{
case ECMA_SIMPLE_VALUE_UNDEFINED:
case ECMA_SIMPLE_VALUE_NULL:
@@ -95,7 +95,7 @@ ecma_op_check_object_coercible( ecma_value_t value) /**< ecma-value */
ecma_completion_value_t
ecma_op_to_primitive( ecma_value_t value) /**< ecma-value */
{
switch ( (ecma_type_t)value.ValueType )
switch ( (ecma_type_t)value.value_type )
{
case ECMA_TYPE_SIMPLE:
case ECMA_TYPE_NUMBER:
@@ -130,7 +130,7 @@ ecma_op_to_primitive( ecma_value_t value) /**< ecma-value */
ecma_completion_value_t
ecma_op_to_number( ecma_value_t value) /**< ecma-value */
{
switch ( (ecma_type_t)value.ValueType )
switch ( (ecma_type_t)value.value_type )
{
case ECMA_TYPE_NUMBER:
{
src/libecmaoperations/ecma-get-put-value.c
+19 -19
View File
@@ -43,10 +43,10 @@ ecma_op_get_value( ecma_reference_t ref) /**< ECMA-reference */
const ecma_value_t base = ref.base;
const bool is_unresolvable_reference = ecma_is_value_undefined( base);
const bool has_primitive_base = ( ecma_is_value_boolean( base)
|| base.ValueType == ECMA_TYPE_NUMBER
|| base.ValueType == ECMA_TYPE_STRING );
const bool has_object_base = ( base.ValueType == ECMA_TYPE_OBJECT
&& !((ecma_object_t*)ecma_get_pointer(base.Value))->IsLexicalEnvironment );
|| base.value_type == ECMA_TYPE_NUMBER
|| base.value_type == ECMA_TYPE_STRING );
const bool has_object_base = ( base.value_type == ECMA_TYPE_OBJECT
&& !((ecma_object_t*)ecma_get_pointer(base.value))->is_lexical_environment );
const bool is_property_reference = has_primitive_base || has_object_base;
// GetValue_3
@@ -60,8 +60,8 @@ ecma_op_get_value( ecma_reference_t ref) /**< ECMA-reference */
{
if ( !has_primitive_base ) // GetValue_4.a
{
ecma_object_t *obj_p = ecma_get_pointer( base.Value);
JERRY_ASSERT( obj_p != NULL && !obj_p->IsLexicalEnvironment );
ecma_object_t *obj_p = ecma_get_pointer( base.value);
JERRY_ASSERT( obj_p != NULL && !obj_p->is_lexical_environment );
// GetValue_4.b case 1
/* return [[Get]]( base as this, ref.referenced_name_p) */
@@ -70,18 +70,18 @@ ecma_op_get_value( ecma_reference_t ref) /**< ECMA-reference */
{ // GetValue_4.b case 2
/*
ecma_object_t *obj_p = ecma_ToObject( base);
JERRY_ASSERT( obj_p != NULL && !obj_p->IsLexicalEnvironment );
JERRY_ASSERT( obj_p != NULL && !obj_p->is_lexical_environment );
ecma_property_t *property = obj_p->[[GetProperty]]( ref.referenced_name_p);
if ( property->Type == ECMA_PROPERTY_NAMEDDATA )
{
return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
ecma_copy_value( property->u.NamedDataProperty.Value),
ecma_copy_value( property->u.named_data_property.value),
ECMA_TARGET_ID_RESERVED);
} else
{
JERRY_ASSERT( property->Type == ECMA_PROPERTY_NAMEDACCESSOR );
ecma_object_t *getter = ecma_get_pointer( property->u.NamedAccessorProperty.pGet);
ecma_object_t *getter = ecma_get_pointer( property->u.named_accessor_property.get_p);
if ( getter == NULL )
{
@@ -99,9 +99,9 @@ ecma_op_get_value( ecma_reference_t ref) /**< ECMA-reference */
} else
{
// GetValue_5
ecma_object_t *lex_env_p = ecma_get_pointer( base.Value);
ecma_object_t *lex_env_p = ecma_get_pointer( base.value);
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
return ecma_op_get_binding_value( lex_env_p, ref.referenced_name_p, ref.is_strict);
}
@@ -122,10 +122,10 @@ ecma_op_put_value(ecma_reference_t ref, /**< ECMA-reference */
const ecma_value_t base = ref.base;
const bool is_unresolvable_reference = ecma_is_value_undefined( base);
const bool has_primitive_base = ( ecma_is_value_boolean( base)
|| base.ValueType == ECMA_TYPE_NUMBER
|| base.ValueType == ECMA_TYPE_STRING );
const bool has_object_base = ( base.ValueType == ECMA_TYPE_OBJECT
&& !((ecma_object_t*)ecma_get_pointer(base.Value))->IsLexicalEnvironment );
|| base.value_type == ECMA_TYPE_NUMBER
|| base.value_type == ECMA_TYPE_STRING );
const bool has_object_base = ( base.value_type == ECMA_TYPE_OBJECT
&& !((ecma_object_t*)ecma_get_pointer(base.value))->is_lexical_environment );
const bool is_property_reference = has_primitive_base || has_object_base;
if ( is_unresolvable_reference ) // PutValue_3
@@ -158,7 +158,7 @@ ecma_op_put_value(ecma_reference_t ref, /**< ECMA-reference */
/*
// PutValue_sub_1
ecma_object_t *obj_p = ecma_ToObject( base);
JERRY_ASSERT( obj_p != NULL && !obj_p->IsLexicalEnvironment );
JERRY_ASSERT( obj_p != NULL && !obj_p->is_lexical_environment );
// PutValue_sub_2
if ( !obj_p->[[CanPut]]( ref.referenced_name_p) )
@@ -200,7 +200,7 @@ ecma_op_put_value(ecma_reference_t ref, /**< ECMA-reference */
if ( ecma_OpIsAccessorDescriptor( prop) )
{
// PutValue_sub_6.a
ecma_object_t *setter = ecma_get_pointer( property->u.NamedAccessorProperty.pSet);
ecma_object_t *setter = ecma_get_pointer( property->u.named_accessor_property.set_p);
JERRY_ASSERT( setter != NULL );
// PutValue_sub_6.b
@@ -225,9 +225,9 @@ ecma_op_put_value(ecma_reference_t ref, /**< ECMA-reference */
} else
{
// PutValue_7
ecma_object_t *lex_env_p = ecma_get_pointer( base.Value);
ecma_object_t *lex_env_p = ecma_get_pointer( base.value);
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
return ecma_op_set_mutable_binding( lex_env_p, ref.referenced_name_p, value, ref.is_strict);
}
src/libecmaoperations/ecma-lex-env.c
+31 -31
View File
@@ -41,11 +41,11 @@ ecma_completion_value_t
ecma_op_has_binding(ecma_object_t *lex_env_p, /**< lexical environment */
ecma_char_t *name_p) /**< argument N */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
ecma_simple_value_t has_binding = ECMA_SIMPLE_VALUE_UNDEFINED;
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -81,10 +81,10 @@ ecma_op_create_mutable_binding(ecma_object_t *lex_env_p, /**< lexical environmen
ecma_char_t *name_p, /**< argument N */
bool is_deletable) /**< argument D */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
JERRY_ASSERT( name_p != NULL );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -125,21 +125,21 @@ ecma_op_set_mutable_binding(ecma_object_t *lex_env_p, /**< lexical environment *
ecma_value_t value, /**< argument V */
bool is_strict) /**< argument S */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
JERRY_ASSERT( name_p != NULL );
JERRY_ASSERT( ecma_is_completion_value_normal_true( ecma_op_has_binding( lex_env_p, name_p)) );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
ecma_property_t *property_p = ecma_get_named_data_property( lex_env_p, name_p);
if ( property_p->u.NamedDataProperty.Writable == ECMA_PROPERTY_WRITABLE )
if ( property_p->u.named_data_property.writable == ECMA_PROPERTY_WRITABLE )
{
ecma_free_value( property_p->u.NamedDataProperty.Value);
property_p->u.NamedDataProperty.Value = ecma_copy_value( value);
ecma_free_value( property_p->u.named_data_property.value);
property_p->u.named_data_property.value = ecma_copy_value( value);
} else if ( is_strict )
{
return ecma_make_throw_value( ecma_new_standard_error( ECMA_ERROR_TYPE));
@@ -171,27 +171,27 @@ ecma_op_get_binding_value(ecma_object_t *lex_env_p, /**< lexical environment */
ecma_char_t *name_p, /**< argument N */
bool is_strict) /**< argument S */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
JERRY_ASSERT( name_p != NULL );
JERRY_ASSERT( ecma_is_completion_value_normal_true( ecma_op_has_binding( lex_env_p, name_p)) );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
ecma_property_t *property_p = ecma_get_named_data_property( lex_env_p, name_p);
ecma_value_t prop_value = property_p->u.NamedDataProperty.Value;
ecma_value_t prop_value = property_p->u.named_data_property.value;
/* is the binding mutable? */
if ( property_p->u.NamedDataProperty.Writable == ECMA_PROPERTY_WRITABLE )
if ( property_p->u.named_data_property.writable == ECMA_PROPERTY_WRITABLE )
{
return ecma_make_completion_value( ECMA_COMPLETION_TYPE_NORMAL,
ecma_copy_value( prop_value),
ECMA_TARGET_ID_RESERVED);
} else if ( prop_value.ValueType == ECMA_TYPE_SIMPLE
&& prop_value.Value == ECMA_SIMPLE_VALUE_EMPTY )
} else if ( prop_value.value_type == ECMA_TYPE_SIMPLE
&& prop_value.value == ECMA_SIMPLE_VALUE_EMPTY )
{
/* unitialized immutable binding */
if ( is_strict )
@@ -229,10 +229,10 @@ ecma_completion_value_t
ecma_op_delete_binding(ecma_object_t *lex_env_p, /**< lexical environment */
ecma_char_t *name_p) /**< argument N */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
JERRY_ASSERT( name_p != NULL );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -244,9 +244,9 @@ ecma_op_delete_binding(ecma_object_t *lex_env_p, /**< lexical environment */
ret_val = ECMA_SIMPLE_VALUE_TRUE;
} else
{
JERRY_ASSERT( prop_p->Type == ECMA_PROPERTY_NAMEDDATA );
JERRY_ASSERT( prop_p->type == ECMA_PROPERTY_NAMEDDATA );
if ( prop_p->u.NamedDataProperty.Configurable == ECMA_PROPERTY_NOT_CONFIGURABLE )
if ( prop_p->u.named_data_property.configurable == ECMA_PROPERTY_NOT_CONFIGURABLE )
{
ret_val = ECMA_SIMPLE_VALUE_FALSE;
} else
@@ -281,9 +281,9 @@ ecma_op_delete_binding(ecma_object_t *lex_env_p, /**< lexical environment */
ecma_completion_value_t
ecma_op_implicit_this_value( ecma_object_t *lex_env_p) /**< lexical environment */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -309,9 +309,9 @@ void
ecma_op_create_immutable_binding(ecma_object_t *lex_env_p, /**< lexical environment */
ecma_char_t *name_p) /**< argument N */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -327,9 +327,9 @@ ecma_op_create_immutable_binding(ecma_object_t *lex_env_p, /**< lexical environm
ECMA_PROPERTY_NOT_ENUMERABLE,
ECMA_PROPERTY_NOT_CONFIGURABLE);
JERRY_ASSERT( prop_p->u.NamedDataProperty.Value.ValueType == ECMA_TYPE_SIMPLE );
JERRY_ASSERT( prop_p->u.named_data_property.value.value_type == ECMA_TYPE_SIMPLE );
prop_p->u.NamedDataProperty.Value.Value = ECMA_SIMPLE_VALUE_EMPTY;
prop_p->u.named_data_property.value.value = ECMA_SIMPLE_VALUE_EMPTY;
}
case ECMA_LEXICAL_ENVIRONMENT_OBJECTBOUND:
{
@@ -350,9 +350,9 @@ ecma_op_initialize_immutable_binding(ecma_object_t *lex_env_p, /**< lexical envi
ecma_char_t *name_p, /**< argument N */
ecma_value_t value) /**< argument V */
{
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->IsLexicalEnvironment );
JERRY_ASSERT( lex_env_p != NULL && lex_env_p->is_lexical_environment );
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.LexicalEnvironment.Type )
switch ( (ecma_lexical_environment_type_t) lex_env_p->u.lexical_environment.type )
{
case ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE:
{
@@ -361,11 +361,11 @@ ecma_op_initialize_immutable_binding(ecma_object_t *lex_env_p, /**< lexical envi
ecma_property_t *prop_p = ecma_get_named_data_property( lex_env_p, name_p);
/* The binding must be unitialized immutable binding */
JERRY_ASSERT( prop_p->u.NamedDataProperty.Writable == ECMA_PROPERTY_NOT_WRITABLE
&& prop_p->u.NamedDataProperty.Value.ValueType == ECMA_TYPE_SIMPLE
&& prop_p->u.NamedDataProperty.Value.Value == ECMA_SIMPLE_VALUE_EMPTY );
JERRY_ASSERT( prop_p->u.named_data_property.writable == ECMA_PROPERTY_NOT_WRITABLE
&& prop_p->u.named_data_property.value.value_type == ECMA_TYPE_SIMPLE
&& prop_p->u.named_data_property.value.value == ECMA_SIMPLE_VALUE_EMPTY );
prop_p->u.NamedDataProperty.Value = ecma_copy_value( value);
prop_p->u.named_data_property.value = ecma_copy_value( value);
}
case ECMA_LEXICAL_ENVIRONMENT_OBJECTBOUND:
{
src/libecmaoperations/ecma-reference.c
+1 -1
View File
@@ -63,7 +63,7 @@ ecma_op_get_identifier_reference(ecma_object_t *lex_env_p, /**< lexical environm
JERRY_ASSERT( ecma_is_completion_value_normal_false( completion_value) );
}
lex_env_iter_p = ecma_get_pointer( lex_env_iter_p->u.LexicalEnvironment.pOuterReference);
lex_env_iter_p = ecma_get_pointer( lex_env_iter_p->u.lexical_environment.outer_reference_p);
}
return ecma_make_reference( ecma_make_simple_value( ECMA_SIMPLE_VALUE_UNDEFINED),