Merge in the gir-compiler branch. Thanks to Philip and Colin for their

2008-08-08  Johan Dahlin  <johan@gnome.org>

    * girepository/gtypelib.c (validate_header):
    * girepository/gtypelib.h:
    * giscanner/ast.py:
    * giscanner/girwriter.py:
    * giscanner/sourcescanner.c (gi_source_symbol_ref),
    (gi_source_symbol_unref):
    * tests/array.test:
    * tests/boxed.test:
    * tests/constant.test:
    * tests/enum.test:
    * tests/errors.test:
    * tests/function.test:
    * tests/gobject.test:
    * tests/interface.test:
    * tests/invoke/Makefile.am:
    * tests/invoke/testfns.xml:
    * tests/object.test:
    * tests/parser/Makefile.am:
    * tests/roundtrips.sh:
    * tests/struct.test:
    * tests/types.test:
    * tests/union.test:
    * tests/xref1.test:
    * tests/xref2.test:
    * tools/Makefile.am:
    * tools/compiler.c (main):
    * tools/generate.c (write_callable_info), (write_function_info),
    (write_repository):
    * tools/gidlmodule.c:
    * tools/gidlmodule.h:
    * tools/gidlnode.c:
    * tools/gidlnode.h:
    * tools/gidlparser.c:
    * tools/gidlparser.h:
    * tools/gidlwriter.c:
    * tools/gidlwriter.h:
    * tools/scanner.c (create_node_from_gtype),
    (create_node_from_ctype), (g_igenerator_process_properties),
    (g_igenerator_process_signals), (g_igenerator_create_object),
    (g_igenerator_create_interface), (g_igenerator_create_boxed),
    (g_igenerator_create_enum), (g_igenerator_create_flags),
    (g_igenerator_process_function_symbol),
    (g_igenerator_process_unregistered_struct_typedef),
    (g_igenerator_process_struct_typedef),
    (g_igenerator_process_union_typedef),
    (g_igenerator_process_enum_typedef),
    (g_igenerator_process_function_typedef),
    (g_igenerator_process_constant), (g_igenerator_process_symbols),
    (g_igenerator_add_module), (g_igenerator_add_include_idl):
    Merge in the gir-compiler branch.
    Thanks to Philip and Colin for their help.


svn path=/trunk/; revision=325

1 files changed, 0 insertions, 215 deletions

