gobject-introspection r387 - trunk/girepository

[johan svn gnome org]

Author: johan
Date: Sat Aug 16 21:55:06 2008
New Revision: 387
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=387&view=rev

Log:
Reorder

Modified:
   trunk/girepository/girparser.c

Modified: trunk/girepository/girparser.c
==============================================================================
--- trunk/girepository/girparser.c	(original)
+++ trunk/girepository/girparser.c	Sat Aug 16 21:55:06 2008
@@ -150,61 +150,67 @@
     gint tag;
     gboolean pointer;
   } basic[] = {
-    { "void",     GI_TYPE_TAG_VOID,    0 },
     { "none",     GI_TYPE_TAG_VOID,    0 },
     { "any",      GI_TYPE_TAG_VOID,    1 },
-    { "gpointer", GI_TYPE_TAG_VOID,    1 },
+
     { "bool",     GI_TYPE_TAG_BOOLEAN, 0 },
-    { "gboolean", GI_TYPE_TAG_BOOLEAN, 0 },
     { "char",     GI_TYPE_TAG_INT8,    0 },
-    { "gchar",    GI_TYPE_TAG_INT8,    0 },
-    { "guchar",   GI_TYPE_TAG_UINT8,   0 },
-    { "gunichar", GI_TYPE_TAG_UINT32,  0 },
-    { "int8_t",   GI_TYPE_TAG_INT8,    0 },
     { "int8",     GI_TYPE_TAG_INT8,    0 },
-    { "gint8",    GI_TYPE_TAG_INT8,    0 },
-    { "uint8_t",  GI_TYPE_TAG_UINT8,   0 },
     { "uint8",    GI_TYPE_TAG_UINT8,   0 },
-    { "guint8",   GI_TYPE_TAG_UINT8,   0 },
-    { "int16_t",  GI_TYPE_TAG_INT16,   0 },
     { "int16",    GI_TYPE_TAG_INT16,   0 },
-    { "gint16",   GI_TYPE_TAG_INT16,   0 },
-    { "uint16_t", GI_TYPE_TAG_UINT16,  0 },
     { "uint16",   GI_TYPE_TAG_UINT16,  0 },
-    { "guint16",  GI_TYPE_TAG_UINT16,  0 },
-    { "int32_t",  GI_TYPE_TAG_INT32,   0 },
     { "int32",    GI_TYPE_TAG_INT32,   0 },
-    { "gint32",   GI_TYPE_TAG_INT32,   0 },
-    { "uint32_t", GI_TYPE_TAG_UINT32,  0 },
     { "uint32",   GI_TYPE_TAG_UINT32,  0 },
-    { "guint32",  GI_TYPE_TAG_UINT32,  0 },
-    { "int64_t",  GI_TYPE_TAG_INT64,   0 },
     { "int64",    GI_TYPE_TAG_INT64,   0 },
-    { "gint64",   GI_TYPE_TAG_INT64,   0 },
-    { "uint64_t", GI_TYPE_TAG_UINT64,  0 },
     { "uint64",   GI_TYPE_TAG_UINT64,  0 },
-    { "guint64",  GI_TYPE_TAG_UINT64,  0 },
     { "int",      GI_TYPE_TAG_INT,     0 },
-    { "gint",     GI_TYPE_TAG_INT,     0 },
     { "uint",     GI_TYPE_TAG_UINT,    0 },
-    { "guint",    GI_TYPE_TAG_UINT,    0 },
     { "long",     GI_TYPE_TAG_LONG,    0 },
-    { "glong",    GI_TYPE_TAG_LONG,    0 },
     { "ulong",    GI_TYPE_TAG_ULONG,   0 },
-    { "gulong",   GI_TYPE_TAG_ULONG,   0 },
     { "ssize_t",  GI_TYPE_TAG_SSIZE,   0 },
-    { "gssize",   GI_TYPE_TAG_SSIZE,   0 },
+    { "ssize",    GI_TYPE_TAG_SSIZE,   0 },
     { "size_t",   GI_TYPE_TAG_SIZE,    0 },
-    { "gsize",    GI_TYPE_TAG_SIZE,    0 },
+    { "size",     GI_TYPE_TAG_SIZE,    0 },
     { "float",    GI_TYPE_TAG_FLOAT,   0 },
-    { "gfloat",   GI_TYPE_TAG_FLOAT,   0 },
     { "double",   GI_TYPE_TAG_DOUBLE,  0 },
-    { "gdouble",  GI_TYPE_TAG_DOUBLE,  0 },
     { "utf8",     GI_TYPE_TAG_UTF8,    1 },  
-    { "gchar*",   GI_TYPE_TAG_UTF8,    1 },  
     { "filename", GI_TYPE_TAG_FILENAME,1 },
-    // FIXME merge - do we still want this?
+
+    /* FIXME: merge - do we still want this? */
     { "string",   GI_TYPE_TAG_UTF8,  1 }
+
+    /* FIXME: Remove these */
+    { "void",     GI_TYPE_TAG_VOID,    0 },
+    { "int8_t",   GI_TYPE_TAG_INT8,    0 },
+    { "uint8_t",  GI_TYPE_TAG_UINT8,   0 },
+    { "int16_t",  GI_TYPE_TAG_INT16,   0 },
+    { "uint16_t", GI_TYPE_TAG_UINT16,  0 },
+    { "int32_t",  GI_TYPE_TAG_INT32,   0 },
+    { "uint32_t", GI_TYPE_TAG_UINT32,  0 },
+    { "int64_t",  GI_TYPE_TAG_INT64,   0 },
+    { "uint64_t", GI_TYPE_TAG_UINT64,  0 },
+    { "gpointer", GI_TYPE_TAG_VOID,    1 },
+    { "gboolean", GI_TYPE_TAG_BOOLEAN, 0 },
+    { "gchar",    GI_TYPE_TAG_INT8,    0 },
+    { "guchar",   GI_TYPE_TAG_UINT8,   0 },
+    { "gunichar", GI_TYPE_TAG_UINT32,  0 },
+    { "gint",     GI_TYPE_TAG_INT,     0 },
+    { "guint",    GI_TYPE_TAG_UINT,    0 },
+    { "gint8",    GI_TYPE_TAG_INT8,    0 },
+    { "guint8",   GI_TYPE_TAG_UINT8,   0 },
+    { "gint16",   GI_TYPE_TAG_INT16,   0 },
+    { "guint16",  GI_TYPE_TAG_UINT16,  0 },
+    { "gint32",   GI_TYPE_TAG_INT32,   0 },
+    { "guint32",  GI_TYPE_TAG_UINT32,  0 },
+    { "gint64",   GI_TYPE_TAG_INT64,   0 },
+    { "guint64",  GI_TYPE_TAG_UINT64,  0 },
+    { "glong",    GI_TYPE_TAG_LONG,    0 },
+    { "gulong",   GI_TYPE_TAG_ULONG,   0 },
+    { "gssize",   GI_TYPE_TAG_SSIZE,   0 },
+    { "gsize",    GI_TYPE_TAG_SIZE,    0 },
+    { "gfloat",   GI_TYPE_TAG_FLOAT,   0 },
+    { "gdouble",  GI_TYPE_TAG_DOUBLE,  0 },
+    { "gchar*",   GI_TYPE_TAG_UTF8,    1 },  
   };  
 
   gint n_basic = G_N_ELEMENTS (basic);