diff options
Diffstat (limited to 'plugins/itanium/component.c')
-rw-r--r-- | plugins/itanium/component.c | 86 |
1 files changed, 51 insertions, 35 deletions
diff --git a/plugins/itanium/component.c b/plugins/itanium/component.c index 1b2c33c..3474639 100644 --- a/plugins/itanium/component.c +++ b/plugins/itanium/component.c @@ -43,7 +43,6 @@ - /* Procédure à appliquer sur un composant visité */ typedef void (* visit_comp_fc) (itanium_component *); @@ -187,7 +186,7 @@ static void visit_comp(itanium_component *comp, visit_comp_fc visitor) break; case ICT_CONSTRUCTOR: - case ICT_DESSTRUCTOR: + case ICT_DESTRUCTOR: break; case ICT_TYPE: @@ -1019,7 +1018,7 @@ char *itd_translate_component(const itanium_component *comp, char *base) result = stradd(base, "<ctor>"); break; - case ICT_DESSTRUCTOR: + case ICT_DESTRUCTOR: result = stradd(base, "<dtor>"); break; @@ -1339,7 +1338,8 @@ static void itd_prepend_namespace_to_type(GDataType *type, GDataType *ns) /****************************************************************************** * * -* Paramètres : comp = composant Itanium à traduire en type. * +* Paramètres : comp = composant Itanium à traduire en type. * +* rtype = type de l'éventuelle routine en construction. * * * * Description : Traduit les composants de contexte Itanium en type. * * * @@ -1349,7 +1349,7 @@ static void itd_prepend_namespace_to_type(GDataType *type, GDataType *ns) * * ******************************************************************************/ -GDataType *itd_translate_component_to_type(const itanium_component *comp) +GDataType *itd_translate_component_to_type(const itanium_component *comp, RoutineType *rtype) { GDataType *result; /* Type à retourner */ char *name; /* Attribution finale */ @@ -1373,7 +1373,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; case ICT_STD_UNSCOPED_NAME: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL) { ns = g_class_enum_type_new(CET_NAMESPACE, strdup("std")); @@ -1396,7 +1396,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) { if (comp->binary.left != NULL) { - ns = itd_translate_component_to_type(comp->binary.left); + ns = itd_translate_component_to_type(comp->binary.left, rtype); if (ns == NULL) { result = NULL; @@ -1406,7 +1406,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) else ns = NULL; - result = itd_translate_component_to_type(comp->binary.right); + result = itd_translate_component_to_type(comp->binary.right, rtype); if (result != NULL) { @@ -1416,8 +1416,12 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) else { - if (ns != NULL) + if (*rtype != RTT_CLASSIC) + result = ns; + + else if (ns != NULL) g_object_unref(G_OBJECT(ns)); + } } @@ -1426,11 +1430,11 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) case ICT_TEMPLATE_NAME_ARGS: - result = itd_translate_component_to_type(comp->binary.right); + result = itd_translate_component_to_type(comp->binary.right, rtype); if (result != NULL) { - sub = itd_translate_component_to_type(comp->binary.left); + sub = itd_translate_component_to_type(comp->binary.left, rtype); if (sub == NULL) { @@ -1471,14 +1475,14 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) else { - ns = itd_translate_component_to_type(comp->binary.left); + ns = itd_translate_component_to_type(comp->binary.left, rtype); if (ns == NULL) { result = NULL; break; } - result = itd_translate_component_to_type(comp->binary.right); + result = itd_translate_component_to_type(comp->binary.right, rtype); if (result != NULL) itd_prepend_namespace_to_type(result, ns); @@ -1502,7 +1506,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) { if (comp->binary.left != NULL) { - ns = itd_translate_component_to_type(comp->binary.left); + ns = itd_translate_component_to_type(comp->binary.left, rtype); if (ns == NULL) { result = NULL; @@ -1513,7 +1517,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) else ns = NULL; - result = itd_translate_component_to_type(comp->binary.right); + result = itd_translate_component_to_type(comp->binary.right, rtype); if (result != NULL) { @@ -1536,7 +1540,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) case ICT_SPECIAL_NAME_VTABLE: - ns = itd_translate_component_to_type(comp->unary); + ns = itd_translate_component_to_type(comp->unary, rtype); if (ns == NULL) result = NULL; @@ -1551,7 +1555,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) case ICT_SPECIAL_NAME_VSTRUCT: - ns = itd_translate_component_to_type(comp->unary); + ns = itd_translate_component_to_type(comp->unary, rtype); if (ns == NULL) result = NULL; @@ -1578,7 +1582,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; } - result = itd_translate_component_to_type(comp->binary.left); + result = itd_translate_component_to_type(comp->binary.left, rtype); if (result != NULL) result = g_override_type_new(result, &off0); @@ -1599,7 +1603,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; } - result = itd_translate_component_to_type(comp->ternary.first); + result = itd_translate_component_to_type(comp->ternary.first, rtype); if (result != NULL) result = g_override_type_new_with_covariant(result, &off0, &off1); @@ -1607,7 +1611,14 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; case ICT_CONSTRUCTOR: - case ICT_DESSTRUCTOR: + if (rtype != NULL) + *rtype = RTT_CONSTRUCTOR; + result = NULL; + break; + + case ICT_DESTRUCTOR: + if (rtype != NULL) + *rtype = RTT_DESTRUCTOR; result = NULL; break; @@ -1617,37 +1628,37 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; case ICT_QUALIFIED_TYPE: - result = itd_translate_component_to_type(comp->qualified.sub); + result = itd_translate_component_to_type(comp->qualified.sub, rtype); if (result != NULL) g_data_type_add_qualifier(result, comp->qualified.qualifier); break; case ICT_POINTER_TO: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL && !G_IS_PROTO_TYPE(result)) result = g_encapsulated_type_new(ECT_POINTER, result); break; case ICT_REFERENCE_TO: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL) result = g_encapsulated_type_new(ECT_REFERENCE, result); break; case ICT_RVALUE_REFERENCE_TO: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL) result = g_encapsulated_type_new(ECT_RVALUE_REF, result); break; case ICT_COMPLEX_PAIR: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL) result = g_encapsulated_type_new(ECT_COMPLEX, result); break; case ICT_IMAGINARY: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); if (result != NULL) result = g_encapsulated_type_new(ECT_IMAGINARY, result); break; @@ -1662,7 +1673,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) { assert(iter->type == ICT_TYPES_LIST); - arg = itd_translate_component_to_type(iter->binary.left); + arg = itd_translate_component_to_type(iter->binary.left, rtype); if (arg == NULL) { @@ -1689,7 +1700,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) case ICT_ARRAY: - members = itd_translate_component_to_type(comp->array.atype); + members = itd_translate_component_to_type(comp->array.atype, rtype); if (members == NULL) result = NULL; @@ -1714,14 +1725,14 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) case ICT_POINTER_TO_MEMBER: - ns = itd_translate_component_to_type(comp->pmember.class); + ns = itd_translate_component_to_type(comp->pmember.class, rtype); if (ns == NULL) result = NULL; else { - result = itd_translate_component_to_type(comp->pmember.member); + result = itd_translate_component_to_type(comp->pmember.member, rtype); if (result == NULL) g_object_unref(G_OBJECT(ns)); @@ -1734,7 +1745,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) break; case ICT_TEMPLATE_PARAM: - result = itd_translate_component_to_type(comp->unary); + result = itd_translate_component_to_type(comp->unary, rtype); break; case ICT_TEMPLATE_ARGS: @@ -1747,7 +1758,7 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) { assert(iter->type == ICT_TYPES_LIST); - param = itd_translate_component_to_type(iter->binary.left); + param = itd_translate_component_to_type(iter->binary.left, rtype); if (param == NULL) { @@ -1816,8 +1827,9 @@ GDataType *itd_translate_component_to_type(const itanium_component *comp) GBinRoutine *itd_translate_component_to_routine(const itanium_component *comp) { GBinRoutine *result; /* Routine à retourner */ - bool has_ret; /* Type de retour présent ? */ itanium_component *name; /* Désignation de la routine */ + RoutineType rtype; /* Type déclaré de routine */ + bool has_ret; /* Type de retour présent ? */ char *desc; /* Description humaine */ GDataType *ns; /* Espace de noms de la routine*/ itanium_component *args; /* Liste de ses arguments */ @@ -1834,6 +1846,8 @@ GBinRoutine *itd_translate_component_to_routine(const itanium_component *comp) name = comp->binary.left; + rtype = RTT_CLASSIC; + /** * A la fin de § 5.1.3 ("Operator Encodings") est précisé : * @@ -1857,7 +1871,7 @@ GBinRoutine *itd_translate_component_to_routine(const itanium_component *comp) case ICT_STD_UNSCOPED_NAME: case ICT_NAME: - type = itd_translate_component_to_type(name); + type = itd_translate_component_to_type(name, &rtype); if (type == NULL) goto unsupported_encoding; ns = g_data_type_get_namespace(type); @@ -1892,6 +1906,8 @@ GBinRoutine *itd_translate_component_to_routine(const itanium_component *comp) } + g_binary_routine_set_type(result, rtype); + /* Liste d'arguments */ args = comp->binary.right; @@ -1901,7 +1917,7 @@ GBinRoutine *itd_translate_component_to_routine(const itanium_component *comp) for (iter = args; iter != NULL; iter = iter->binary.right) { - type = itd_translate_component_to_type(iter->binary.left); + type = itd_translate_component_to_type(iter->binary.left, NULL); if (type == NULL) goto unsupported_encoding; |