From 64d32c97b58fa16af34b83a29ed199c546e8d817 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Tue, 22 Apr 2008 22:48:16 +0000 Subject: [PATCH] Revert revisions 157,149-148,136-129 and 120. Move back to using 2008-04-22 Johan Dahlin * girepository/ginfo.c (g_info_from_entry), (g_type_info_new), (g_type_info_is_pointer), (g_type_info_get_tag), (g_type_info_get_param_type), (g_type_info_get_interface), (g_type_info_get_array_length), (g_type_info_is_zero_terminated), (g_type_info_get_n_error_domains), (g_type_info_get_error_domain), (g_error_domain_info_get_codes), (g_enum_info_get_value), (g_object_info_get_interface), (g_object_info_get_field), (g_interface_info_get_prerequisite), (g_signal_info_get_class_closure), (g_constant_info_get_value): * girepository/ginvoke.c (get_ffi_type): * girepository/girepository.h: * girepository/gmetadata.c (g_metadata_get_dir_entry), (g_metadata_check_sanity), (validate_header), (validate_array_type_blob), (validate_iface_type_blob), (validate_param_type_blob), (validate_error_type_blob), (validate_type_blob), (validate_constant_blob), (validate_struct_blob), (validate_enum_blob): * girepository/gmetadata.h: * tests/Makefile.am: * tests/invoke/Makefile.am: * tests/invoke/invoke.c (main): * tests/roundtrips.sh: * tools/Makefile.am: * tools/compiler.c (format_output), (write_out_metadata), (main): * tools/generate.c (write_type_name), (write_type_info), (write_constant_value), (write_enum_info), (load_metadata), (main): * tools/gidlcompilercontext.c: * tools/gidlcompilercontext.h: * tools/gidlcompilerentrynode.c: * tools/gidlcompilerentrynode.h: * tools/gidlcompilertypenode.c: * tools/gidlcompilertypenode.h: * tools/gidlmodule.c (g_idl_module_build_metadata): * tools/gidlmodule.h: * tools/gidlnode.c (init_stats), (dump_stats), (g_idl_node_get_size), (g_idl_node_get_full_size), (g_idl_node_cmp), (g_idl_node_can_have_member), (g_idl_node_add_member), (g_idl_node_param_direction_string), (parse_int_value), (parse_uint_value), (parse_float_value), (parse_boolean_value), (find_entry_node), (find_entry), (serialize_type), (g_idl_node_build_metadata), (write_string): * tools/gidlnode.h: * tools/gidlparser.c (parse_type_internal): * tools/quote-file.sh: Revert revisions 157,149-148,136-129 and 120. Move back to using g-idl-generate to generate the metadata and avoids dependency on a c compiler. svn path=/trunk/; revision=214 --- girepository/tools/generate.c | 55 +++++++++++++---------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/girepository/tools/generate.c b/girepository/tools/generate.c index f55731ee3..8c5c3b3b1 100644 --- a/girepository/tools/generate.c +++ b/girepository/tools/generate.c @@ -38,8 +38,7 @@ write_type_name (const gchar *namespace, GIBaseInfo *info, FILE *file) { - if (g_base_info_get_namespace (info) != 0 && - strcmp (namespace, g_base_info_get_namespace (info)) != 0) + if (strcmp (namespace, g_base_info_get_namespace (info)) != 0) g_fprintf (file, "%s.", g_base_info_get_namespace (info)); g_fprintf (file, "%s", g_base_info_get_name (info)); @@ -79,11 +78,11 @@ write_type_info (const gchar *namespace, tag = g_type_info_get_tag (info); - if (tag < TYPE_TAG_UTF8) + if (tag < 18) g_fprintf (file, "%s%s", basic[tag], g_type_info_is_pointer (info) ? "*" : ""); - else if (tag <= TYPE_TAG_FILENAME) + else if (tag < 20) g_fprintf (file, "%s", basic[tag]); - else if (tag == TYPE_TAG_ARRAY) + else if (tag == 20) { gint length; @@ -102,7 +101,7 @@ write_type_info (const gchar *namespace, g_fprintf (file, "]"); g_base_info_unref ((GIBaseInfo *)type); } - else if (tag == TYPE_TAG_SYMBOL) + else if (tag == 21) { GIBaseInfo *iface = g_type_info_get_interface (info); write_type_name (namespace, iface, file); @@ -110,7 +109,7 @@ write_type_info (const gchar *namespace, g_fprintf (file, "*"); g_base_info_unref (iface); } - else if (tag == TYPE_TAG_LIST) + else if (tag == 22) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GList"); @@ -123,7 +122,7 @@ write_type_info (const gchar *namespace, } g_fprintf (file, "*"); } - else if (tag == TYPE_TAG_SLIST) + else if (tag == 23) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GSList"); @@ -136,7 +135,7 @@ write_type_info (const gchar *namespace, } g_fprintf (file, "*"); } - else if (tag == TYPE_TAG_HASH) + else if (tag == 24) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GHashTable"); @@ -153,7 +152,7 @@ write_type_info (const gchar *namespace, } g_fprintf (file, "*"); } - else if (tag == TYPE_TAG_ERROR) + else if (tag == 25) { gint n; @@ -532,11 +531,8 @@ write_constant_value (const gchar *namespace, case GI_TYPE_TAG_FILENAME: g_fprintf (file, "%s", value->v_string); break; - case GI_TYPE_TAG_SYMBOL: - g_fprintf (file, "%s", value->v_string); - break; default: - g_warning ("Could not get type tag for constant"); + g_assert_not_reached (); } } @@ -574,22 +570,16 @@ write_enum_info (const gchar *namespace, FILE *file) { const gchar *name; - const gchar *type_name = NULL; - const gchar *type_init = NULL; + const gchar *type_name; + const gchar *type_init; gboolean deprecated; gint i; name = g_base_info_get_name ((GIBaseInfo *)info); deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info); - /* Make sure this is a registered enum before filling out the - * GType information - */ - if (g_enum_info_is_registered ((GIEnumInfo *)info)) - { - type_name = g_registered_type_info_get_type_name ((GIRegisteredTypeInfo*)info); - type_init = g_registered_type_info_get_type_init ((GIRegisteredTypeInfo*)info); - } + type_name = g_registered_type_info_get_type_name ((GIRegisteredTypeInfo*)info); + type_init = g_registered_type_info_get_type_init ((GIRegisteredTypeInfo*)info); if (g_base_info_get_type ((GIBaseInfo *)info) == GI_INFO_TYPE_ENUM) g_fprintf (file, "