* 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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.h"
+#include "config.h"
-/* ok, this is a bit hackish, have to provide gruntime log domain as
- * we don't link against -lgruntime
- */
-char *g_log_domain_gruntime = "GLib-Genmarshal";
+#include <stdlib.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
-#include <glib.h>
+#include <glib/gstdio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "GLib-Genmarshal"
+#include <glib.h>
+#include <glib/gprintf.h>
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#endif
#ifdef G_OS_WIN32
#include <io.h>
#endif
gchar *keyword; /* marhaller list keyword [MY_STRING] */
const gchar *sig_name; /* signature name [STRING] */
const gchar *ctype; /* C type name [gchar*] */
+ const gchar *promoted_ctype; /* promoted C type name [gchar*] */
const gchar *getter; /* value getter function [g_value_get_string] */
+ const gchar *box; /* value box function [g_strdup] */
+ const gchar *unbox; /* value unbox function [g_free] */
+ gboolean box_ignores_static; /* Wether the box/unbox functions ignore the static_scope */
+ gboolean box_takes_type; /* Wether the box/unbox functions take a type arg */
} InArgument;
typedef struct
{
const gchar *sig_name; /* signature name [STRING] */
const gchar *ctype; /* C type name [gchar*] */
const gchar *setter; /* value setter function [g_value_set_string] */
- const gchar *release; /* value release function [g_free] */
} OutArgument;
typedef struct
{
/* --- variables --- */
-static FILE *fout = NULL;
-static GScannerConfig scanner_config_template =
+static const GScannerConfig scanner_config_template =
{
(
" \t\r" /* "\n" is statement delimiter */
FALSE /* symbol_2_token */,
FALSE /* scope_0_fallback */,
};
-static gchar *std_marshaller_prefix = "g_cclosure_marshal";
+static gchar * const std_marshaller_prefix = "g_cclosure_marshal";
static gchar *marshaller_prefix = "g_cclosure_user_marshal";
static GHashTable *marshallers = NULL;
+static FILE *fout = NULL;
static gboolean gen_cheader = FALSE;
static gboolean gen_cbody = FALSE;
+static gboolean gen_internal = FALSE;
+static gboolean gen_valist = FALSE;
static gboolean skip_ploc = FALSE;
static gboolean std_includes = TRUE;
+static gint exit_status = 0;
/* --- functions --- */
+static void
+put_marshal_value_getters (void)
+{
+ fputs ("\n", fout);
+ fputs ("#ifdef G_ENABLE_DEBUG\n", fout);
+ fputs ("#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_char(v) g_value_get_schar (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_int(v) g_value_get_int (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_uint(v) g_value_get_uint (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_long(v) g_value_get_long (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_enum(v) g_value_get_enum (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_flags(v) g_value_get_flags (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_float(v) g_value_get_float (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_double(v) g_value_get_double (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_param(v) g_value_get_param (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_object(v) g_value_get_object (v)\n", fout);
+ fputs ("#define g_marshal_value_peek_variant(v) g_value_get_variant (v)\n", fout);
+ fputs ("#else /* !G_ENABLE_DEBUG */\n", fout);
+ fputs ("/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.\n", fout);
+ fputs (" * Do not access GValues directly in your code. Instead, use the\n", fout);
+ fputs (" * g_value_get_*() functions\n", fout);
+ fputs (" */\n", fout);
+ fputs ("#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int\n", fout);
+ fputs ("#define g_marshal_value_peek_char(v) (v)->data[0].v_int\n", fout);
+ fputs ("#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint\n", fout);
+ fputs ("#define g_marshal_value_peek_int(v) (v)->data[0].v_int\n", fout);
+ fputs ("#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint\n", fout);
+ fputs ("#define g_marshal_value_peek_long(v) (v)->data[0].v_long\n", fout);
+ fputs ("#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong\n", fout);
+ fputs ("#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64\n", fout);
+ fputs ("#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64\n", fout);
+ fputs ("#define g_marshal_value_peek_enum(v) (v)->data[0].v_long\n", fout);
+ fputs ("#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong\n", fout);
+ fputs ("#define g_marshal_value_peek_float(v) (v)->data[0].v_float\n", fout);
+ fputs ("#define g_marshal_value_peek_double(v) (v)->data[0].v_double\n", fout);
+ fputs ("#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer\n", fout);
+ fputs ("#endif /* !G_ENABLE_DEBUG */\n", fout);
+ fputs ("\n", fout);
+}
+
static gboolean
complete_in_arg (InArgument *iarg)
{
static const InArgument args[] = {
- /* keyword sig_name ctype getter */
- { "VOID", "VOID", "void", NULL, },
- { "BOOLEAN", "BOOLEAN", "gboolean", "g_value_get_boolean", },
- { "CHAR", "CHAR", "gchar", "g_value_get_char", },
- { "UCHAR", "UCHAR", "guchar", "g_value_get_uchar", },
- { "INT", "INT", "gint", "g_value_get_int", },
- { "UINT", "UINT", "guint", "g_value_get_uint", },
- { "LONG", "LONG", "glong", "g_value_get_long", },
- { "ULONG", "ULONG", "gulong", "g_value_get_ulong", },
- { "ENUM", "ENUM", "gint", "g_value_get_enum", },
- { "FLAGS", "FLAGS", "guint", "g_value_get_flags", },
- { "FLOAT", "FLOAT", "gfloat", "g_value_get_float", },
- { "DOUBLE", "DOUBLE", "gdouble", "g_value_get_double", },
- { "STRING", "STRING", "gpointer", "(char*) g_value_get_string", },
- { "PARAM", "PARAM", "gpointer", "g_value_get_param", },
- { "BOXED", "BOXED", "gpointer", "g_value_get_boxed", },
- { "POINTER", "POINTER", "gpointer", "g_value_get_pointer", },
- { "OBJECT", "OBJECT", "gpointer", "g_value_get_object", },
+ /* keyword sig_name ctype promoted getter */
+ { "VOID", "VOID", "void", "void", NULL, },
+ { "BOOLEAN", "BOOLEAN", "gboolean", "gboolean", "g_marshal_value_peek_boolean", },
+ { "CHAR", "CHAR", "gchar", "gint", "g_marshal_value_peek_char", },
+ { "UCHAR", "UCHAR", "guchar", "guint", "g_marshal_value_peek_uchar", },
+ { "INT", "INT", "gint", "gint", "g_marshal_value_peek_int", },
+ { "UINT", "UINT", "guint", "guint", "g_marshal_value_peek_uint", },
+ { "LONG", "LONG", "glong", "glong", "g_marshal_value_peek_long", },
+ { "ULONG", "ULONG", "gulong", "gulong", "g_marshal_value_peek_ulong", },
+ { "INT64", "INT64", "gint64", "gint64", "g_marshal_value_peek_int64", },
+ { "UINT64", "UINT64", "guint64", "guint64", "g_marshal_value_peek_uint64", },
+ { "ENUM", "ENUM", "gint", "gint", "g_marshal_value_peek_enum", },
+ { "FLAGS", "FLAGS", "guint", "guint", "g_marshal_value_peek_flags", },
+ { "FLOAT", "FLOAT", "gfloat", "gdouble", "g_marshal_value_peek_float", },
+ { "DOUBLE", "DOUBLE", "gdouble", "gdouble", "g_marshal_value_peek_double", },
+ { "STRING", "STRING", "gpointer", "gpointer", "g_marshal_value_peek_string", "g_strdup", "g_free"},
+ { "PARAM", "PARAM", "gpointer", "gpointer", "g_marshal_value_peek_param", "g_param_spec_ref", "g_param_spec_unref"},
+ { "BOXED", "BOXED", "gpointer", "gpointer", "g_marshal_value_peek_boxed", "g_boxed_copy", "g_boxed_free", FALSE, TRUE},
+ { "POINTER", "POINTER", "gpointer", "gpointer", "g_marshal_value_peek_pointer", },
+ { "OBJECT", "OBJECT", "gpointer", "gpointer", "g_marshal_value_peek_object", "g_object_ref", "g_object_unref", TRUE},
+ { "VARIANT", "VARIANT", "gpointer", "gpointer", "g_marshal_value_peek_variant", "g_variant_ref_sink", "g_variant_unref"},
/* deprecated: */
- { "NONE", "VOID", "void", NULL, },
- { "BOOL", "BOOLEAN", "gboolean", "g_value_get_boolean", },
+ { "NONE", "VOID", "void", "void", NULL, },
+ { "BOOL", "BOOLEAN", "gboolean", "gboolean", "g_marshal_value_peek_boolean", },
};
- const guint n_args = sizeof (args) / sizeof (args[0]);
guint i;
g_return_val_if_fail (iarg != NULL, FALSE);
- for (i = 0; i < n_args; i++)
+ for (i = 0; i < G_N_ELEMENTS (args); i++)
if (strcmp (args[i].keyword, iarg->keyword) == 0)
{
iarg->sig_name = args[i].sig_name;
iarg->ctype = args[i].ctype;
+ iarg->promoted_ctype = args[i].promoted_ctype;
iarg->getter = args[i].getter;
+ iarg->box = args[i].box;
+ iarg->unbox = args[i].unbox;
+ iarg->box_ignores_static = args[i].box_ignores_static;
+ iarg->box_takes_type = args[i].box_takes_type;
return TRUE;
}
complete_out_arg (OutArgument *oarg)
{
static const OutArgument args[] = {
- /* keyword sig_name ctype setter release */
- { "VOID", "VOID", "void", NULL, NULL, },
- { "BOOLEAN", "BOOLEAN", "gboolean", "g_value_set_boolean", NULL, },
- { "CHAR", "CHAR", "gchar", "g_value_set_char", NULL, },
- { "UCHAR", "UCHAR", "guchar", "g_value_set_uchar", NULL, },
- { "INT", "INT", "gint", "g_value_set_int", NULL, },
- { "UINT", "UINT", "guint", "g_value_set_uint", NULL, },
- { "LONG", "LONG", "glong", "g_value_set_long", NULL, },
- { "ULONG", "ULONG", "gulong", "g_value_set_ulong", NULL, },
- { "ENUM", "ENUM", "gint", "g_value_set_enum", NULL, },
- { "FLAGS", "FLAGS", "guint", "g_value_set_flags", NULL, },
- { "FLOAT", "FLOAT", "gfloat", "g_value_set_float", NULL, },
- { "DOUBLE", "DOUBLE", "gdouble", "g_value_set_double", NULL, },
- { "STRING", "STRING", "gchar*", "g_value_set_string_take_ownership", NULL, },
- { "PARAM", "PARAM", "GParamSpec*", "g_value_set_param", "g_param_spec_unref", },
- { "BOXED", "BOXED", "gpointer", "g_value_set_boxed_take_ownership", NULL, },
- { "POINTER", "POINTER", "gpointer", "g_value_set_pointer", NULL, },
- { "OBJECT", "OBJECT", "GObject*", "g_value_set_object", "g_object_unref", },
+ /* keyword sig_name ctype setter */
+ { "VOID", "VOID", "void", NULL, },
+ { "BOOLEAN", "BOOLEAN", "gboolean", "g_value_set_boolean", },
+ { "CHAR", "CHAR", "gchar", "g_value_set_char", },
+ { "UCHAR", "UCHAR", "guchar", "g_value_set_uchar", },
+ { "INT", "INT", "gint", "g_value_set_int", },
+ { "UINT", "UINT", "guint", "g_value_set_uint", },
+ { "LONG", "LONG", "glong", "g_value_set_long", },
+ { "ULONG", "ULONG", "gulong", "g_value_set_ulong", },
+ { "INT64", "INT64", "gint64", "g_value_set_int64", },
+ { "UINT64", "UINT64", "guint64", "g_value_set_uint64", },
+ { "ENUM", "ENUM", "gint", "g_value_set_enum", },
+ { "FLAGS", "FLAGS", "guint", "g_value_set_flags", },
+ { "FLOAT", "FLOAT", "gfloat", "g_value_set_float", },
+ { "DOUBLE", "DOUBLE", "gdouble", "g_value_set_double", },
+ { "STRING", "STRING", "gchar*", "g_value_take_string", },
+ { "PARAM", "PARAM", "GParamSpec*", "g_value_take_param", },
+ { "BOXED", "BOXED", "gpointer", "g_value_take_boxed", },
+ { "POINTER", "POINTER", "gpointer", "g_value_set_pointer", },
+ { "OBJECT", "OBJECT", "GObject*", "g_value_take_object", },
+ { "VARIANT", "VARIANT", "GVariant*", "g_value_take_variant", },
/* deprecated: */
- { "NONE", "VOID", "void", NULL, NULL, },
- { "BOOL", "BOOLEAN", "gboolean", "g_value_set_boolean", NULL, },
+ { "NONE", "VOID", "void", NULL, },
+ { "BOOL", "BOOLEAN", "gboolean", "g_value_set_boolean", },
};
- const guint n_args = sizeof (args) / sizeof (args[0]);
guint i;
g_return_val_if_fail (oarg != NULL, FALSE);
- for (i = 0; i < n_args; i++)
+ for (i = 0; i < G_N_ELEMENTS (args); i++)
if (strcmp (args[i].keyword, oarg->keyword) == 0)
{
oarg->sig_name = args[i].sig_name;
oarg->ctype = args[i].ctype;
oarg->setter = args[i].setter;
- oarg->release = args[i].release;
return TRUE;
}
{
g_free (buffer);
buffer = g_strdup_printf ("%s ", string);
- g_warning ("overfull string (%u bytes) for padspace", (guint) strlen (string));
+ g_warning ("overfull string (%u bytes) for padspace",
+ (guint) strlen (string));
+ exit_status |= 2;
return buffer;
}
gboolean have_std_marshaller = FALSE;
/* here we have to make sure a marshaller named <marshaller_prefix>_<signame>
- * exists. we might have put it out already, can revert to a standard marshaller
- * provided by glib, or need to generate one.
+ * exists. we might have put it out already, can revert to a standard
+ * marshaller provided by glib, or need to generate one.
*/
if (g_hash_table_lookup (marshallers, tmp))
g_free (tmp);
}
+ /* GValue marshaller */
if (gen_cheader && have_std_marshaller)
{
- fprintf (fout, "#define %s_%s\t%s_%s\n", marshaller_prefix, signame, std_marshaller_prefix, signame);
+ g_fprintf (fout, "#define %s_%s\t%s_%s\n", marshaller_prefix, signame, std_marshaller_prefix, signame);
}
if (gen_cheader && !have_std_marshaller)
{
- ind = fprintf (fout, "extern void ");
- ind += fprintf (fout, "%s_%s (", marshaller_prefix, signame);
- fprintf (fout, "GClosure *closure,\n");
- fprintf (fout, "%sGValue *return_value,\n", indent (ind));
- fprintf (fout, "%sguint n_param_values,\n", indent (ind));
- fprintf (fout, "%sconst GValue *param_values,\n", indent (ind));
- fprintf (fout, "%sgpointer invocation_hint,\n", indent (ind));
- fprintf (fout, "%sgpointer marshal_data);\n", indent (ind));
+ ind = g_fprintf (fout, gen_internal ? "G_GNUC_INTERNAL " : "extern ");
+ ind += g_fprintf (fout, "void ");
+ ind += g_fprintf (fout, "%s_%s (", marshaller_prefix, signame);
+ g_fprintf (fout, "GClosure *closure,\n");
+ g_fprintf (fout, "%sGValue *return_value,\n", indent (ind));
+ g_fprintf (fout, "%sguint n_param_values,\n", indent (ind));
+ g_fprintf (fout, "%sconst GValue *param_values,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer invocation_hint,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer marshal_data);\n",
+ indent (ind));
}
if (gen_cbody && !have_std_marshaller)
{
- /* cfile marhsal header */
- fprintf (fout, "void\n");
- ind = fprintf (fout, "%s_%s (", marshaller_prefix, signame);
- fprintf (fout, "GClosure *closure,\n");
- fprintf (fout, "%sGValue *return_value,\n", indent (ind));
- fprintf (fout, "%sguint n_param_values,\n", indent (ind));
- fprintf (fout, "%sconst GValue *param_values,\n", indent (ind));
- fprintf (fout, "%sgpointer invocation_hint,\n", indent (ind));
- fprintf (fout, "%sgpointer marshal_data)\n", indent (ind));
- fprintf (fout, "{\n");
+ /* cfile marshal header */
+ g_fprintf (fout, "void\n");
+ ind = g_fprintf (fout, "%s_%s (", marshaller_prefix, signame);
+ g_fprintf (fout, "GClosure *closure,\n");
+ g_fprintf (fout, "%sGValue *return_value G_GNUC_UNUSED,\n", indent (ind));
+ g_fprintf (fout, "%sguint n_param_values,\n", indent (ind));
+ g_fprintf (fout, "%sconst GValue *param_values,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer invocation_hint G_GNUC_UNUSED,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer marshal_data)\n", indent (ind));
+ g_fprintf (fout, "{\n");
/* cfile GMarshalFunc typedef */
- ind = fprintf (fout, " typedef %s (*GMarshalFunc_%s) (", sig->rarg->ctype, signame);
- fprintf (fout, "%s data1,\n", pad ("gpointer"));
+ ind = g_fprintf (fout, " typedef %s (*GMarshalFunc_%s) (", sig->rarg->ctype, signame);
+ g_fprintf (fout, "%s data1,\n", pad ("gpointer"));
for (a = 1, node = sig->args; node; node = node->next)
{
InArgument *iarg = node->data;
if (iarg->getter)
- fprintf (fout, "%s%s arg_%d,\n", indent (ind), pad (iarg->ctype), a++);
+ g_fprintf (fout, "%s%s arg_%d,\n", indent (ind), pad (iarg->ctype), a++);
}
- fprintf (fout, "%s%s data2);\n", indent (ind), pad ("gpointer"));
+ g_fprintf (fout, "%s%s data2);\n", indent (ind), pad ("gpointer"));
/* cfile marshal variables */
- fprintf (fout, " register GMarshalFunc_%s callback;\n", signame);
- fprintf (fout, " register GCClosure *cc = (GCClosure*) closure;\n");
- fprintf (fout, " register gpointer data1, data2;\n");
+ g_fprintf (fout, " register GMarshalFunc_%s callback;\n", signame);
+ g_fprintf (fout, " register GCClosure *cc = (GCClosure*) closure;\n");
+ g_fprintf (fout, " register gpointer data1, data2;\n");
if (sig->rarg->setter)
- fprintf (fout, " %s v_return;\n", sig->rarg->ctype);
+ g_fprintf (fout, " %s v_return;\n", sig->rarg->ctype);
if (sig->args || sig->rarg->setter)
{
- fprintf (fout, "\n");
+ g_fprintf (fout, "\n");
if (sig->rarg->setter)
- fprintf (fout, " g_return_if_fail (return_value != NULL);\n");
+ g_fprintf (fout, " g_return_if_fail (return_value != NULL);\n");
if (sig->args)
{
for (a = 0, node = sig->args; node; node = node->next)
if (iarg->getter)
a++;
}
- fprintf (fout, " g_return_if_fail (n_param_values == %u);\n", 1 + a);
+ g_fprintf (fout, " g_return_if_fail (n_param_values == %u);\n", 1 + a);
}
}
/* cfile marshal data1, data2 and callback setup */
- fprintf (fout, "\n");
- fprintf (fout, " if (G_CCLOSURE_SWAP_DATA (closure))\n {\n");
- fprintf (fout, " data1 = closure->data;\n");
- fprintf (fout, " data2 = g_value_peek_pointer (param_values + 0);\n");
- fprintf (fout, " }\n else\n {\n");
- fprintf (fout, " data1 = g_value_peek_pointer (param_values + 0);\n");
- fprintf (fout, " data2 = closure->data;\n");
- fprintf (fout, " }\n");
- fprintf (fout, " callback = (GMarshalFunc_%s) (marshal_data ? marshal_data : cc->callback);\n", signame);
+ g_fprintf (fout, "\n");
+ g_fprintf (fout, " if (G_CCLOSURE_SWAP_DATA (closure))\n {\n");
+ g_fprintf (fout, " data1 = closure->data;\n");
+ g_fprintf (fout, " data2 = g_value_peek_pointer (param_values + 0);\n");
+ g_fprintf (fout, " }\n else\n {\n");
+ g_fprintf (fout, " data1 = g_value_peek_pointer (param_values + 0);\n");
+ g_fprintf (fout, " data2 = closure->data;\n");
+ g_fprintf (fout, " }\n");
+ g_fprintf (fout, " callback = (GMarshalFunc_%s) (marshal_data ? marshal_data : cc->callback);\n", signame);
/* cfile marshal callback action */
- fprintf (fout, "\n");
- ind = fprintf (fout, " %s callback (", sig->rarg->setter ? " v_return =" : "");
- fprintf (fout, "data1,\n");
+ g_fprintf (fout, "\n");
+ ind = g_fprintf (fout, " %s callback (", sig->rarg->setter ? " v_return =" : "");
+ g_fprintf (fout, "data1,\n");
for (a = 1, node = sig->args; node; node = node->next)
{
InArgument *iarg = node->data;
if (iarg->getter)
- fprintf (fout, "%s%s (param_values + %d),\n", indent (ind), iarg->getter, a++);
+ g_fprintf (fout, "%s%s (param_values + %d),\n", indent (ind), iarg->getter, a++);
}
- fprintf (fout, "%sdata2);\n", indent (ind));
+ g_fprintf (fout, "%sdata2);\n", indent (ind));
/* cfile marshal return value storage */
if (sig->rarg->setter)
{
- fprintf (fout, "\n");
- fprintf (fout, " %s (return_value, v_return);\n", sig->rarg->setter);
- if (sig->rarg->release)
- fprintf (fout, " %s (v_return);\n", sig->rarg->release);
+ g_fprintf (fout, "\n");
+ g_fprintf (fout, " %s (return_value, v_return);\n", sig->rarg->setter);
}
/* cfile marshal footer */
- fprintf (fout, "}\n");
+ g_fprintf (fout, "}\n");
+ }
+
+
+ /* vararg marshaller */
+ if (gen_cheader && gen_valist && have_std_marshaller)
+ {
+ g_fprintf (fout, "#define %s_%sv\t%s_%sv\n", marshaller_prefix, signame, std_marshaller_prefix, signame);
+ }
+ if (gen_cheader && gen_valist && !have_std_marshaller)
+ {
+ ind = g_fprintf (fout, gen_internal ? "G_GNUC_INTERNAL " : "extern ");
+ ind += g_fprintf (fout, "void ");
+ ind += g_fprintf (fout, "%s_%sv (", marshaller_prefix, signame);
+ g_fprintf (fout, "GClosure *closure,\n");
+ g_fprintf (fout, "%sGValue *return_value,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer instance,\n", indent (ind));
+ g_fprintf (fout, "%sva_list args,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer marshal_data,\n", indent (ind));
+ g_fprintf (fout, "%sint n_params,\n", indent (ind));
+ g_fprintf (fout, "%sGType *param_types);\n", indent (ind));
+ }
+ if (gen_cbody && gen_valist && !have_std_marshaller)
+ {
+ gint i;
+ gboolean has_arg;
+
+ g_fprintf (fout, "void\n");
+ ind = g_fprintf (fout, "%s_%sv (", marshaller_prefix, signame);
+ g_fprintf (fout, "GClosure *closure,\n");
+ g_fprintf (fout, "%sGValue *return_value,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer instance,\n", indent (ind));
+ g_fprintf (fout, "%sva_list args,\n", indent (ind));
+ g_fprintf (fout, "%sgpointer marshal_data,\n", indent (ind));
+ g_fprintf (fout, "%sint n_params,\n", indent (ind));
+ g_fprintf (fout, "%sGType *param_types)\n", indent (ind));
+ g_fprintf (fout, "{\n");
+
+ ind = g_fprintf (fout, " typedef %s (*GMarshalFunc_%s) (", sig->rarg->ctype, signame);
+ g_fprintf (fout, "%s instance", pad ("gpointer"));
+ for (a = 0, node = sig->args; node; node = node->next)
+ {
+ InArgument *iarg = node->data;
+
+ if (iarg->getter)
+ g_fprintf (fout, ",\n%s%s arg_%d", indent (ind), pad (iarg->ctype), a++);
+ }
+ g_fprintf (fout, ",\n%s%s data);\n", indent (ind), pad ("gpointer"));
+ g_fprintf (fout, " GCClosure *cc = (GCClosure*) closure;\n");
+ g_fprintf (fout, " gpointer data1, data2;\n");
+ g_fprintf (fout, " GMarshalFunc_%s callback;\n", signame);
+ has_arg = FALSE;
+
+ i = 0;
+ for (node = sig->args; node; node = node->next)
+ {
+ InArgument *iarg = node->data;
+
+ if (iarg->getter)
+ {
+ g_fprintf (fout, " %s arg%i;\n", iarg->ctype, i++);
+ has_arg = TRUE;
+ }
+ }
+ if (has_arg)
+ g_fprintf (fout, " va_list args_copy;\n");
+
+ if (sig->rarg->setter)
+ g_fprintf (fout, " %s v_return;\n", sig->rarg->ctype);
+
+ if (sig->rarg->setter)
+ {
+ g_fprintf (fout, "\n");
+ g_fprintf (fout, " g_return_if_fail (return_value != NULL);\n");
+ }
+
+ /* cfile marshal data1, data2 and callback setup */
+ if (has_arg)
+ {
+ g_fprintf (fout, "\n");
+ g_fprintf (fout, " G_VA_COPY (args_copy, args);\n");
+ i = 0;
+ for (node = sig->args; node; node = node->next)
+ {
+ InArgument *iarg = node->data;
+
+ if (iarg->getter)
+ {
+ g_fprintf (fout, " arg%i = (%s) va_arg (args_copy, %s);\n",
+ i, iarg->ctype, iarg->promoted_ctype);
+
+ if (iarg->box != NULL)
+ {
+ g_fprintf (fout, " if (");
+ if (!iarg->box_ignores_static)
+ g_fprintf (fout, "(param_types[%i] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && ", i);
+ g_fprintf (fout, "arg%i != NULL)\n ", i);
+ if (iarg->box_takes_type)
+ g_fprintf (fout,
+ " arg%i = %s (param_types[%i] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg%i);\n",
+ i, iarg->box, i, i);
+ else
+ g_fprintf (fout,
+ " arg%i = %s (arg%i);\n",
+ i, iarg->box, i);
+ }
+ }
+ i++;
+ }
+ g_fprintf (fout, " va_end (args_copy);\n");
+ }
+
+ g_fprintf (fout, "\n");
+ /* cfile marshal data1, data2 and callback setup */
+ g_fprintf (fout, " if (G_CCLOSURE_SWAP_DATA (closure))\n {\n");
+ g_fprintf (fout, " data1 = closure->data;\n");
+ g_fprintf (fout, " data2 = instance;\n");
+ g_fprintf (fout, " }\n else\n {\n");
+ g_fprintf (fout, " data1 = instance;\n");
+ g_fprintf (fout, " data2 = closure->data;\n");
+ g_fprintf (fout, " }\n");
+ g_fprintf (fout, " callback = (GMarshalFunc_%s) (marshal_data ? marshal_data : cc->callback);\n", signame);
+
+ /* cfile marshal callback action */
+ g_fprintf (fout, "\n");
+ ind = g_fprintf (fout, " %s callback (", sig->rarg->setter ? " v_return =" : "");
+ g_fprintf (fout, "data1");
+
+ i = 0;
+ for (node = sig->args; node; node = node->next)
+ {
+ InArgument *iarg = node->data;
+
+ if (iarg->getter)
+ g_fprintf (fout, ",\n%sarg%i", indent (ind), i++);
+ }
+ g_fprintf (fout, ",\n%sdata2);\n", indent (ind));
+
+ i = 0;
+ for (node = sig->args; node; node = node->next)
+ {
+ InArgument *iarg = node->data;
+
+ if (iarg->unbox)
+ {
+ g_fprintf (fout, " if (");
+ if (!iarg->box_ignores_static)
+ g_fprintf (fout, "(param_types[%i] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && ", i);
+ g_fprintf (fout, "arg%i != NULL)\n ", i);
+ if (iarg->box_takes_type)
+ g_fprintf (fout,
+ " %s (param_types[%i] & ~G_SIGNAL_TYPE_STATIC_SCOPE, arg%i);\n",
+ iarg->unbox, i, i);
+ else
+ g_fprintf (fout,
+ " %s (arg%i);\n",
+ iarg->unbox, i);
+ }
+ i++;
+ }
+
+ /* cfile marshal return value storage */
+ if (sig->rarg->setter)
+ {
+ g_fprintf (fout, "\n");
+ g_fprintf (fout, " %s (return_value, v_return);\n", sig->rarg->setter);
+ }
+
+ g_fprintf (fout, "}\n\n");
}
}
if (!complete_out_arg (sig->rarg))
{
g_warning ("unknown type: %s", sig->rarg->keyword);
+ exit_status |= 1;
return;
}
for (node = sig->args; node; node = node->next)
if (!complete_in_arg (iarg))
{
g_warning ("unknown type: %s", iarg->keyword);
+ exit_status |= 1;
return;
}
}
}
/* introductionary comment */
- fprintf (fout, "\n/* %s", sig->rarg->keyword);
+ g_fprintf (fout, "\n/* %s", sig->rarg->keyword);
for (node = sig->args; node; node = node->next)
{
InArgument *iarg = node->data;
- fprintf (fout, "%c%s", node->prev ? ',' : ':', iarg->keyword);
+ g_fprintf (fout, "%c%s", node->prev ? ',' : ':', iarg->keyword);
}
if (!skip_ploc)
- fprintf (fout, " (%s)", sig->ploc);
- fprintf (fout, " */\n");
+ g_fprintf (fout, " (%s)", sig->ploc);
+ g_fprintf (fout, " */\n");
/* ensure technical marshaller exists (<marshaller_prefix>_<sname>) */
generate_marshal (sname, sig);
tmp = g_strconcat (marshaller_prefix, "_", pname, NULL);
if (gen_cheader && !g_hash_table_lookup (marshallers, tmp))
{
- fprintf (fout, "#define %s_%s\t%s_%s\n", marshaller_prefix, pname, marshaller_prefix, sname);
+ g_fprintf (fout, "#define %s_%s\t%s_%s\n", marshaller_prefix, pname, marshaller_prefix, sname);
g_hash_table_insert (marshallers, tmp, tmp);
}
return G_TOKEN_IDENTIFIER;
sig->args = g_list_append (sig->args, new_in_arg (scanner->value.v_identifier));
}
-
+
/* expect end of line, done */
if (g_scanner_get_next_token (scanner) != '\n')
return '\n';
-
+
/* success */
return G_TOKEN_NONE;
}
main (int argc,
char *argv[])
{
- const gchar *gruntime_marshallers[] = {
+ const gchar *gobject_marshallers[] = {
#include "gmarshal.strings"
};
GScanner *scanner;
else
files = g_slist_prepend (files, "/dev/stdin");
- /* setup auxillary structs */
+ /* setup auxiliary structs */
scanner = g_scanner_new (&scanner_config_template);
fout = stdout;
marshallers = g_hash_table_new (g_str_hash, g_str_equal);
- /* add GRuntime standard marshallers */
+ /* add standard marshallers of the GObject library */
if (std_includes)
- for (i = 0; i < sizeof (gruntime_marshallers) / sizeof (gruntime_marshallers[0]); i++)
+ for (i = 0; i < G_N_ELEMENTS (gobject_marshallers); i++)
{
- gchar *tmp = g_strdup (gruntime_marshallers[i]);
-
+ gchar *tmp = g_strdup (gobject_marshallers[i]);
+
g_hash_table_insert (marshallers, tmp, tmp);
}
/* put out initial heading */
- fprintf (fout, "\n");
- if (gen_cheader)
+ g_fprintf (fout, "\n");
+
+ if (gen_cheader && std_includes)
{
- if (std_includes)
- fprintf (fout, "#include\t<gobject/gmarshal.h>\n\n");
- fprintf (fout, "G_BEGIN_DECLS\n");
+ g_fprintf (fout, "#ifndef __%s_MARSHAL_H__\n", marshaller_prefix);
+ g_fprintf (fout, "#define __%s_MARSHAL_H__\n\n", marshaller_prefix);
}
+ if ((gen_cheader || gen_cbody) && std_includes)
+ g_fprintf (fout, "#include\t<glib-object.h>\n\n");
+
+ if (gen_cheader)
+ g_fprintf (fout, "G_BEGIN_DECLS\n");
+
+ /* generate necessary preprocessor directives */
+ if (gen_cbody)
+ put_marshal_value_getters ();
+
/* process input files */
for (slist = files; slist; slist = slist->next)
{
gchar *file = slist->data;
- gint fd = open (file, O_RDONLY);
+ gint fd;
+
+ if (strcmp (file, "/dev/stdin") == 0)
+ /* Mostly for Win32. This is equivalent to opening /dev/stdin */
+ fd = dup (0);
+ else
+ fd = g_open (file, O_RDONLY, 0);
if (fd < 0)
{
g_warning ("failed to open \"%s\": %s", file, g_strerror (errno));
+ exit_status |= 1;
continue;
}
/* parse & process file */
g_scanner_input_file (scanner, fd);
-
- /* scanning loop, we parse the input untill it's end is reached,
+
+ /* scanning loop, we parse the input until its end is reached,
* or our sub routine came across invalid syntax
*/
do
{
guint expected_token = G_TOKEN_NONE;
- switch (g_scanner_peek_next_token (scanner))
+ switch ((guint) g_scanner_peek_next_token (scanner))
{
case '\n':
/* eat newline and restart */
GList *node;
expected_token = parse_line (scanner, &signature);
-
+
/* once we got a valid signature, process it */
if (expected_token == G_TOKEN_NONE)
process_signature (&signature);
-
+
/* clean up signature contents */
g_free (signature.ploc);
if (signature.rarg)
for (node = signature.args; node; node = node->next)
{
InArgument *iarg = node->data;
-
+
g_free (iarg->keyword);
g_free (iarg);
}
if (expected_token != G_TOKEN_NONE)
{
g_scanner_unexp_token (scanner, expected_token, "type name", NULL, NULL, NULL, TRUE);
+ exit_status |= 1;
break;
}
/* put out trailer */
if (gen_cheader)
{
- fprintf (fout, "\nG_END_DECLS\n");
+ g_fprintf (fout, "\nG_END_DECLS\n");
+
+ if (std_includes)
+ g_fprintf (fout, "\n#endif /* __%s_MARSHAL_H__ */\n", marshaller_prefix);
}
- fprintf (fout, "\n");
+ g_fprintf (fout, "\n");
/* clean up */
g_slist_free (files);
g_hash_table_foreach_remove (marshallers, string_key_destroy, NULL);
g_hash_table_destroy (marshallers);
- return 0;
+ return exit_status;
}
static void
guint argc = *argc_p;
gchar **argv = *argv_p;
guint i, e;
-
+
for (i = 1; i < argc; i++)
{
if (strcmp ("--header", argv[i]) == 0)
std_includes = TRUE;
argv[i] = NULL;
}
+ else if (strcmp ("--internal", argv[i]) == 0)
+ {
+ gen_internal = TRUE;
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--valist-marshallers", argv[i]) == 0)
+ {
+ gen_valist = TRUE;
+ argv[i] = NULL;
+ }
else if ((strcmp ("--prefix", argv[i]) == 0) ||
(strncmp ("--prefix=", argv[i], 9) == 0))
{
argv[i] = NULL;
}
else if (strcmp ("-h", argv[i]) == 0 ||
+ strcmp ("-?", argv[i]) == 0 ||
strcmp ("--help", argv[i]) == 0)
{
print_blurb (stderr, TRUE);
else if (strcmp (argv[i], "--g-fatal-warnings") == 0)
{
GLogLevelFlags fatal_mask;
-
+
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
-
+
argv[i] = NULL;
}
}
-
+
e = 0;
for (i = 1; i < argc; i++)
{
{
if (!print_help)
{
- fprintf (bout, "%s version ", PRG_NAME);
- fprintf (bout, "%u.%u.%u", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
- fprintf (bout, "\n");
- fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME);
- fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME);
- fprintf (bout, "the GNU General Public License which can be found in the\n");
- fprintf (bout, "%s source package. Sources, examples and contact\n", PKG_NAME);
- fprintf (bout, "information are available at %s\n", PKG_HTTP_HOME);
+ g_fprintf (bout, "%s version ", PRG_NAME);
+ g_fprintf (bout, "%u.%u.%u", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+ g_fprintf (bout, "\n");
+ g_fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME);
+ g_fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME);
+ g_fprintf (bout, "the GNU General Public License which can be found in the\n");
+ g_fprintf (bout, "%s source package. Sources, examples and contact\n", PKG_NAME);
+ g_fprintf (bout, "information are available at %s\n", PKG_HTTP_HOME);
}
else
{
- fprintf (bout, "Usage: %s [options] [files...]\n", PRG_NAME);
- fprintf (bout, " --header generate C headers\n");
- fprintf (bout, " --body generate C code\n");
- fprintf (bout, " --prefix=string specify marshaller prefix\n");
- fprintf (bout, " --skip-source skip source location comments\n");
- fprintf (bout, " --stdinc, --nostdinc include/use GRuntime standard marshallers\n");
- fprintf (bout, " -h, --help show this help message\n");
- fprintf (bout, " -v, --version print version informations\n");
- fprintf (bout, " --g-fatal-warnings make warnings fatal (abort)\n");
+ g_fprintf (bout, "Usage:\n");
+ g_fprintf (bout, " %s [OPTION...] [FILES...]\n\n", PRG_NAME);
+ g_fprintf (bout, "Help Options:\n");
+ g_fprintf (bout, " -h, --help Show this help message\n\n");
+ g_fprintf (bout, "Utility Options:\n");
+ g_fprintf (bout, " --header Generate C headers\n");
+ g_fprintf (bout, " --body Generate C code\n");
+ g_fprintf (bout, " --prefix=string Specify marshaller prefix\n");
+ g_fprintf (bout, " --skip-source Skip source location comments\n");
+ g_fprintf (bout, " --stdinc, --nostdinc Include/use standard marshallers\n");
+ g_fprintf (bout, " --internal Mark generated functions as internal\n");
+ g_fprintf (bout, " --valist-marshallers Generate va_list marshallers\n");
+ g_fprintf (bout, " -v, --version Print version informations\n");
+ g_fprintf (bout, " --g-fatal-warnings Make warnings fatal (abort)\n");
}
}
projects / platform / upstream / glib.git / blobdiff