Skip to content

Commit 26d3168

Browse files
committed
Update mono name only
1 parent 9d7bc94 commit 26d3168

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/mono/mono/metadata/custom-attrs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,8 +2488,8 @@ mono_reflection_get_custom_attrs_info_checked (MonoObjectHandle obj, MonoError *
24882488
cinfo = mono_custom_attrs_from_builders_handle (NULL, &dynamic_image->image, cattrs);
24892489
} else if (strcmp ("MonoGenericClass", klass_name) == 0) {
24902490
MonoReflectionGenericClassHandle gclass = MONO_HANDLE_CAST (MonoReflectionGenericClass, obj);
2491-
MonoReflectionTypeHandle _genericType = MONO_HANDLE_NEW_GET (MonoReflectionType, gclass, _genericType);
2492-
cinfo = mono_reflection_get_custom_attrs_info_checked (MONO_HANDLE_CAST (MonoObject, _genericType), error);
2491+
MonoReflectionTypeHandle generic_type = MONO_HANDLE_NEW_GET (MonoReflectionType, gclass, generic_type);
2492+
cinfo = mono_reflection_get_custom_attrs_info_checked (MONO_HANDLE_CAST (MonoObject, generic_type), error);
24932493
goto_if_nok (error, leave);
24942494
} else { /* handle other types here... */
24952495
g_error ("get custom attrs not yet supported for %s", m_class_get_name (klass));

src/mono/mono/metadata/object-internals.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,9 +1236,9 @@ struct _MonoReflectionTypeBuilder {
12361236

12371237
typedef struct {
12381238
MonoReflectionType type;
1239-
MonoReflectionType *_baseType;
1240-
gint32 _typeKind;
1241-
gint32 _rank;
1239+
MonoReflectionType *element_type;
1240+
gint32 type_kind;
1241+
gint32 rank;
12421242
} MonoReflectionSymbolType;
12431243

12441244
/* Safely access System.Reflection.Emit.SymbolType from native code */
@@ -1270,8 +1270,8 @@ TYPED_HANDLE_DECL (MonoReflectionEnumBuilder);
12701270
typedef struct _MonoReflectionGenericClass MonoReflectionGenericClass;
12711271
struct _MonoReflectionGenericClass {
12721272
MonoReflectionType type;
1273-
MonoReflectionType *_genericType; /*Can be either a MonoType or a TypeBuilder*/
1274-
MonoArray *_typeArguments;
1273+
MonoReflectionType *generic_type; /*Can be either a MonoType or a TypeBuilder*/
1274+
MonoArray *type_arguments;
12751275
};
12761276

12771277
/* Safely access System.Reflection.Emit.TypeBuilderInstantiation from native code */

src/mono/mono/metadata/reflection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,7 @@ mono_reflection_bind_generic_parameters (MonoReflectionTypeHandle reftype, int t
26002600
/* Does this ever make sense? what does instantiating a generic instance even mean? */
26012601
g_assert_not_reached ();
26022602
MonoReflectionGenericClassHandle rgi = MONO_HANDLE_CAST (MonoReflectionGenericClass, reftype);
2603-
MonoReflectionTypeHandle gtd = MONO_HANDLE_NEW_GET (MonoReflectionType, rgi, _genericType);
2603+
MonoReflectionTypeHandle gtd = MONO_HANDLE_NEW_GET (MonoReflectionType, rgi, generic_type);
26042604

26052605
if (mono_is_sre_type_builder (mono_handle_class (gtd)))
26062606
is_dynamic = TRUE;

src/mono/mono/metadata/sre.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ reflection_instance_handle_mono_type (MonoReflectionGenericClassHandle ref_gclas
15621562
MonoType *result = NULL;
15631563
MonoType **types = NULL;
15641564

1565-
MonoArrayHandle typeargs = MONO_HANDLE_NEW_GET (MonoArray, ref_gclass, _typeArguments);
1565+
MonoArrayHandle typeargs = MONO_HANDLE_NEW_GET (MonoArray, ref_gclass, type_arguments);
15661566
int count = GUINTPTR_TO_INT (mono_array_handle_length (typeargs));
15671567
types = g_new0 (MonoType*, count);
15681568
MonoReflectionTypeHandle t = MONO_HANDLE_NEW (MonoReflectionType, NULL);
@@ -1573,9 +1573,9 @@ reflection_instance_handle_mono_type (MonoReflectionGenericClassHandle ref_gclas
15731573
goto leave;
15741574
}
15751575
}
1576-
/* Need to resolve the _genericType in order for it to create its generic context. */
1576+
/* Need to resolve the generic_type in order for it to create its generic context. */
15771577
MonoReflectionTypeHandle ref_gtd;
1578-
ref_gtd = MONO_HANDLE_NEW_GET (MonoReflectionType, ref_gclass, _genericType);
1578+
ref_gtd = MONO_HANDLE_NEW_GET (MonoReflectionType, ref_gclass, generic_type);
15791579
MonoType *gtd;
15801580
gtd = mono_reflection_type_handle_mono_type (ref_gtd, error);
15811581
goto_if_nok (error, leave);
@@ -1697,26 +1697,26 @@ mono_reflection_type_handle_mono_type (MonoReflectionTypeHandle ref, MonoError *
16971697

16981698
if (is_sre_symboltype (klass)) {
16991699
MonoReflectionSymbolTypeHandle sre_symbol = MONO_HANDLE_CAST (MonoReflectionSymbolType, ref);
1700-
MonoReflectionTypeHandle ref_element = MONO_HANDLE_NEW_GET (MonoReflectionType, sre_symbol, _baseType);
1700+
MonoReflectionTypeHandle ref_element = MONO_HANDLE_NEW_GET (MonoReflectionType, sre_symbol, element_type);
17011701
MonoType *base = mono_reflection_type_handle_mono_type (ref_element, error);
17021702
goto_if_nok (error, leave);
17031703
g_assert (base);
1704-
uint8_t _typeKind = GINT32_TO_UINT8 (MONO_HANDLE_GETVAL (sre_symbol, _typeKind));
1705-
switch (_typeKind)
1704+
uint8_t type_kind = GINT32_TO_UINT8 (MONO_HANDLE_GETVAL (sre_symbol, type_kind));
1705+
switch (type_kind)
17061706
{
17071707
case 1 : {
1708-
uint8_t _rank = GINT32_TO_UINT8 (MONO_HANDLE_GETVAL (sre_symbol, _rank));
1708+
uint8_t rank = GINT32_TO_UINT8 (MONO_HANDLE_GETVAL (sre_symbol, rank));
17091709
MonoClass *eclass = mono_class_from_mono_type_internal (base);
17101710
result = mono_image_new0 (eclass->image, MonoType, 1);
1711-
if (_rank == 0) {
1711+
if (rank == 0) {
17121712
result->type = MONO_TYPE_SZARRAY;
17131713
result->data.klass = eclass;
17141714
} else {
17151715
MonoArrayType *at = (MonoArrayType *)mono_image_alloc0 (eclass->image, sizeof (MonoArrayType));
17161716
result->type = MONO_TYPE_ARRAY;
17171717
result->data.array = at;
17181718
at->eklass = eclass;
1719-
at->rank = _rank;
1719+
at->rank = rank;
17201720
}
17211721
}
17221722
break;

0 commit comments

Comments
 (0)