diff --git a/tools/gidlmodule.c b/tools/gidlmodule.c
deleted file mode 100644
index d543346b..00000000
--- a/tools/gidlmodule.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* GObject introspection: Metadata creation 
- *
- * Copyright (C) 2005 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "gidlmodule.h"
-#include "gidlnode.h"
-
-#define ALIGN_VALUE(this, boundary) \
-  (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
-
-
-GIdlModule *
-g_idl_module_new (const gchar *name, const gchar *shared_library)
-{
-  GIdlModule *module;
-  
-  module = g_new (GIdlModule, 1);
-
-  module->name = g_strdup (name);
-  if (shared_library)
-      module->shared_library = g_strdup (shared_library);
-  else
-      module->shared_library = NULL;
-  module->entries = NULL;
-
-  return module;
-}
-
-void
-g_idl_module_free (GIdlModule *module)
-{
-  GList *e;
-
-  g_free (module->name);
-
-  for (e = module->entries; e; e = e->next)
-    g_idl_node_free ((GIdlNode *)e->data);
-
-  g_list_free (module->entries);
-
-  g_free (module);
-}
-
-GTypelib *
-g_idl_module_build_metadata (GIdlModule  *module,
-			     GList       *modules)
-{
-  guchar *metadata;
-  gsize length;
-  gint i;
-  GList *e;
-  Header *header;
-  DirEntry *entry;
-  guint32 header_size;
-  guint32 dir_size;
-  guint32 n_entries;
-  guint32 n_local_entries;
-  guint32 size, offset, offset2, old_offset;
-  GHashTable *strings;
-  GHashTable *types;
-  guchar *data;
-
-  header_size = ALIGN_VALUE (sizeof (Header), 4);
-  n_local_entries = g_list_length (module->entries);
-
- restart:
-  init_stats ();
-  strings = g_hash_table_new (g_str_hash, g_str_equal);
-  types = g_hash_table_new (g_str_hash, g_str_equal);
-  n_entries = g_list_length (module->entries);
-
-  g_message ("%d entries (%d local)\n", n_entries, n_local_entries);
-  
-  dir_size = n_entries * 12;  
-  size = header_size + dir_size;
-
-  size += ALIGN_VALUE (strlen (module->name) + 1, 4);
-
-  for (e = module->entries; e; e = e->next)
-    {
-      GIdlNode *node = e->data;
-      
-      size += g_idl_node_get_full_size (node);
-    }
-
-  g_message ("allocating %d bytes (%d header, %d directory, %d entries)\n", 
-	  size, header_size, dir_size, size - header_size - dir_size);
-
-  data = g_malloc0 (size);
-
-  /* fill in header */
-  header = (Header *)data;
-  memcpy (header, G_IDL_MAGIC, 16);
-  header->major_version = 1;
-  header->minor_version = 0;
-  header->reserved = 0;
-  header->n_entries = n_entries;
-  header->n_local_entries = n_local_entries;
-  header->n_annotations = 0;
-  header->annotations = 0; /* filled in later */
-  header->size = 0; /* filled in later */
-  header->namespace = write_string (module->name, strings, data, &header_size);
-  header->shared_library = (module->shared_library?
-                             write_string (module->shared_library, strings, data, &header_size)
-                             : 0);
-  header->directory = ALIGN_VALUE (header_size, 4);
-  header->entry_blob_size = 12;
-  header->function_blob_size = 16;
-  header->callback_blob_size = 12;
-  header->signal_blob_size = 12;
-  header->vfunc_blob_size = 16;
-  header->arg_blob_size = 12;
-  header->property_blob_size = 12;
-  header->field_blob_size = 12;
-  header->value_blob_size = 12;
-  header->constant_blob_size = 20;
-  header->error_domain_blob_size = 16;
-  header->annotation_blob_size = 12;
-  header->signature_blob_size = 8;
-  header->enum_blob_size = 20;
-  header->struct_blob_size = 20;
-  header->object_blob_size = 32;
-  header->interface_blob_size = 28;
-  header->union_blob_size = 28;
-
-  /* fill in directory and content */
-  entry = (DirEntry *)&data[header->directory];
-
-  offset2 = header->directory + dir_size;
-
-  for (e = module->entries, i = 0; e; e = e->next, i++)
-    {
-      GIdlNode *node = e->data;
-
-      if (strchr (node->name, '.'))
-        {
-	  g_error ("Names may not contain '.'");
-	}
-
-      /* we picked up implicit xref nodes, start over */
-      if (i == n_entries)
-	{
-	  g_message ("Found implicit cross references, starting over");
-
-	  g_hash_table_destroy (strings);
-	  g_hash_table_destroy (types);
-	  strings = NULL;
-
-	  g_free (data);
-	  data = NULL;
-
-	  goto restart;
-	}
-	
-      offset = offset2;
-
-      if (node->type == G_IDL_NODE_XREF)
-	{
-	  entry->blob_type = 0;
-	  entry->local = FALSE;
-	  entry->offset = write_string (((GIdlNodeXRef*)node)->namespace, strings, data, &offset2);
-	  entry->name = write_string (node->name, strings, data, &offset2);
-	}
-      else
-	{
-	  old_offset = offset;
-	  offset2 = offset + g_idl_node_get_size (node);
-
-	  entry->blob_type = node->type;
-	  entry->local = TRUE;
-	  entry->offset = offset;
-	  entry->name = write_string (node->name, strings, data, &offset2);
-
-	  g_idl_node_build_metadata (node, module, modules, 
-				     strings, types, data, &offset, &offset2);
-
-	  if (offset2 > old_offset + g_idl_node_get_full_size (node))
-	    g_error ("left a hole of %d bytes\n", offset2 - old_offset - g_idl_node_get_full_size (node));
-	}
-
-      entry++;
-    }
-
-  dump_stats ();
-  g_hash_table_destroy (strings);
-  g_hash_table_destroy (types);
-
-  header->annotations = offset2;
-  
-  g_message ("reallocating to %d bytes", offset2);
-
-  metadata = g_realloc (data, offset2);
-  length = header->size = offset2;
-  return g_typelib_new_from_memory (metadata, length);
-}
-