Nabble - Gnome - GObject Builder

Patch for the bug on remove_sep().

2009-11-23T20:11:43Z

Hi,

I am using gob2 to develop various projects such as WritRecogn, ibus-chewing, and MakerDialog.
Recently I found that those project are failed to compile. After investigation, I think the problem
might reside in remove_sep(), src/util.c.

In remove_sep(), the code that remove ':' is:

while((p = strchr(s, ':')))
strcpy(p, p+1);

However, according to the man page of strcpy:
"The strings may not overlap, and the destination string dest must be
large enough to receive the copy."

In fact, this code block produces unexpected results in some systems.
For example:
Ma:Class is converted to Ma:Clsss
Ma:Placement is converted to Ma:Plccemnnt

The patch that address this issue is attached.

Regards,
--
Ding-Yi Chen
Software Engineer
Internationalization Group
Red Hat, Inc.

Register now for Red Hat Virtual Experience, December 9.
Enterprise Linux, virtualization, cloud, and more.
http://www.redhat.com/virtualexperience

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

gob2-remove_sep.patch (512 bytes) Download Attachment

ANNOUNCE: gob2 2.0.16 the "I shot the sheriff" release

2009-07-21T08:44:10Z

UGUGUGOBGOBGOBUGUGUSMOKEUFUFUGANJAEKIEKIWEEDUMFOOOOOOOOOOOOOOOOOOOO

Apparently perfection was not yet perfect (read last anouncement). Anyway,
it is time for a new gob. No new major bug fixes or anything. Mosty
application and in some cases reworking of pending patches. It is true that
some users have suffered great mental anguish because of gob. Their pain is
not going away, because here is a new release of gob.

So what is this gob thing? Well besides being the cure for cancer, it also
generates GObjects (or GTK+ objects). GOB2 is a replacement for the version
1 GOB, that was for GTK+ 1.x mostly. GOB2 can handle pretty much most of the
GObject features. At least most of the ones that anyone will ever use. It
only requires GLib 2.0 (or higher for some features) and can generate
arbitrary GObjects. You can have both versions installed at the same time if
you wish, but if anyone is still using gob version 1 and GTK+ 1.x, they
should get their head examined.

Here are the news in 2.0.16:

* add possibility of using function attributes such as
G_GNUC_PRINTF etc... (Britton Kerin, Jean-Yves Lefort, me)
* *_get_type methods are G_GNUC_CONST (Jean-Yves Lefort, me)
* move #line sections past opening brace of functions
(Jean-Yves Lefort)
* handle finalize, dispose, constructor just like init
(Jean-Yves Lefort)
* Add %afterdecls{ %} code block
(Jean-Yves Lefort)
* Minor fixes to docs (me, Andrew Feren)

ftp://ftp.5z.com/pub/gob/
http://ftp.gnome.org/pub/GNOME/sources/gob2/2.0/
http://www.5z.com/jirka/gob.html

Note: I no longer have fedora, so no rpms are built but the specfile is
included. Try it with "rpmbuild -ta gob2-...-tar.gz"

Have fun,

George

--
Jiri (George) Lebl http://www.jirka.org/
The only thing that interferes with my learning is my education.
-- Albert Einstein

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

new version coming soon

2009-07-10T12:52:01Z

So it took a long time, but I've spent the whole day today fixing up the
waiting patches for gob. Anyway, instead of just making a release, I want to
make sure things work.

A TEST tarball release is at http://www.jirka.org/gob2-2.0.16-test.tar.gz

Let me know if it works or doesn't work. If it all does work, I'll make a
release in a few days.

See the NEWS file and ChangeLog to see what I did.

One thing of note is how I handled the function attributes. I erred on the
side of as little code change as possible and on the side of as little change
to syntax as possible. I took Britton's patch, and then I realized it would
not be easy to handle the syntax in that way (though it looked nicer).
Jean-Yves patch was more flexible but I didn't like the fact that it
introduced new syntax. So I opted to just handle it like onerror and
defreturn so that essentially no new looking syntax is created. So you do

public void
print (self, const char *format (check null), ...) attr {G_GNUC_PRINTF(2, 3)}

Somewhat uglier, yes, but more flexible and doesn't add new syntax, does not
touch the lexer, and is minimally code invasive.

Sorry about the long wait ...

Jiri

--
George <jirka@...>
I killed the cat. -- Sid Vicious

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: Friendly poke on gob2

2009-07-07T15:48:26Z

Richard Schwarting wrote:
> Hello.
>
> Thanks for the work you've already put into gob2. I was wondering
> whether you were still planning on pushing a new release including the
> patches pending on the list.
>
> Cheers,
> Richard

I am planning on doing it. I think I will actually do it in the next few
weeks since I finally have some free time for the rest of july.

If there is someone on the list who thinks they can do a better job of
updating gob (perhaps implementing some newer features of gobject or some
things that were not yet finished (e.g. interfaces)), speak up. Else it's up
to me and it's really a backburner kind of project for me (though it really
doesn't require too much more than a backburner kind of attention IMO).

Jiri

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: signals with GTK_TYPE_ADJUSTMENT

2009-01-29T05:55:00Z

Dov Grobgeld wrote:

> In hope that the mailing list isn't dead yet, I wonder if someone can
> help me with some gob2 syntax.
>
> I got stuck on trying to create signals with the following signature
> (copied from GtkTextView) in gob:
>
> signals[SET_SCROLL_ADJUSTMENTS] =
> g_signal_new (I_("set_scroll_adjustments"),
> G_OBJECT_CLASS_TYPE (gobject_class),
> G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
> G_STRUCT_OFFSET (MyFooClass, set_scroll_adjustments),
> NULL, NULL,
> _gtk_marshal_VOID__OBJECT_OBJECT,
> G_TYPE_NONE, 2,
> GTK_TYPE_ADJUSTMENT,
> GTK_TYPE_ADJUSTMENT);
>
> I tried the following:
>
> signal last NONE (GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT)
> gboolean
> set_scroll_adjustments (self,
> Gtk:Adjustment *hadjustment,
> Gtk:Adjustment *vadjustment)

1) you have a gboolean return and you specify NONE for your return, you
should have BOOLEAN there
2) Use OBJECT or POINTER instead of GTK_TYPE_ADJUSTMENT. These types are
used for the marshalling, and it is sufficient to pass objects as OBJECTs or
even just POINTERs. The type checking is done at a different place.

George

--
George <jirka@...>
Few people can be happy unless they hate some other person,
nation or creed.
-- Bertrand Russell

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

signals with GTK_TYPE_ADJUSTMENT

2009-01-25T10:56:20Z

In hope that the mailing list isn't dead yet, I wonder if someone can help me with some gob2 syntax.

I got stuck on trying to create signals with the following signature (copied from GtkTextView) in gob:

signals[SET_SCROLL_ADJUSTMENTS] =
    g_signal_new (I_("set_scroll_adjustments"),
        G_OBJECT_CLASS_TYPE (gobject_class),
        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
        G_STRUCT_OFFSET (MyFooClass, set_scroll_adjustments),
        NULL, NULL,
        _gtk_marshal_VOID__OBJECT_OBJECT,
        G_TYPE_NONE, 2,
        GTK_TYPE_ADJUSTMENT,
        GTK_TYPE_ADJUSTMENT);

I tried the following:

signal last NONE (GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT)
gboolean
set_scroll_adjustments (self,
                          Gtk:Adjustment    *hadjustment,
                          Gtk:Adjustment    *vadjustment)

but got the error "Error: Unknown GTK+ type 'GTK_TYPE_ADJUSTMENT' among signal types".

This also failed:

signal last NONE (OBJECT=Gtk:Adjustment, OBJECT=Gtk:Adjustment)
gboolean
set_scroll_adjustments (self,
                          Gtk:Adjustment    *hadjustment,
                          Gtk:Adjustment    *vadjustment)

which gave the error "Error: syntax error before '='".

In the end I used:

signal last NONE (OBJECT, OBJECT)
gboolean
set_scroll_adjustments (self,
                          Gtk:Adjustment    *hadjustment,
                          Gtk:Adjustment    *vadjustment)

and then applied an external patch:

-            G_TYPE_OBJECT,
-            G_TYPE_OBJECT);
+            GTK_TYPE_ADJUSTMENT,
+            GTK_TYPE_ADJUSTMENT);

But of course I wonder whether there is any syntax to do this in gob2?

Thanks!
Dov

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

patch adding G_GNUC_CONST to get_type()

2008-02-25T12:29:41Z

The attached patch adds the G_GNUC_CONST attribute to get_type()
function declarations. It is a performance improvement which allows
the compiler to move get_type() calls out of loops, etc.

--
Jean-Yves Lefort <jylefort@...>

[gob2-jylefort-const-gettype.diff]

Index: src/main.c =================================================================== RCS file: /usr/local/cvsroot/gob2/src/main.c,v retrieving revision 1.4 diff -u -r1.4 main.c --- src/main.c 1 Feb 2008 21:39:50 -0000 1.4 +++ src/main.c 25 Feb 2008 20:23:09 -0000 @@ -3644,7 +3644,7 @@ " */\n"); if ( ! overrode_get_type) { - out_printf (outh, "GType\t%s_get_type\t(void);\n", funcbase); + out_printf (outh, "GType\t%s_get_type\t(void) G_GNUC_CONST;\n", funcbase); } for(li = c->nodes; li != NULL; li = li->next) {

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

function location patch

2008-02-01T14:01:58Z

The attached patch:

- puts the opening braces of functions in the .gob #line sections, eg:

before:

#line 1007 "mn-mailbox.gob"
void
mn_mailbox_check (MNMailbox * self)
#line 2064 "mn-mailbox.c"
{

after:

#line 1007 "mn-mailbox.gob"
void
mn_mailbox_check (MNMailbox * self)
{
#line 2064 "mn-mailbox.c"

This makes GCC use the .gob location when it has something to say
about a function.

- encloses function declarations in .gob #line sections. This makes
GCC use the .gob location when it has something to say about a
function prototype.

Note: the patch applies to gob2-jylefort (gob2 2.0.15 + my other
patches).

--
Jean-Yves Lefort <jylefort@...>

[gob2-jylefort-function-locations.diff]

Index: src/main.c =================================================================== RCS file: /usr/local/cvsroot/gob2/src/main.c,v retrieving revision 1.3 diff -u -r1.3 main.c --- src/main.c 1 Feb 2008 21:12:03 -0000 1.3 +++ src/main.c 1 Feb 2008 21:33:04 -0000 @@ -447,8 +447,10 @@ if(m->scope != PUBLIC_SCOPE) return; + out_addline_infile(outh, m->line_no); print_method(outh, "", "\t", "", "\t", "", ";\n", m, TRUE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(outh); } static void @@ -580,15 +582,17 @@ static void put_prot_method(const Method *m) { + FILE *f; + if(m->scope != PROTECTED_SCOPE) return; - if(outph) - print_method(outph, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); - else - print_method(out, "", "\t", "", "\t", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + f = outph ? outph : out; + + out_addline_infile(f, m->line_no); + print_method(f, "", "\t", "", "\t", "", ";\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(f); } static void @@ -609,8 +613,10 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); + out_addline_infile(out, m->line_no); print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); + out_addline_outfile(out); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || @@ -618,8 +624,10 @@ m->method == CONSTRUCTOR_METHOD || m->method == DISPOSE_METHOD || m->method == FINALIZE_METHOD) { + out_addline_infile(out, m->line_no); print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); + out_addline_outfile(out); } } @@ -2395,10 +2403,10 @@ out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", m, FALSE, FALSE, TRUE, TRUE, FALSE); + out_printf(out, "{\n"); if(m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" - "#define __GOB_FUNCTION__ \"%s::init\"\n", + out_printf(out, "#define __GOB_FUNCTION__ \"%s::init\"\n", c->otype); if (privates > 0) { out_printf(out, "\t%s->_priv = " @@ -2444,10 +2452,10 @@ out_addline_infile(out, m->line_no); print_method(out, "static ", "\n", "", " ", "", "\n", m, FALSE, FALSE, TRUE, TRUE, FALSE); + out_printf(out, "{\n"); if(m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" - "#define __GOB_FUNCTION__ \"%s::class_init\"\n", + out_printf(out, "#define __GOB_FUNCTION__ \"%s::class_init\"\n", c->otype); if (set_properties > 0 || get_properties > 0 || @@ -2799,10 +2807,10 @@ static void print_method_body (Method *m, gboolean pre, gboolean unused_self) { + out_printf(out, "{\n"); if (m->line_no > 0) out_addline_outfile(out); - out_printf(out, "{\n" - "#define __GOB_FUNCTION__ \"%s::%s\"\n", + out_printf(out, "#define __GOB_FUNCTION__ \"%s::%s\"\n", ((Class *)class)->otype, m->id); if (pre) @@ -2972,10 +2980,11 @@ else /* PUBLIC, PROTECTED */ print_method2(out, "", "\n", "", " ", "", "\n", m, PRINT_METHOD_NO_ATTR); - out_addline_outfile (out); out_printf (out, "{\n"); + out_addline_outfile (out); + out_printf (out, "\tGValue ___param_values[%d];\n" "\tGValue ___return_val;\n\n" @@ -3103,9 +3112,9 @@ else /* PUBLIC, PROTECTED */ print_method2(out, "", "\n", "", " ", "", "\n", m, PRINT_METHOD_NO_ATTR); + out_printf(out, "{\n"); out_addline_outfile(out); - out_printf(out, "{\n" - "\t%sClass *klass;\n", typebase); + out_printf(out, "\t%sClass *klass;\n", typebase); print_preconditions(m); out_printf(out, "\tklass = %s_GET_CLASS(%s);\n\n" "\tif(klass->%s)\n",

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

patch adding %afterdecls C code section

2008-02-01T05:12:50Z

The attached patch allows to insert a C code section (in the .c file)
between the declarations and the method implementations, eg:

%afterdecls{

static const struct
{
void (*one) (Self *self);
void (*two) (Self *self);
} things[] = {
{ self_foo, self_bar },
};

%}

class Foo:Bar
{
private void
foo (self)
{
}

private void
bar (self)
{
}
}

Without this patch, one has to make methods protected if he wants to
refer to them from the %{} code section.

Or, alternatively, put things[] in a %{} section at the end of the
file:

%{
typedef struct
{
void (*one) (FooBar *self);
void (*two) (FooBar *self);
} Thing;

static const Thing things[];
%}

class Foo:Bar
{
...
}

%{
static const Thing things[] = {
...
};
%}

But it's more verbose and forbids code such as:

G_N_ELEMENTS(things)

since things[] is not yet defined in the class code.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-afterdecls.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-02-01 13:33:53.000000000 +0100 @@ -344,6 +344,14 @@ if(look_for_includes==0) look_for_includes=1; } +^\%(ad|afterdecls)\{ { + BEGIN(C_CODE); + parenth_depth = 1; + class_after_c = FALSE; + code_type = ADCODE; + clear_cbuf(); + ccode_line = line_no; + } <C_CODE>^\%\} { BEGIN(INITIAL); yylval.cbuf = cbuf; --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-02-01 13:36:42.000000000 +0100 @@ -3293,6 +3293,7 @@ } out_printf(fp, "%s\n", cc->cbuf); if(cc->cctype == C_CCODE || + cc->cctype == AD_CCODE || cc->cctype == A_CCODE || cc->cctype == AT_CCODE || cc->cctype == PH_CCODE) @@ -3633,6 +3634,15 @@ funcbase); } + for (li = nodes; li != NULL; li = li->next) { + Node *node = li->data; + if (node->type == CCODE_NODE) { + CCode *cc = (CCode *)node; + if (cc->cctype == AD_CCODE) + print_ccode_block (cc); + } + } + if (need_dispose) add_dispose (c); @@ -4064,7 +4074,8 @@ if (node->type == CCODE_NODE) { CCode *cc = (CCode *)node; if (cc->cctype != HT_CCODE && - cc->cctype != AT_CCODE) + cc->cctype != AT_CCODE && + cc->cctype != AD_CCODE) print_ccode_block ((CCode *)node); } else if (node->type == CLASS_NODE) { print_class_block ((Class *)node); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-02-01 13:35:25.000000000 +0100 @@ -678,7 +678,7 @@ %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR %token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR -%token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE STRING +%token <cbuf> CCODE ADCODE HTCODE PHCODE HCODE ACODE ATCODE STRING %token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE PROPERTY ARGUMENT %token <line> VIRTUAL SIGNAL OVERRIDE %token <line> NICK BLURB MAXIMUM MINIMUM DEFAULT_VALUE ERROR FLAGS TYPE @@ -701,6 +701,15 @@ nodes = g_list_append(nodes,node); g_string_free($<cbuf>1,FALSE); } + | ADCODE { + Node *node = node_new (CCODE_NODE, + "cctype", AD_CCODE, + "cbuf:steal", ($<cbuf>1)->str, + "line_no", ccode_line, + NULL); + nodes = g_list_append(nodes,node); + g_string_free($<cbuf>1,FALSE); + } | HCODE { Node *node = node_new (CCODE_NODE, "cctype", H_CCODE, --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-02-01 13:33:53.000000000 +0100 @@ -9,6 +9,7 @@ A_CCODE, AT_CCODE, C_CCODE, + AD_CCODE, H_CCODE, HT_CCODE, PH_CCODE

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

Re: Support for C++ syntax?

2008-01-29T16:53:59Z

On Tue, 29 Jan 2008 16:55:54 -0600
George <jirka@...> wrote:

> On Tue, Jan 29, 2008 at 12:01:44PM +0100, Jean-Yves Lefort wrote:
> > The namespace syntax is supported if you use the --for-cpp command
> > line option. The template syntax isn't. Supporting it properly would
> > involve moving the handling of C/C++ types from the lexer to the
> > parser, to be able to handle more complex types such as:
> >
> > A::B<C, D::E::F, G<H::I<J, K> > >
>
> Perhaps supporting simple templates could be an easy option. I mean
> the example above is something to be avoided anyway I guess.

Yes, I'd definitely avoid it.

> PS: I know I have been kind of quiet on the submitted patches. Fear not,
> they are in my mailbox and are waiting for me to integrate them / test them /
> make a release.

I have no fear, since none of my previous patches have been ignored.

--
Jean-Yves Lefort <jylefort@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

Re: Support for C++ syntax?

2008-01-29T14:55:54Z

On Tue, Jan 29, 2008 at 12:01:44PM +0100, Jean-Yves Lefort wrote:
> The namespace syntax is supported if you use the --for-cpp command
> line option. The template syntax isn't. Supporting it properly would
> involve moving the handling of C/C++ types from the lexer to the
> parser, to be able to handle more complex types such as:
>
> A::B<C, D::E::F, G<H::I<J, K> > >

Perhaps supporting simple templates could be an easy option. I mean
the example above is something to be avoided anyway I guess.

There is always the possibility of putting syntax that gob hates into
a separate file to include. I know this is ugly, but even if support for
templates is done, then it would still require a new enough version
of gob.

George

PS: I know I have been kind of quiet on the submitted patches. Fear not,
they are in my mailbox and are waiting for me to integrate them / test them /
make a release.

--
George <jirka@...>
You can't say civilization isn't advancing: in every war they kill you
in a new way.
-- Will Rogers

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: Support for C++ syntax?

2008-01-29T03:01:44Z

On Tue, 29 Jan 2008 08:24:42 +0200
"Dov Grobgeld" <dov.grobgeld@...> wrote:

> I am using gob quite a lot with a Gtk+ and C++. Unfortunately gob barfs on
> some C++ syntax that it should just pass along to the cc and h files.
> Currently I'm able to work around this by introducing typedefs in the
> private-h section and then using them in the class definition, but I see no
> reason why the parser should not support them. The constructs in question
> are:
>
> private foo<bar> baz;
> private foo::bar baz;
>
> Neither the <> nor the :: syntaxes are supported.
>
> Any chance of getting this fixed?

The namespace syntax is supported if you use the --for-cpp command
line option. The template syntax isn't. Supporting it properly would
involve moving the handling of C/C++ types from the lexer to the
parser, to be able to handle more complex types such as:

A::B<C, D::E::F, G<H::I<J, K> > >

> On 29/01/2008, Jean-Yves Lefort <jylefort@...> wrote:
> >
> > On Mon, 28 Jan 2008 18:10:20 +0100
> > Jean-Yves Lefort <jylefort@...> wrote:
> >
> > > The attached patch allows to add GCC attributes to methods, using a
> > > syntax borrowed from C#.
> >
> > There was a lexer conflict between array dimensions and
> > attributes. The fixed patches are attached.

--
Jean-Yves Lefort <jylefort@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

Support for C++ syntax?

2008-01-28T22:24:42Z

I am using gob quite a lot with a Gtk+ and C++. Unfortunately gob barfs on some C++ syntax that it should just pass along to the cc and h files. Currently I'm able to work around this by introducing typedefs in the private-h section and then using them in the class definition, but I see no reason why the parser should not support them. The constructs in question are:

private foo<bar> baz;
private foo::bar baz;

Neither the <> nor the :: syntaxes are supported.

Any chance of getting this fixed?

Thanks,
Dov

On 29/01/2008, Jean-Yves Lefort <jylefort@...> wrote:

On Mon, 28 Jan 2008 18:10:20 +0100
Jean-Yves Lefort <jylefort@...> wrote:

> The attached patch allows to add GCC attributes to methods, using a
> syntax borrowed from C#.

There was a lexer conflict between array dimensions and
attributes. The fixed patches are attached.

--
Jean-Yves Lefort <jylefort@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: patch allowing to add GCC attributes to methods

2008-01-28T16:39:26Z

On Mon, 28 Jan 2008 18:10:20 +0100
Jean-Yves Lefort <jylefort@...> wrote:

> The attached patch allows to add GCC attributes to methods, using a
> syntax borrowed from C#.

I've fixed my other patch (gob2-2.0.15-gobject-overrides.diff), so I'm
attaching the new unified patch.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-gobject-overrides-and-attr.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-01-29 01:25:46.000000000 +0100 @@ -31,6 +31,7 @@ #include "main.h" #include "util.h" +static int bracket_depth = 0; static int parenth_depth = 0; static int before_comment /* New flex is on drugs */ @@ -102,6 +103,7 @@ %x COMMENT %x C_CODE +%x ATTR_CODE %x CODE_STRING %x CLASS_CODE %x CLASS_STRING @@ -267,7 +269,7 @@ add_to_cbuf(yytext); } -<C_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } +<C_CODE,ATTR_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } <CLASS_CODE>\/\/.*$ { ; /*comment, ignore*/ } <CLASS_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } <PROPERTY_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } @@ -277,20 +279,25 @@ BEGIN(COMMENT); before_comment = C_CODE; } +<ATTR_CODE>\/\* { + add_to_cbuf(yytext); + BEGIN(COMMENT); + before_comment = ATTR_CODE; +} <CLASS_CODE>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE; } <CLASS_CODE_I>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } <PROPERTY_CODE_I>\/\* {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } <COMMENT>\*\/ { - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } <COMMENT>. { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } <COMMENT>\n { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } ^\%(a|all)\{ { @@ -353,14 +360,14 @@ return code_type; } -<C_CODE>\'\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\"\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\"\' { add_to_cbuf(yytext); } -<C_CODE>\\. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\\. { add_to_cbuf(yytext); } <C_CODE>\" { @@ -368,6 +375,11 @@ before_string = C_CODE; add_to_cbuf(yytext); } +<ATTR_CODE>\" { + BEGIN(CODE_STRING); + before_string = ATTR_CODE; + add_to_cbuf(yytext); + } <PROPERTY_CODE_I>\" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; @@ -391,6 +403,10 @@ parenth_depth++; add_to_cbuf(yytext); } +<ATTR_CODE>\[ { + bracket_depth++; + add_to_cbuf(yytext); + } <C_CODE>\} { parenth_depth--; if(parenth_depth<0) { @@ -403,9 +419,21 @@ } add_to_cbuf(yytext); } +<ATTR_CODE>\] { + bracket_depth--; + if(bracket_depth<0) { + REJECT; + } else if(bracket_depth==0) { + BEGIN(CLASS_CODE_I); + yylval.cbuf = cbuf; + cbuf = NULL; + return CCODE; + } + add_to_cbuf(yytext); + } -<C_CODE>. { add_to_cbuf(yytext); } -<C_CODE>\n { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\n { add_to_cbuf(yytext); } class { static int found_classes = 0; @@ -588,12 +616,12 @@ <CLASS_CODE_I>(\[[0-9]*\]|\[[A-Za-z_][A-Za-z0-9_]*\])+ { yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return ARRAY_DIM_OR_ATTR; } <CLASS_CODE_I>:[0-9]+ { /* cheat for bitfield */ yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return BITFIELD; } <CLASS_CODE>\{ { BEGIN(CLASS_CODE_I); @@ -612,6 +640,13 @@ BEGIN(INITIAL); return '}'; } +<CLASS_CODE_I>\[ { + BEGIN(ATTR_CODE); + bracket_depth=1; + yylval.line = line_no; + clear_cbuf(); + return '['; + } <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ; /*ignore*/ --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-29 01:25:46.000000000 +0100 @@ -92,11 +92,16 @@ static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; @@ -189,21 +194,25 @@ g_free(s); } - -static void -print_method (FILE *fp, - const char *typeprefix, - const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, - const char *afterargs, - const char *postfix, - const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore, - gboolean first_unused, - gboolean fake_names) +typedef enum +{ + PRINT_METHOD_ONE_ARG_PER_LINE = 1 << 0, + PRINT_METHOD_NO_FUNCBASE = 1 << 1, + PRINT_METHOD_FIRST_UNUSED = 1 << 2, + PRINT_METHOD_FAKE_NAMES = 1 << 3, + PRINT_METHOD_NO_ATTR = 1 << 4 +} PrintMethodFlags; + +static void +print_method2 (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + PrintMethodFlags flags) { GList *li; const char *id; @@ -213,7 +222,7 @@ id = m->id; - if(no_funcbase) + if ((flags & PRINT_METHOD_NO_FUNCBASE) != 0) out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, id, namepostfix); else @@ -229,19 +238,19 @@ if ( ! no_gnu && ! for_cpp && /* g++ has a cow with this */ li == m->args && - first_unused) { + (flags & PRINT_METHOD_FIRST_UNUSED) != 0) { unused = " G_GNUC_UNUSED"; } print_type(fp, arg->atype, FALSE); - if (fake_names) + if ((flags & PRINT_METHOD_FAKE_NAMES) != 0) out_printf (fp, "___fake___"); if(li->next) out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", unused, - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); else out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? @@ -250,11 +259,54 @@ } if(m->vararg) out_printf(fp, ",%s...", - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + + out_printf(fp, "%s)", afterargs); + + if (m->attr && (flags & PRINT_METHOD_NO_ATTR) == 0) + out_printf(fp, " %s", m->attr); + + out_printf(fp, "%s", postfix); +} + +static void +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) +{ + PrintMethodFlags flags = 0; + + if (one_arg_per_line) + flags |= PRINT_METHOD_ONE_ARG_PER_LINE; + if (no_funcbase) + flags |= PRINT_METHOD_NO_FUNCBASE; + if (first_unused) + flags |= PRINT_METHOD_FIRST_UNUSED; + if (fake_names) + flags |= PRINT_METHOD_FAKE_NAMES; + + print_method2(fp, + typeprefix, + nameprefix, + subnameprefix, + namepostfix, + afterargs, + postfix, + m, + flags); } static gboolean @@ -269,6 +321,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -291,6 +346,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -330,6 +388,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -371,11 +432,13 @@ /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); } static void @@ -422,8 +485,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -433,8 +499,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -445,8 +514,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -526,9 +598,9 @@ m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) - print_method(out, - "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, + "static ", "___real_", "", " ", "", ";\n", + m, PRINT_METHOD_NO_ATTR); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -537,15 +609,16 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { - print_method(out, "static ", "", "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { + print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -629,66 +702,68 @@ } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); + } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -2118,6 +2193,33 @@ } static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void add_dispose (Class *c) { out_printf(out, "\nstatic void\n" @@ -2127,7 +2229,7 @@ "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2143,6 +2245,14 @@ if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); @@ -2178,7 +2288,8 @@ c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; @@ -2202,6 +2313,14 @@ if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); @@ -2333,6 +2452,7 @@ if (set_properties > 0 || get_properties > 0 || signals > 0 || + need_constructor || need_dispose || need_finalize) { out_printf(out, @@ -2381,6 +2501,9 @@ /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -2831,11 +2954,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; @@ -2844,11 +2967,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile (out); out_printf (out, "{\n"); @@ -2966,8 +3089,8 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2975,11 +3098,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -3024,8 +3147,9 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_FIRST_UNUSED + | PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -3064,6 +3188,15 @@ /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -3633,6 +3766,9 @@ funcbase); } + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -4441,15 +4577,24 @@ make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-29 01:25:46.000000000 +0100 @@ -146,7 +146,7 @@ static void push_function (int scope, int method, char *oid, char *id, - GString *cbuf, int line_no, int ccode_line, + GString *attr, GString *cbuf, int line_no, int ccode_line, gboolean vararg, GList *flags) { Node *node; @@ -155,7 +155,11 @@ g_assert(scope != CLASS_SCOPE); - if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + if(method == INIT_METHOD + || method == CLASS_INIT_METHOD + || method == CONSTRUCTOR_METHOD + || method == DISPOSE_METHOD + || method == FINALIZE_METHOD) { type = (Type *)node_new (TYPE_NODE, "name", "void", NULL); @@ -207,6 +211,7 @@ "args:steal", funcargs, "onerror:steal", onerror, "defreturn:steal", defreturn, + "attr:steal", attr ? attr->str : NULL, "cbuf:steal", c_cbuf, "line_no", line_no, "ccode_line", ccode_line, @@ -216,6 +221,8 @@ last_added_method = (Method *)node; + if(attr) + g_string_free(attr, FALSE); if(cbuf) g_string_free(cbuf, /*only free segment if we haven't passed it @@ -405,7 +412,7 @@ push_funcarg ("self", FALSE); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - get_id, get_cbuf, get_lineno, + get_id, NULL, get_cbuf, get_lineno, lineno, FALSE, NULL); } @@ -439,7 +446,7 @@ typestack = g_list_prepend (typestack, node2); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - set_id, set_cbuf, set_lineno, + set_id, NULL, set_cbuf, set_lineno, lineno, FALSE, NULL); } @@ -677,7 +684,7 @@ %token CONST VOID STRUCT UNION ENUM THREEDOTS %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR -%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR +%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM_OR_ATTR BITFIELD SINGLE_CHAR %token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE STRING %token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE PROPERTY ARGUMENT %token <line> VIRTUAL SIGNAL OVERRIDE @@ -982,7 +989,7 @@ variable: scope type TOKEN varoptions ';' { push_variable($<id>3, the_scope,$<line>1, NULL); } - | scope type TOKEN ARRAY_DIM varoptions ';' { + | scope type TOKEN array_dim varoptions ';' { push_variable($<id>3, the_scope, $<line>1, $<id>4); } ; @@ -1678,9 +1685,25 @@ YYERROR; } push_function(the_scope, $<sigtype>3,NULL, - $<id>5, $<cbuf>10,$<line>1, + $<id>5, NULL, $<cbuf>10,$<line>1, ccode_line, vararg, $<list>2); } + | attrs SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>4,NULL, + $<id>6, $<cbuf>1, $<cbuf>11,$<line>2, + ccode_line, vararg, $<list>3); + } | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1694,9 +1717,25 @@ YYERROR; } push_function(the_scope, $<sigtype>4, NULL, - $<id>6, $<cbuf>11, $<line>2, + $<id>6, NULL, $<cbuf>11, $<line>2, ccode_line, vararg, $<list>3); } + | attrs scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>5, NULL, + $<id>7, $<cbuf>1, $<cbuf>12, $<line>3, + ccode_line, vararg, $<list>4); + } | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1710,7 +1749,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>1, + NULL, $<cbuf>9, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>2, ccode_line, vararg, NULL); } | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1726,7 +1781,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>2, + NULL, $<cbuf>9, $<line>2, + ccode_line, vararg, NULL); + } + | attrs scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1737,12 +1808,23 @@ YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - $<id>3, $<cbuf>8, $<line>1, + $<id>3, NULL, $<cbuf>8, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + $<id>4, $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode { push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3, - $<id>6, $<cbuf>11, + $<id>6, NULL, $<cbuf>11, $<line>1, ccode_line, vararg, NULL); } @@ -1753,32 +1835,74 @@ YYERROR; } push_function(the_scope, REGULAR_METHOD, NULL, $<id>3, - $<cbuf>8, $<line>1, ccode_line, + NULL, $<cbuf>8, $<line>1, ccode_line, + vararg, NULL); + } + | attrs scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, $<id>4, + $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | TOKEN '(' TOKEN ')' codenocode { if(strcmp($<id>1, "init")==0) { push_init_arg($<id>3,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else if(strcmp($<id>1, "class_init")==0) { push_init_arg($<id>3,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "constructor")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "dispose")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "finalize")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else { g_free($<id>1); g_free($<id>3); g_string_free($<cbuf>5,TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } ; +attrs: + '[' CCODE { + $<cbuf>$ = $<cbuf>2; + } + | ARRAY_DIM_OR_ATTR { + int len = strlen($<id>1); + + g_assert($<id>1[0] == '['); + g_assert(len >= 2 && $<id>1[len - 1] == ']'); + + /* strip the brackets */ + $<cbuf>$ = g_string_new_len($<id>1 + 1, len - 2); + g_free($<id>1); + } + ; + returnvals: TOKEN retcode { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1900,7 +2024,7 @@ arg: type TOKEN { push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM { + | type TOKEN array_dim { push_funcarg($<id>2,$<id>3); } | type TOKEN '(' TOKEN checklist ')' { @@ -1911,7 +2035,7 @@ g_free($<id>4); push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM '(' TOKEN checklist ')' { + | type TOKEN array_dim '(' TOKEN checklist ')' { if(strcmp($<id>5,"check")!=0) { yyerror(_("parse error")); YYERROR; @@ -2105,5 +2229,10 @@ | SINGLE_CHAR { $<id>$ = $<id>1; } | TOKEN { $<id>$ = $<id>1; } ; + +array_dim: + ARRAY_DIM_OR_ATTR + | BITFIELD + ; %% --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-29 01:25:46.000000000 +0100 @@ -40,6 +40,9 @@ REGULAR_METHOD, INIT_METHOD, CLASS_INIT_METHOD, + CONSTRUCTOR_METHOD, + DISPOSE_METHOD, + FINALIZE_METHOD, VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD, @@ -126,6 +129,7 @@ NODELIST args STRING onerror STRING defreturn + STRING attr STRING cbuf INT line_no INT ccode_line

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

Re: patch adding first-class support of constructor/dispose/finalize methods

2008-01-28T16:36:03Z

On Mon, 21 Jan 2008 01:24:53 +0100
Jean-Yves Lefort <jylefort@...> wrote:

> The attached patch allows to write:
>
> constructor (self)
> {
> /* hi */
> }
>
> dispose (self)
> {
> /* hi */
> }
>
> finalize (self)
> {
> /* hi */
> }
>
> instead of:
>
> override (G:Object) GObject *
> constructor (GType type, unsigned int n_construct_properties, GObjectConstructParam *construct_params)
> {
> GObject *object;
> Self *self;
>
> object = PARENT_HANDLER(type, n_construct_properties, construct_params);
> self = SELF(object);
>
> /* hi */
>
> return object;
> }
>
> override (G:Object) void
> dispose (GObject *object)
> {
> Self *self = SELF(object);
>
> /* hi */
>
> PARENT_HANDLER(object);
> }
>
> override (G:Object) void
> finalize (GObject *object)
> {
> Self *self = SELF(object);
>
> /* hi */
>
> PARENT_HANDLER(object);
> }

In some cases, the generated class_init function used a nonexistent
g_object_class variable. I've attached a fixed patch.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-gobject-overrides.diff]

--- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-29 01:21:02.000000000 +0100 @@ -92,11 +92,16 @@ static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; @@ -269,6 +274,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -291,6 +299,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -330,6 +341,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -543,7 +557,10 @@ g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { print_method(out, "static ", "", "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); @@ -629,66 +646,68 @@ } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); + } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -2118,6 +2137,33 @@ } static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void add_dispose (Class *c) { out_printf(out, "\nstatic void\n" @@ -2127,7 +2173,7 @@ "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2143,6 +2189,14 @@ if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); @@ -2178,7 +2232,8 @@ c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; @@ -2202,6 +2257,14 @@ if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); @@ -2333,6 +2396,7 @@ if (set_properties > 0 || get_properties > 0 || signals > 0 || + need_constructor || need_dispose || need_finalize) { out_printf(out, @@ -2381,6 +2445,9 @@ /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -3064,6 +3131,15 @@ /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -3633,6 +3709,9 @@ funcbase); } + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -4441,15 +4520,24 @@ make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-29 01:19:59.000000000 +0100 @@ -155,7 +155,11 @@ g_assert(scope != CLASS_SCOPE); - if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + if(method == INIT_METHOD + || method == CLASS_INIT_METHOD + || method == CONSTRUCTOR_METHOD + || method == DISPOSE_METHOD + || method == FINALIZE_METHOD) { type = (Type *)node_new (TYPE_NODE, "name", "void", NULL); @@ -1767,13 +1771,29 @@ push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, $<id>1, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "constructor")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "dispose")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "finalize")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); } else { g_free($<id>1); g_free($<id>3); g_string_free($<cbuf>5,TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-29 01:19:59.000000000 +0100 @@ -40,6 +40,9 @@ REGULAR_METHOD, INIT_METHOD, CLASS_INIT_METHOD, + CONSTRUCTOR_METHOD, + DISPOSE_METHOD, + FINALIZE_METHOD, VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD,

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

Re: patch allowing to add GCC attributes to methods

2008-01-28T15:57:16Z

On Mon, 28 Jan 2008 18:10:20 +0100
Jean-Yves Lefort <jylefort@...> wrote:

> The attached patch allows to add GCC attributes to methods, using a
> syntax borrowed from C#.

There was a lexer conflict between array dimensions and
attributes. The fixed patches are attached.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-attr.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-01-29 00:04:49.000000000 +0100 @@ -31,6 +31,7 @@ #include "main.h" #include "util.h" +static int bracket_depth = 0; static int parenth_depth = 0; static int before_comment /* New flex is on drugs */ @@ -102,6 +103,7 @@ %x COMMENT %x C_CODE +%x ATTR_CODE %x CODE_STRING %x CLASS_CODE %x CLASS_STRING @@ -267,7 +269,7 @@ add_to_cbuf(yytext); } -<C_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } +<C_CODE,ATTR_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } <CLASS_CODE>\/\/.*$ { ; /*comment, ignore*/ } <CLASS_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } <PROPERTY_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } @@ -277,20 +279,25 @@ BEGIN(COMMENT); before_comment = C_CODE; } +<ATTR_CODE>\/\* { + add_to_cbuf(yytext); + BEGIN(COMMENT); + before_comment = ATTR_CODE; +} <CLASS_CODE>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE; } <CLASS_CODE_I>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } <PROPERTY_CODE_I>\/\* {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } <COMMENT>\*\/ { - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } <COMMENT>. { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } <COMMENT>\n { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } ^\%(a|all)\{ { @@ -353,14 +360,14 @@ return code_type; } -<C_CODE>\'\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\"\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\"\' { add_to_cbuf(yytext); } -<C_CODE>\\. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\\. { add_to_cbuf(yytext); } <C_CODE>\" { @@ -368,6 +375,11 @@ before_string = C_CODE; add_to_cbuf(yytext); } +<ATTR_CODE>\" { + BEGIN(CODE_STRING); + before_string = ATTR_CODE; + add_to_cbuf(yytext); + } <PROPERTY_CODE_I>\" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; @@ -391,6 +403,10 @@ parenth_depth++; add_to_cbuf(yytext); } +<ATTR_CODE>\[ { + bracket_depth++; + add_to_cbuf(yytext); + } <C_CODE>\} { parenth_depth--; if(parenth_depth<0) { @@ -403,9 +419,21 @@ } add_to_cbuf(yytext); } +<ATTR_CODE>\] { + bracket_depth--; + if(bracket_depth<0) { + REJECT; + } else if(bracket_depth==0) { + BEGIN(CLASS_CODE_I); + yylval.cbuf = cbuf; + cbuf = NULL; + return CCODE; + } + add_to_cbuf(yytext); + } -<C_CODE>. { add_to_cbuf(yytext); } -<C_CODE>\n { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\n { add_to_cbuf(yytext); } class { static int found_classes = 0; @@ -588,12 +616,12 @@ <CLASS_CODE_I>(\[[0-9]*\]|\[[A-Za-z_][A-Za-z0-9_]*\])+ { yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return ARRAY_DIM_OR_ATTR; } <CLASS_CODE_I>:[0-9]+ { /* cheat for bitfield */ yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return BITFIELD; } <CLASS_CODE>\{ { BEGIN(CLASS_CODE_I); @@ -612,6 +640,13 @@ BEGIN(INITIAL); return '}'; } +<CLASS_CODE_I>\[ { + BEGIN(ATTR_CODE); + bracket_depth=1; + yylval.line = line_no; + clear_cbuf(); + return '['; + } <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ; /*ignore*/ --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-29 00:02:09.000000000 +0100 @@ -189,21 +189,25 @@ g_free(s); } - -static void -print_method (FILE *fp, - const char *typeprefix, - const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, - const char *afterargs, - const char *postfix, - const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore, - gboolean first_unused, - gboolean fake_names) +typedef enum +{ + PRINT_METHOD_ONE_ARG_PER_LINE = 1 << 0, + PRINT_METHOD_NO_FUNCBASE = 1 << 1, + PRINT_METHOD_FIRST_UNUSED = 1 << 2, + PRINT_METHOD_FAKE_NAMES = 1 << 3, + PRINT_METHOD_NO_ATTR = 1 << 4 +} PrintMethodFlags; + +static void +print_method2 (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + PrintMethodFlags flags) { GList *li; const char *id; @@ -213,7 +217,7 @@ id = m->id; - if(no_funcbase) + if ((flags & PRINT_METHOD_NO_FUNCBASE) != 0) out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, id, namepostfix); else @@ -229,19 +233,19 @@ if ( ! no_gnu && ! for_cpp && /* g++ has a cow with this */ li == m->args && - first_unused) { + (flags & PRINT_METHOD_FIRST_UNUSED) != 0) { unused = " G_GNUC_UNUSED"; } print_type(fp, arg->atype, FALSE); - if (fake_names) + if ((flags & PRINT_METHOD_FAKE_NAMES) != 0) out_printf (fp, "___fake___"); if(li->next) out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", unused, - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); else out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? @@ -250,11 +254,54 @@ } if(m->vararg) out_printf(fp, ",%s...", - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + + out_printf(fp, "%s)", afterargs); + + if (m->attr && (flags & PRINT_METHOD_NO_ATTR) == 0) + out_printf(fp, " %s", m->attr); + + out_printf(fp, "%s", postfix); +} + +static void +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) +{ + PrintMethodFlags flags = 0; + + if (one_arg_per_line) + flags |= PRINT_METHOD_ONE_ARG_PER_LINE; + if (no_funcbase) + flags |= PRINT_METHOD_NO_FUNCBASE; + if (first_unused) + flags |= PRINT_METHOD_FIRST_UNUSED; + if (fake_names) + flags |= PRINT_METHOD_FAKE_NAMES; + + print_method2(fp, + typeprefix, + nameprefix, + subnameprefix, + namepostfix, + afterargs, + postfix, + m, + flags); } static gboolean @@ -371,11 +418,13 @@ /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); } static void @@ -422,8 +471,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -433,8 +485,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -445,8 +500,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -526,9 +584,9 @@ m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) - print_method(out, - "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, + "static ", "___real_", "", " ", "", ";\n", + m, PRINT_METHOD_NO_ATTR); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -537,15 +595,13 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD) { - print_method(out, "static ", "", "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -2831,11 +2887,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; @@ -2844,11 +2900,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile (out); out_printf (out, "{\n"); @@ -2966,8 +3022,8 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2975,11 +3031,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -3024,8 +3080,9 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_FIRST_UNUSED + | PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-29 00:19:27.000000000 +0100 @@ -146,7 +146,7 @@ static void push_function (int scope, int method, char *oid, char *id, - GString *cbuf, int line_no, int ccode_line, + GString *attr, GString *cbuf, int line_no, int ccode_line, gboolean vararg, GList *flags) { Node *node; @@ -207,6 +207,7 @@ "args:steal", funcargs, "onerror:steal", onerror, "defreturn:steal", defreturn, + "attr:steal", attr ? attr->str : NULL, "cbuf:steal", c_cbuf, "line_no", line_no, "ccode_line", ccode_line, @@ -216,6 +217,8 @@ last_added_method = (Method *)node; + if(attr) + g_string_free(attr, FALSE); if(cbuf) g_string_free(cbuf, /*only free segment if we haven't passed it @@ -405,7 +408,7 @@ push_funcarg ("self", FALSE); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - get_id, get_cbuf, get_lineno, + get_id, NULL, get_cbuf, get_lineno, lineno, FALSE, NULL); } @@ -439,7 +442,7 @@ typestack = g_list_prepend (typestack, node2); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - set_id, set_cbuf, set_lineno, + set_id, NULL, set_cbuf, set_lineno, lineno, FALSE, NULL); } @@ -677,7 +680,7 @@ %token CONST VOID STRUCT UNION ENUM THREEDOTS %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR -%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR +%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM_OR_ATTR BITFIELD SINGLE_CHAR %token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE STRING %token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE PROPERTY ARGUMENT %token <line> VIRTUAL SIGNAL OVERRIDE @@ -982,7 +985,7 @@ variable: scope type TOKEN varoptions ';' { push_variable($<id>3, the_scope,$<line>1, NULL); } - | scope type TOKEN ARRAY_DIM varoptions ';' { + | scope type TOKEN array_dim varoptions ';' { push_variable($<id>3, the_scope, $<line>1, $<id>4); } ; @@ -1678,9 +1681,25 @@ YYERROR; } push_function(the_scope, $<sigtype>3,NULL, - $<id>5, $<cbuf>10,$<line>1, + $<id>5, NULL, $<cbuf>10,$<line>1, ccode_line, vararg, $<list>2); } + | attrs SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>4,NULL, + $<id>6, $<cbuf>1, $<cbuf>11,$<line>2, + ccode_line, vararg, $<list>3); + } | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1694,9 +1713,25 @@ YYERROR; } push_function(the_scope, $<sigtype>4, NULL, - $<id>6, $<cbuf>11, $<line>2, + $<id>6, NULL, $<cbuf>11, $<line>2, ccode_line, vararg, $<list>3); } + | attrs scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>5, NULL, + $<id>7, $<cbuf>1, $<cbuf>12, $<line>3, + ccode_line, vararg, $<list>4); + } | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1710,7 +1745,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>1, + NULL, $<cbuf>9, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>2, ccode_line, vararg, NULL); } | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1726,7 +1777,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>2, + NULL, $<cbuf>9, $<line>2, + ccode_line, vararg, NULL); + } + | attrs scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1737,12 +1804,23 @@ YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - $<id>3, $<cbuf>8, $<line>1, + $<id>3, NULL, $<cbuf>8, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + $<id>4, $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode { push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3, - $<id>6, $<cbuf>11, + $<id>6, NULL, $<cbuf>11, $<line>1, ccode_line, vararg, NULL); } @@ -1753,19 +1831,29 @@ YYERROR; } push_function(the_scope, REGULAR_METHOD, NULL, $<id>3, - $<cbuf>8, $<line>1, ccode_line, + NULL, $<cbuf>8, $<line>1, ccode_line, + vararg, NULL); + } + | attrs scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, $<id>4, + $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | TOKEN '(' TOKEN ')' codenocode { if(strcmp($<id>1, "init")==0) { push_init_arg($<id>3,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else if(strcmp($<id>1, "class_init")==0) { push_init_arg($<id>3,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else { g_free($<id>1); @@ -1779,6 +1867,22 @@ } ; +attrs: + '[' CCODE { + $<cbuf>$ = $<cbuf>2; + } + | ARRAY_DIM_OR_ATTR { + int len = strlen($<id>1); + + g_assert($<id>1[0] == '['); + g_assert(len >= 2 && $<id>1[len - 1] == ']'); + + /* strip the brackets */ + $<cbuf>$ = g_string_new_len($<id>1 + 1, len - 2); + g_free($<id>1); + } + ; + returnvals: TOKEN retcode { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1900,7 +2004,7 @@ arg: type TOKEN { push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM { + | type TOKEN array_dim { push_funcarg($<id>2,$<id>3); } | type TOKEN '(' TOKEN checklist ')' { @@ -1911,7 +2015,7 @@ g_free($<id>4); push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM '(' TOKEN checklist ')' { + | type TOKEN array_dim '(' TOKEN checklist ')' { if(strcmp($<id>5,"check")!=0) { yyerror(_("parse error")); YYERROR; @@ -2105,5 +2209,10 @@ | SINGLE_CHAR { $<id>$ = $<id>1; } | TOKEN { $<id>$ = $<id>1; } ; + +array_dim: + ARRAY_DIM_OR_ATTR + | BITFIELD + ; %% --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-29 00:02:09.000000000 +0100 @@ -126,6 +126,7 @@ NODELIST args STRING onerror STRING defreturn + STRING attr STRING cbuf INT line_no INT ccode_line

[gob2-2.0.15-gobject-overrides-and-attr.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-01-29 00:24:30.000000000 +0100 @@ -31,6 +31,7 @@ #include "main.h" #include "util.h" +static int bracket_depth = 0; static int parenth_depth = 0; static int before_comment /* New flex is on drugs */ @@ -102,6 +103,7 @@ %x COMMENT %x C_CODE +%x ATTR_CODE %x CODE_STRING %x CLASS_CODE %x CLASS_STRING @@ -267,7 +269,7 @@ add_to_cbuf(yytext); } -<C_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } +<C_CODE,ATTR_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } <CLASS_CODE>\/\/.*$ { ; /*comment, ignore*/ } <CLASS_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } <PROPERTY_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } @@ -277,20 +279,25 @@ BEGIN(COMMENT); before_comment = C_CODE; } +<ATTR_CODE>\/\* { + add_to_cbuf(yytext); + BEGIN(COMMENT); + before_comment = ATTR_CODE; +} <CLASS_CODE>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE; } <CLASS_CODE_I>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } <PROPERTY_CODE_I>\/\* {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } <COMMENT>\*\/ { - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } <COMMENT>. { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } <COMMENT>\n { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } ^\%(a|all)\{ { @@ -353,14 +360,14 @@ return code_type; } -<C_CODE>\'\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\"\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\"\' { add_to_cbuf(yytext); } -<C_CODE>\\. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\\. { add_to_cbuf(yytext); } <C_CODE>\" { @@ -368,6 +375,11 @@ before_string = C_CODE; add_to_cbuf(yytext); } +<ATTR_CODE>\" { + BEGIN(CODE_STRING); + before_string = ATTR_CODE; + add_to_cbuf(yytext); + } <PROPERTY_CODE_I>\" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; @@ -391,6 +403,10 @@ parenth_depth++; add_to_cbuf(yytext); } +<ATTR_CODE>\[ { + bracket_depth++; + add_to_cbuf(yytext); + } <C_CODE>\} { parenth_depth--; if(parenth_depth<0) { @@ -403,9 +419,21 @@ } add_to_cbuf(yytext); } +<ATTR_CODE>\] { + bracket_depth--; + if(bracket_depth<0) { + REJECT; + } else if(bracket_depth==0) { + BEGIN(CLASS_CODE_I); + yylval.cbuf = cbuf; + cbuf = NULL; + return CCODE; + } + add_to_cbuf(yytext); + } -<C_CODE>. { add_to_cbuf(yytext); } -<C_CODE>\n { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\n { add_to_cbuf(yytext); } class { static int found_classes = 0; @@ -588,12 +616,12 @@ <CLASS_CODE_I>(\[[0-9]*\]|\[[A-Za-z_][A-Za-z0-9_]*\])+ { yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return ARRAY_DIM_OR_ATTR; } <CLASS_CODE_I>:[0-9]+ { /* cheat for bitfield */ yylval.id = g_strdup(yytext); - return ARRAY_DIM; + return BITFIELD; } <CLASS_CODE>\{ { BEGIN(CLASS_CODE_I); @@ -612,6 +640,13 @@ BEGIN(INITIAL); return '}'; } +<CLASS_CODE_I>\[ { + BEGIN(ATTR_CODE); + bracket_depth=1; + yylval.line = line_no; + clear_cbuf(); + return '['; + } <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ; /*ignore*/ --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-29 00:24:30.000000000 +0100 @@ -92,11 +92,16 @@ static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; @@ -189,21 +194,25 @@ g_free(s); } - -static void -print_method (FILE *fp, - const char *typeprefix, - const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, - const char *afterargs, - const char *postfix, - const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore, - gboolean first_unused, - gboolean fake_names) +typedef enum +{ + PRINT_METHOD_ONE_ARG_PER_LINE = 1 << 0, + PRINT_METHOD_NO_FUNCBASE = 1 << 1, + PRINT_METHOD_FIRST_UNUSED = 1 << 2, + PRINT_METHOD_FAKE_NAMES = 1 << 3, + PRINT_METHOD_NO_ATTR = 1 << 4 +} PrintMethodFlags; + +static void +print_method2 (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + PrintMethodFlags flags) { GList *li; const char *id; @@ -213,7 +222,7 @@ id = m->id; - if(no_funcbase) + if ((flags & PRINT_METHOD_NO_FUNCBASE) != 0) out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, id, namepostfix); else @@ -229,19 +238,19 @@ if ( ! no_gnu && ! for_cpp && /* g++ has a cow with this */ li == m->args && - first_unused) { + (flags & PRINT_METHOD_FIRST_UNUSED) != 0) { unused = " G_GNUC_UNUSED"; } print_type(fp, arg->atype, FALSE); - if (fake_names) + if ((flags & PRINT_METHOD_FAKE_NAMES) != 0) out_printf (fp, "___fake___"); if(li->next) out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", unused, - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); else out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? @@ -250,11 +259,54 @@ } if(m->vararg) out_printf(fp, ",%s...", - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + + out_printf(fp, "%s)", afterargs); + + if (m->attr && (flags & PRINT_METHOD_NO_ATTR) == 0) + out_printf(fp, " %s", m->attr); + + out_printf(fp, "%s", postfix); +} + +static void +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) +{ + PrintMethodFlags flags = 0; + + if (one_arg_per_line) + flags |= PRINT_METHOD_ONE_ARG_PER_LINE; + if (no_funcbase) + flags |= PRINT_METHOD_NO_FUNCBASE; + if (first_unused) + flags |= PRINT_METHOD_FIRST_UNUSED; + if (fake_names) + flags |= PRINT_METHOD_FAKE_NAMES; + + print_method2(fp, + typeprefix, + nameprefix, + subnameprefix, + namepostfix, + afterargs, + postfix, + m, + flags); } static gboolean @@ -269,6 +321,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -291,6 +346,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -330,6 +388,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -371,11 +432,13 @@ /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); } static void @@ -422,8 +485,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -433,8 +499,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -445,8 +514,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -526,9 +598,9 @@ m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) - print_method(out, - "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, + "static ", "___real_", "", " ", "", ";\n", + m, PRINT_METHOD_NO_ATTR); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -537,15 +609,16 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { - print_method(out, "static ", "", "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { + print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -629,66 +702,68 @@ } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); + } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -2118,6 +2193,33 @@ } static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void add_dispose (Class *c) { out_printf(out, "\nstatic void\n" @@ -2127,7 +2229,7 @@ "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2143,6 +2245,14 @@ if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); @@ -2178,7 +2288,8 @@ c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; @@ -2202,6 +2313,14 @@ if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); @@ -2381,6 +2500,9 @@ /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -2831,11 +2953,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; @@ -2844,11 +2966,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile (out); out_printf (out, "{\n"); @@ -2966,8 +3088,8 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2975,11 +3097,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -3024,8 +3146,9 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_FIRST_UNUSED + | PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -3064,6 +3187,15 @@ /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -3633,6 +3765,9 @@ funcbase); } + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -4441,15 +4576,24 @@ make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-29 00:24:30.000000000 +0100 @@ -146,7 +146,7 @@ static void push_function (int scope, int method, char *oid, char *id, - GString *cbuf, int line_no, int ccode_line, + GString *attr, GString *cbuf, int line_no, int ccode_line, gboolean vararg, GList *flags) { Node *node; @@ -155,7 +155,11 @@ g_assert(scope != CLASS_SCOPE); - if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + if(method == INIT_METHOD + || method == CLASS_INIT_METHOD + || method == CONSTRUCTOR_METHOD + || method == DISPOSE_METHOD + || method == FINALIZE_METHOD) { type = (Type *)node_new (TYPE_NODE, "name", "void", NULL); @@ -207,6 +211,7 @@ "args:steal", funcargs, "onerror:steal", onerror, "defreturn:steal", defreturn, + "attr:steal", attr ? attr->str : NULL, "cbuf:steal", c_cbuf, "line_no", line_no, "ccode_line", ccode_line, @@ -216,6 +221,8 @@ last_added_method = (Method *)node; + if(attr) + g_string_free(attr, FALSE); if(cbuf) g_string_free(cbuf, /*only free segment if we haven't passed it @@ -405,7 +412,7 @@ push_funcarg ("self", FALSE); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - get_id, get_cbuf, get_lineno, + get_id, NULL, get_cbuf, get_lineno, lineno, FALSE, NULL); } @@ -439,7 +446,7 @@ typestack = g_list_prepend (typestack, node2); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - set_id, set_cbuf, set_lineno, + set_id, NULL, set_cbuf, set_lineno, lineno, FALSE, NULL); } @@ -677,7 +684,7 @@ %token CONST VOID STRUCT UNION ENUM THREEDOTS %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR -%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR +%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM_OR_ATTR BITFIELD SINGLE_CHAR %token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE STRING %token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE PROPERTY ARGUMENT %token <line> VIRTUAL SIGNAL OVERRIDE @@ -982,7 +989,7 @@ variable: scope type TOKEN varoptions ';' { push_variable($<id>3, the_scope,$<line>1, NULL); } - | scope type TOKEN ARRAY_DIM varoptions ';' { + | scope type TOKEN array_dim varoptions ';' { push_variable($<id>3, the_scope, $<line>1, $<id>4); } ; @@ -1678,9 +1685,25 @@ YYERROR; } push_function(the_scope, $<sigtype>3,NULL, - $<id>5, $<cbuf>10,$<line>1, + $<id>5, NULL, $<cbuf>10,$<line>1, ccode_line, vararg, $<list>2); } + | attrs SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>4,NULL, + $<id>6, $<cbuf>1, $<cbuf>11,$<line>2, + ccode_line, vararg, $<list>3); + } | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1694,9 +1717,25 @@ YYERROR; } push_function(the_scope, $<sigtype>4, NULL, - $<id>6, $<cbuf>11, $<line>2, + $<id>6, NULL, $<cbuf>11, $<line>2, ccode_line, vararg, $<list>3); } + | attrs scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>5, NULL, + $<id>7, $<cbuf>1, $<cbuf>12, $<line>3, + ccode_line, vararg, $<list>4); + } | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1710,7 +1749,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>1, + NULL, $<cbuf>9, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>2, ccode_line, vararg, NULL); } | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1726,7 +1781,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>2, + NULL, $<cbuf>9, $<line>2, + ccode_line, vararg, NULL); + } + | attrs scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>5, + $<cbuf>1, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1737,12 +1808,23 @@ YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - $<id>3, $<cbuf>8, $<line>1, + $<id>3, NULL, $<cbuf>8, $<line>1, + ccode_line, vararg, NULL); + } + | attrs VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + $<id>4, $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode { push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3, - $<id>6, $<cbuf>11, + $<id>6, NULL, $<cbuf>11, $<line>1, ccode_line, vararg, NULL); } @@ -1753,32 +1835,74 @@ YYERROR; } push_function(the_scope, REGULAR_METHOD, NULL, $<id>3, - $<cbuf>8, $<line>1, ccode_line, + NULL, $<cbuf>8, $<line>1, ccode_line, + vararg, NULL); + } + | attrs scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, $<id>4, + $<cbuf>1, $<cbuf>9, $<line>2, ccode_line, vararg, NULL); } | TOKEN '(' TOKEN ')' codenocode { if(strcmp($<id>1, "init")==0) { push_init_arg($<id>3,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else if(strcmp($<id>1, "class_init")==0) { push_init_arg($<id>3,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "constructor")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "dispose")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "finalize")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else { g_free($<id>1); g_free($<id>3); g_string_free($<cbuf>5,TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } ; +attrs: + '[' CCODE { + $<cbuf>$ = $<cbuf>2; + } + | ARRAY_DIM_OR_ATTR { + int len = strlen($<id>1); + + g_assert($<id>1[0] == '['); + g_assert(len >= 2 && $<id>1[len - 1] == ']'); + + /* strip the brackets */ + $<cbuf>$ = g_string_new_len($<id>1 + 1, len - 2); + g_free($<id>1); + } + ; + returnvals: TOKEN retcode { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1900,7 +2024,7 @@ arg: type TOKEN { push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM { + | type TOKEN array_dim { push_funcarg($<id>2,$<id>3); } | type TOKEN '(' TOKEN checklist ')' { @@ -1911,7 +2035,7 @@ g_free($<id>4); push_funcarg($<id>2,NULL); } - | type TOKEN ARRAY_DIM '(' TOKEN checklist ')' { + | type TOKEN array_dim '(' TOKEN checklist ')' { if(strcmp($<id>5,"check")!=0) { yyerror(_("parse error")); YYERROR; @@ -2105,5 +2229,10 @@ | SINGLE_CHAR { $<id>$ = $<id>1; } | TOKEN { $<id>$ = $<id>1; } ; + +array_dim: + ARRAY_DIM_OR_ATTR + | BITFIELD + ; %% --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-29 00:24:30.000000000 +0100 @@ -40,6 +40,9 @@ REGULAR_METHOD, INIT_METHOD, CLASS_INIT_METHOD, + CONSTRUCTOR_METHOD, + DISPOSE_METHOD, + FINALIZE_METHOD, VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD, @@ -126,6 +129,7 @@ NODELIST args STRING onerror STRING defreturn + STRING attr STRING cbuf INT line_no INT ccode_line

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

patch allowing to add GCC attributes to methods

2008-01-28T09:10:20Z

The attached patch allows to add GCC attributes to methods, using a
syntax borrowed from C#. For instance:

[G_GNUC_PRINTF(1, 2)]
private void say_something (const char *format, ...)
{
}

The text enclosed in brackets is not parsed (the lexer returns a CCODE
token). It is inserted verbatim in the function declaration, before
the trailing semicolon.

With this patch, gob no longer unconditionally adds G_GNUC_UNUSED to
methods, which is a bad idea since it might hide programming
errors. Users should now specify it manually when needed.

Attributes are not supported for overriden methods since these methods
are not meant to be called directly. For signals and virtual methods,
the attributes are added to the declaration of the invocation wrapper,
but not to the "__real" default implementation method that gob emits.

Two patches are provided:

gob2-2.0.15-attr.diff

The attributes feature alone.

gob2-2.0.15-gobject-overrides-and-attr.diff

The attributes feature and another feature I've
implemented previously (see the message with subject
"patch adding first-class support of
constructor/dispose/finalize methods"). This unified
patch is provided because the two individual patches
conflict with each other and require merging.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-attr.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-01-28 16:04:28.000000000 +0100 @@ -31,6 +31,7 @@ #include "main.h" #include "util.h" +static int bracket_depth = 0; static int parenth_depth = 0; static int before_comment /* New flex is on drugs */ @@ -102,6 +103,7 @@ %x COMMENT %x C_CODE +%x ATTR_CODE %x CODE_STRING %x CLASS_CODE %x CLASS_STRING @@ -267,7 +269,7 @@ add_to_cbuf(yytext); } -<C_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } +<C_CODE,ATTR_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } <CLASS_CODE>\/\/.*$ { ; /*comment, ignore*/ } <CLASS_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } <PROPERTY_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } @@ -277,20 +279,25 @@ BEGIN(COMMENT); before_comment = C_CODE; } +<ATTR_CODE>\/\* { + add_to_cbuf(yytext); + BEGIN(COMMENT); + before_comment = ATTR_CODE; +} <CLASS_CODE>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE; } <CLASS_CODE_I>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } <PROPERTY_CODE_I>\/\* {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } <COMMENT>\*\/ { - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } <COMMENT>. { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } <COMMENT>\n { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } ^\%(a|all)\{ { @@ -353,14 +360,14 @@ return code_type; } -<C_CODE>\'\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\"\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\"\' { add_to_cbuf(yytext); } -<C_CODE>\\. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\\. { add_to_cbuf(yytext); } <C_CODE>\" { @@ -368,6 +375,11 @@ before_string = C_CODE; add_to_cbuf(yytext); } +<ATTR_CODE>\" { + BEGIN(CODE_STRING); + before_string = ATTR_CODE; + add_to_cbuf(yytext); + } <PROPERTY_CODE_I>\" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; @@ -391,6 +403,10 @@ parenth_depth++; add_to_cbuf(yytext); } +<ATTR_CODE>\[ { + bracket_depth++; + add_to_cbuf(yytext); + } <C_CODE>\} { parenth_depth--; if(parenth_depth<0) { @@ -403,9 +419,21 @@ } add_to_cbuf(yytext); } +<ATTR_CODE>\] { + bracket_depth--; + if(bracket_depth<0) { + REJECT; + } else if(bracket_depth==0) { + BEGIN(CLASS_CODE_I); + yylval.cbuf = cbuf; + cbuf = NULL; + return CCODE; + } + add_to_cbuf(yytext); + } -<C_CODE>. { add_to_cbuf(yytext); } -<C_CODE>\n { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\n { add_to_cbuf(yytext); } class { static int found_classes = 0; @@ -612,6 +640,13 @@ BEGIN(INITIAL); return '}'; } +<CLASS_CODE_I>\[ { + BEGIN(ATTR_CODE); + bracket_depth=1; + yylval.line = line_no; + clear_cbuf(); + return '['; + } <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ; /*ignore*/ --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-28 17:01:49.000000000 +0100 @@ -189,21 +189,25 @@ g_free(s); } - -static void -print_method (FILE *fp, - const char *typeprefix, - const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, - const char *afterargs, - const char *postfix, - const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore, - gboolean first_unused, - gboolean fake_names) +typedef enum +{ + PRINT_METHOD_ONE_ARG_PER_LINE = 1 << 0, + PRINT_METHOD_NO_FUNCBASE = 1 << 1, + PRINT_METHOD_FIRST_UNUSED = 1 << 2, + PRINT_METHOD_FAKE_NAMES = 1 << 3, + PRINT_METHOD_NO_ATTR = 1 << 4 +} PrintMethodFlags; + +static void +print_method2 (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + PrintMethodFlags flags) { GList *li; const char *id; @@ -213,7 +217,7 @@ id = m->id; - if(no_funcbase) + if ((flags & PRINT_METHOD_NO_FUNCBASE) != 0) out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, id, namepostfix); else @@ -229,19 +233,19 @@ if ( ! no_gnu && ! for_cpp && /* g++ has a cow with this */ li == m->args && - first_unused) { + (flags & PRINT_METHOD_FIRST_UNUSED) != 0) { unused = " G_GNUC_UNUSED"; } print_type(fp, arg->atype, FALSE); - if (fake_names) + if ((flags & PRINT_METHOD_FAKE_NAMES) != 0) out_printf (fp, "___fake___"); if(li->next) out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", unused, - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); else out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? @@ -250,11 +254,54 @@ } if(m->vararg) out_printf(fp, ",%s...", - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + + out_printf(fp, "%s)", afterargs); + + if (m->attr && (flags & PRINT_METHOD_NO_ATTR) == 0) + out_printf(fp, " %s", m->attr); + + out_printf(fp, "%s", postfix); +} + +static void +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) +{ + PrintMethodFlags flags = 0; + + if (one_arg_per_line) + flags |= PRINT_METHOD_ONE_ARG_PER_LINE; + if (no_funcbase) + flags |= PRINT_METHOD_NO_FUNCBASE; + if (first_unused) + flags |= PRINT_METHOD_FIRST_UNUSED; + if (fake_names) + flags |= PRINT_METHOD_FAKE_NAMES; + + print_method2(fp, + typeprefix, + nameprefix, + subnameprefix, + namepostfix, + afterargs, + postfix, + m, + flags); } static gboolean @@ -371,11 +418,13 @@ /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); } static void @@ -422,8 +471,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -433,8 +485,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -445,8 +500,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -526,9 +584,9 @@ m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) - print_method(out, - "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, + "static ", "___real_", "", " ", "", ";\n", + m, PRINT_METHOD_NO_ATTR); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -537,15 +595,13 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD) { - print_method(out, "static ", "", "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -2831,11 +2887,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; @@ -2844,11 +2900,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile (out); out_printf (out, "{\n"); @@ -2966,8 +3022,8 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2975,11 +3031,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -3024,8 +3080,9 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_FIRST_UNUSED + | PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-28 16:58:25.000000000 +0100 @@ -146,7 +146,7 @@ static void push_function (int scope, int method, char *oid, char *id, - GString *cbuf, int line_no, int ccode_line, + GString *attr, GString *cbuf, int line_no, int ccode_line, gboolean vararg, GList *flags) { Node *node; @@ -207,6 +207,7 @@ "args:steal", funcargs, "onerror:steal", onerror, "defreturn:steal", defreturn, + "attr:steal", attr ? attr->str : NULL, "cbuf:steal", c_cbuf, "line_no", line_no, "ccode_line", ccode_line, @@ -216,6 +217,8 @@ last_added_method = (Method *)node; + if(attr) + g_string_free(attr, FALSE); if(cbuf) g_string_free(cbuf, /*only free segment if we haven't passed it @@ -405,7 +408,7 @@ push_funcarg ("self", FALSE); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - get_id, get_cbuf, get_lineno, + get_id, NULL, get_cbuf, get_lineno, lineno, FALSE, NULL); } @@ -439,7 +442,7 @@ typestack = g_list_prepend (typestack, node2); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - set_id, set_cbuf, set_lineno, + set_id, NULL, set_cbuf, set_lineno, lineno, FALSE, NULL); } @@ -1678,9 +1681,25 @@ YYERROR; } push_function(the_scope, $<sigtype>3,NULL, - $<id>5, $<cbuf>10,$<line>1, + $<id>5, NULL, $<cbuf>10,$<line>1, ccode_line, vararg, $<list>2); } + | '[' CCODE SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>5,NULL, + $<id>7, $<cbuf>2, $<cbuf>12,$<line>3, + ccode_line, vararg, $<list>4); + } | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1694,9 +1713,25 @@ YYERROR; } push_function(the_scope, $<sigtype>4, NULL, - $<id>6, $<cbuf>11, $<line>2, + $<id>6, NULL, $<cbuf>11, $<line>2, ccode_line, vararg, $<list>3); } + | '[' CCODE scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>6, NULL, + $<id>8, $<cbuf>2, $<cbuf>13, $<line>4, + ccode_line, vararg, $<list>5); + } | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1710,7 +1745,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>1, + NULL, $<cbuf>9, $<line>1, + ccode_line, vararg, NULL); + } + | '[' CCODE VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>6, + $<cbuf>2, $<cbuf>11, $<line>3, ccode_line, vararg, NULL); } | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1726,7 +1777,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>2, + NULL, $<cbuf>9, $<line>2, + ccode_line, vararg, NULL); + } + | '[' CCODE scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>6, + $<cbuf>2, $<cbuf>11, $<line>4, ccode_line, vararg, NULL); } | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1737,12 +1804,23 @@ YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - $<id>3, $<cbuf>8, $<line>1, + $<id>3, NULL, $<cbuf>8, $<line>1, + ccode_line, vararg, NULL); + } + | '[' CCODE VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + $<id>5, $<cbuf>2, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode { push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3, - $<id>6, $<cbuf>11, + $<id>6, NULL, $<cbuf>11, $<line>1, ccode_line, vararg, NULL); } @@ -1753,19 +1831,29 @@ YYERROR; } push_function(the_scope, REGULAR_METHOD, NULL, $<id>3, - $<cbuf>8, $<line>1, ccode_line, + NULL, $<cbuf>8, $<line>1, ccode_line, + vararg, NULL); + } + | '[' CCODE scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, $<id>5, + $<cbuf>2, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | TOKEN '(' TOKEN ')' codenocode { if(strcmp($<id>1, "init")==0) { push_init_arg($<id>3,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else if(strcmp($<id>1, "class_init")==0) { push_init_arg($<id>3,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else { g_free($<id>1); --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-28 16:16:21.000000000 +0100 @@ -126,6 +126,7 @@ NODELIST args STRING onerror STRING defreturn + STRING attr STRING cbuf INT line_no INT ccode_line

[gob2-2.0.15-gobject-overrides-and-attr.diff]

--- src/lexer.l.orig 2007-09-28 06:26:49.000000000 +0200 +++ src/lexer.l 2008-01-28 17:15:53.000000000 +0100 @@ -31,6 +31,7 @@ #include "main.h" #include "util.h" +static int bracket_depth = 0; static int parenth_depth = 0; static int before_comment /* New flex is on drugs */ @@ -102,6 +103,7 @@ %x COMMENT %x C_CODE +%x ATTR_CODE %x CODE_STRING %x CLASS_CODE %x CLASS_STRING @@ -267,7 +269,7 @@ add_to_cbuf(yytext); } -<C_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } +<C_CODE,ATTR_CODE>\/\/.*$ { add_to_cbuf(yytext); /*comment, ignore*/ } <CLASS_CODE>\/\/.*$ { ; /*comment, ignore*/ } <CLASS_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } <PROPERTY_CODE_I>\/\/.*$ { ; /*comment, ignore*/ } @@ -277,20 +279,25 @@ BEGIN(COMMENT); before_comment = C_CODE; } +<ATTR_CODE>\/\* { + add_to_cbuf(yytext); + BEGIN(COMMENT); + before_comment = ATTR_CODE; +} <CLASS_CODE>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE; } <CLASS_CODE_I>\/\* {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } <PROPERTY_CODE_I>\/\* {BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } <COMMENT>\*\/ { - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } <COMMENT>. { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } <COMMENT>\n { /* comment, ignore */ - if(before_comment == C_CODE) add_to_cbuf(yytext); + if(before_comment == C_CODE || before_comment == ATTR_CODE) add_to_cbuf(yytext); } ^\%(a|all)\{ { @@ -353,14 +360,14 @@ return code_type; } -<C_CODE>\'\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\{\' { add_to_cbuf(yytext); } -<C_CODE>\'\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\}\' { add_to_cbuf(yytext); } -<C_CODE>\'\"\' { add_to_cbuf(yytext); } -<C_CODE>\'\\\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\{\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\}\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\"\' { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\'\\\"\' { add_to_cbuf(yytext); } -<C_CODE>\\. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\\. { add_to_cbuf(yytext); } <C_CODE>\" { @@ -368,6 +375,11 @@ before_string = C_CODE; add_to_cbuf(yytext); } +<ATTR_CODE>\" { + BEGIN(CODE_STRING); + before_string = ATTR_CODE; + add_to_cbuf(yytext); + } <PROPERTY_CODE_I>\" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; @@ -391,6 +403,10 @@ parenth_depth++; add_to_cbuf(yytext); } +<ATTR_CODE>\[ { + bracket_depth++; + add_to_cbuf(yytext); + } <C_CODE>\} { parenth_depth--; if(parenth_depth<0) { @@ -403,9 +419,21 @@ } add_to_cbuf(yytext); } +<ATTR_CODE>\] { + bracket_depth--; + if(bracket_depth<0) { + REJECT; + } else if(bracket_depth==0) { + BEGIN(CLASS_CODE_I); + yylval.cbuf = cbuf; + cbuf = NULL; + return CCODE; + } + add_to_cbuf(yytext); + } -<C_CODE>. { add_to_cbuf(yytext); } -<C_CODE>\n { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>. { add_to_cbuf(yytext); } +<C_CODE,ATTR_CODE>\n { add_to_cbuf(yytext); } class { static int found_classes = 0; @@ -612,6 +640,13 @@ BEGIN(INITIAL); return '}'; } +<CLASS_CODE_I>\[ { + BEGIN(ATTR_CODE); + bracket_depth=1; + yylval.line = line_no; + clear_cbuf(); + return '['; + } <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ; /*ignore*/ --- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-28 17:15:53.000000000 +0100 @@ -92,11 +92,16 @@ static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; @@ -189,21 +194,25 @@ g_free(s); } - -static void -print_method (FILE *fp, - const char *typeprefix, - const char *nameprefix, - const char *subnameprefix, - const char *namepostfix, - const char *afterargs, - const char *postfix, - const Method *m, - gboolean one_arg_per_line, - gboolean no_funcbase, - gboolean kill_underscore, - gboolean first_unused, - gboolean fake_names) +typedef enum +{ + PRINT_METHOD_ONE_ARG_PER_LINE = 1 << 0, + PRINT_METHOD_NO_FUNCBASE = 1 << 1, + PRINT_METHOD_FIRST_UNUSED = 1 << 2, + PRINT_METHOD_FAKE_NAMES = 1 << 3, + PRINT_METHOD_NO_ATTR = 1 << 4 +} PrintMethodFlags; + +static void +print_method2 (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + PrintMethodFlags flags) { GList *li; const char *id; @@ -213,7 +222,7 @@ id = m->id; - if(no_funcbase) + if ((flags & PRINT_METHOD_NO_FUNCBASE) != 0) out_printf(fp, "%s%s%s%s(", nameprefix, subnameprefix, id, namepostfix); else @@ -229,19 +238,19 @@ if ( ! no_gnu && ! for_cpp && /* g++ has a cow with this */ li == m->args && - first_unused) { + (flags & PRINT_METHOD_FIRST_UNUSED) != 0) { unused = " G_GNUC_UNUSED"; } print_type(fp, arg->atype, FALSE); - if (fake_names) + if ((flags & PRINT_METHOD_FAKE_NAMES) != 0) out_printf (fp, "___fake___"); if(li->next) out_printf(fp, "%s%s%s,%s", arg->name, arg->atype->postfix ? arg->atype->postfix : "", unused, - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); else out_printf(fp, "%s%s%s", arg->name, arg->atype->postfix ? @@ -250,11 +259,54 @@ } if(m->vararg) out_printf(fp, ",%s...", - one_arg_per_line ? "\n\t\t\t\t\t" : " "); + (flags & PRINT_METHOD_ONE_ARG_PER_LINE) != 0 ? "\n\t\t\t\t\t" : " "); } else { out_printf(fp, "void"); } - out_printf(fp, "%s)%s", afterargs, postfix); + + out_printf(fp, "%s)", afterargs); + + if (m->attr && (flags & PRINT_METHOD_NO_ATTR) == 0) + out_printf(fp, " %s", m->attr); + + out_printf(fp, "%s", postfix); +} + +static void +print_method (FILE *fp, + const char *typeprefix, + const char *nameprefix, + const char *subnameprefix, + const char *namepostfix, + const char *afterargs, + const char *postfix, + const Method *m, + gboolean one_arg_per_line, + gboolean no_funcbase, + gboolean kill_underscore, + gboolean first_unused, + gboolean fake_names) +{ + PrintMethodFlags flags = 0; + + if (one_arg_per_line) + flags |= PRINT_METHOD_ONE_ARG_PER_LINE; + if (no_funcbase) + flags |= PRINT_METHOD_NO_FUNCBASE; + if (first_unused) + flags |= PRINT_METHOD_FIRST_UNUSED; + if (fake_names) + flags |= PRINT_METHOD_FAKE_NAMES; + + print_method2(fp, + typeprefix, + nameprefix, + subnameprefix, + namepostfix, + afterargs, + postfix, + m, + flags); } static gboolean @@ -269,6 +321,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -291,6 +346,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -330,6 +388,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -371,11 +432,13 @@ /* if a signal mark it as such */ if(m->method != VIRTUAL_METHOD) - print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); else - print_method(outh, "\t", "(* ", "", ") ", "", ";\n", - m, FALSE, TRUE, TRUE, FALSE, FALSE); + print_method2(outh, "\t", "(* ", "", ") ", "", ";\n", + m, PRINT_METHOD_NO_FUNCBASE | + PRINT_METHOD_NO_ATTR); } static void @@ -422,8 +485,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_after */ @@ -433,8 +499,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data))\n", m->id); /* connect_data */ @@ -445,8 +514,11 @@ "\"%s\"," "(GCallback) __extension__ ({", funcbase, m->id, macrobase, typebase, m->id); - print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", - " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE); + print_method2 (outh, "", "(* ___", "", ") ", ", gpointer ___data ", + " = (func); ", m, + PRINT_METHOD_NO_FUNCBASE + | PRINT_METHOD_FAKE_NAMES + | PRINT_METHOD_NO_ATTR); out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -526,9 +598,9 @@ m->method == SIGNAL_FIRST_METHOD || m->method == VIRTUAL_METHOD) { if(m->cbuf) - print_method(out, - "static ", "___real_", "", " ", "", ";\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, + "static ", "___real_", "", " ", "", ";\n", + m, PRINT_METHOD_NO_ATTR); } /* no else, here, it might still have a private prototype, it's not * exclusive */ @@ -537,15 +609,16 @@ m->cbuf)) { /* add unique ID */ char *s = g_strdup_printf("___%x_", (guint)m->unique_id); - print_method(out, "static ", s, "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + print_method(out, "static ", s, "", " ", "", ";\n", m, FALSE, FALSE, FALSE, FALSE, FALSE); g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { - print_method(out, "static ", "", "", " ", "", - no_gnu?";\n":" G_GNUC_UNUSED;\n", + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { + print_method(out, "static ", "", "", " ", "", ";\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); } } @@ -629,66 +702,68 @@ } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); + } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -2118,6 +2193,33 @@ } static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void add_dispose (Class *c) { out_printf(out, "\nstatic void\n" @@ -2127,7 +2229,7 @@ "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2143,6 +2245,14 @@ if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); @@ -2178,7 +2288,8 @@ c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; @@ -2202,6 +2313,14 @@ if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); @@ -2381,6 +2500,9 @@ /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -2831,11 +2953,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, TRUE, TRUE); /* the outfile line was added above */ break; @@ -2844,11 +2966,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope == PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile (out); out_printf (out, "{\n"); @@ -2966,8 +3088,8 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -2975,11 +3097,11 @@ if(m->line_no > 0) out_addline_infile(out, m->line_no); if(m->scope==PRIVATE_SCOPE) - print_method(out, "static ", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "static ", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); else /* PUBLIC, PROTECTED */ - print_method(out, "", "\n", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method2(out, "", "\n", "", " ", "", "\n", + m, PRINT_METHOD_NO_ATTR); out_addline_outfile(out); out_printf(out, "{\n" "\t%sClass *klass;\n", typebase); @@ -3024,8 +3146,9 @@ break; if(m->line_no > 0) out_addline_infile(out, m->line_no); - print_method(out, "static ", "\n___real_", "", " ", "", "\n", - m, FALSE, FALSE, TRUE, TRUE, FALSE); + print_method2(out, "static ", "\n___real_", "", " ", "", "\n", + m, PRINT_METHOD_FIRST_UNUSED + | PRINT_METHOD_NO_ATTR); print_method_body(m, FALSE, TRUE); /* the outfile line was added above */ break; @@ -3064,6 +3187,15 @@ /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -3633,6 +3765,9 @@ funcbase); } + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -4441,15 +4576,24 @@ make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-28 17:16:24.000000000 +0100 @@ -146,7 +146,7 @@ static void push_function (int scope, int method, char *oid, char *id, - GString *cbuf, int line_no, int ccode_line, + GString *attr, GString *cbuf, int line_no, int ccode_line, gboolean vararg, GList *flags) { Node *node; @@ -155,7 +155,11 @@ g_assert(scope != CLASS_SCOPE); - if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + if(method == INIT_METHOD + || method == CLASS_INIT_METHOD + || method == CONSTRUCTOR_METHOD + || method == DISPOSE_METHOD + || method == FINALIZE_METHOD) { type = (Type *)node_new (TYPE_NODE, "name", "void", NULL); @@ -207,6 +211,7 @@ "args:steal", funcargs, "onerror:steal", onerror, "defreturn:steal", defreturn, + "attr:steal", attr ? attr->str : NULL, "cbuf:steal", c_cbuf, "line_no", line_no, "ccode_line", ccode_line, @@ -216,6 +221,8 @@ last_added_method = (Method *)node; + if(attr) + g_string_free(attr, FALSE); if(cbuf) g_string_free(cbuf, /*only free segment if we haven't passed it @@ -405,7 +412,7 @@ push_funcarg ("self", FALSE); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - get_id, get_cbuf, get_lineno, + get_id, NULL, get_cbuf, get_lineno, lineno, FALSE, NULL); } @@ -439,7 +446,7 @@ typestack = g_list_prepend (typestack, node2); push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, - set_id, set_cbuf, set_lineno, + set_id, NULL, set_cbuf, set_lineno, lineno, FALSE, NULL); } @@ -1678,9 +1685,25 @@ YYERROR; } push_function(the_scope, $<sigtype>3,NULL, - $<id>5, $<cbuf>10,$<line>1, + $<id>5, NULL, $<cbuf>10,$<line>1, ccode_line, vararg, $<list>2); } + | '[' CCODE SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>5,NULL, + $<id>7, $<cbuf>2, $<cbuf>12,$<line>3, + ccode_line, vararg, $<list>4); + } | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1694,9 +1717,25 @@ YYERROR; } push_function(the_scope, $<sigtype>4, NULL, - $<id>6, $<cbuf>11, $<line>2, + $<id>6, NULL, $<cbuf>11, $<line>2, ccode_line, vararg, $<list>3); } + | '[' CCODE scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, $<sigtype>6, NULL, + $<id>8, $<cbuf>2, $<cbuf>13, $<line>4, + ccode_line, vararg, $<list>5); + } | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1710,7 +1749,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>1, + NULL, $<cbuf>9, $<line>1, + ccode_line, vararg, NULL); + } + | '[' CCODE VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>6, + $<cbuf>2, $<cbuf>11, $<line>3, ccode_line, vararg, NULL); } | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1726,7 +1781,23 @@ YYERROR; } push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4, - $<cbuf>9, $<line>2, + NULL, $<cbuf>9, $<line>2, + ccode_line, vararg, NULL); + } + | '[' CCODE scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>6, + $<cbuf>2, $<cbuf>11, $<line>4, ccode_line, vararg, NULL); } | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { @@ -1737,12 +1808,23 @@ YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - $<id>3, $<cbuf>8, $<line>1, + $<id>3, NULL, $<cbuf>8, $<line>1, + ccode_line, vararg, NULL); + } + | '[' CCODE VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode { + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + $<id>5, $<cbuf>2, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode { push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3, - $<id>6, $<cbuf>11, + $<id>6, NULL, $<cbuf>11, $<line>1, ccode_line, vararg, NULL); } @@ -1753,27 +1835,53 @@ YYERROR; } push_function(the_scope, REGULAR_METHOD, NULL, $<id>3, - $<cbuf>8, $<line>1, ccode_line, + NULL, $<cbuf>8, $<line>1, ccode_line, + vararg, NULL); + } + | '[' CCODE scope type TOKEN '(' funcargs ')' returnvals codenocode { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, $<id>5, + $<cbuf>2, $<cbuf>10, $<line>3, ccode_line, vararg, NULL); } | TOKEN '(' TOKEN ')' codenocode { if(strcmp($<id>1, "init")==0) { push_init_arg($<id>3,FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else if(strcmp($<id>1, "class_init")==0) { push_init_arg($<id>3,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - $<id>1, $<cbuf>5, $<line>2, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "constructor")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "dispose")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "finalize")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + $<id>1, NULL, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); } else { g_free($<id>1); g_free($<id>3); g_string_free($<cbuf>5,TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-28 17:15:53.000000000 +0100 @@ -40,6 +40,9 @@ REGULAR_METHOD, INIT_METHOD, CLASS_INIT_METHOD, + CONSTRUCTOR_METHOD, + DISPOSE_METHOD, + FINALIZE_METHOD, VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD, @@ -126,6 +129,7 @@ NODELIST args STRING onerror STRING defreturn + STRING attr STRING cbuf INT line_no INT ccode_line

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

patch allowing to omit "from G:Object" in class declaration

2008-01-20T16:43:42Z

Well, I think the subject says it all.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-optional-baseclass.diff]

--- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-21 01:30:42.000000000 +0100 @@ -770,10 +770,10 @@ } ; -classdec: CLASS TYPETOKEN FROM TYPETOKEN classflags { +classdec: CLASS TYPETOKEN classbase classflags { class = node_new (CLASS_NODE, "otype:steal", $<id>2, - "ptype:steal", $<id>4, + "ptype:steal", $<id>3, "bonobo_object_class:steal", bonobo_object_class, "glade_xml", glade_xml, "interfaces:steal", interfaces, @@ -787,6 +787,15 @@ } ; +classbase: + /* empty */ { + $<id>$ = g_strdup("G:Object"); + } + | FROM TYPETOKEN { + $<id>$ = $<id>2; + } + ; + classflags: | '(' TOKEN ')' classflags { if(strcmp($<id>2,"abstract") == 0) {

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

patch adding first-class support of constructor/dispose/finalize methods

2008-01-20T16:24:53Z

The attached patch allows to write:

constructor (self)
{
/* hi */
}

dispose (self)
{
/* hi */
}

finalize (self)
{
/* hi */
}

instead of:

override (G:Object) GObject *
constructor (GType type, unsigned int n_construct_properties, GObjectConstructParam *construct_params)
{
GObject *object;
Self *self;

object = PARENT_HANDLER(type, n_construct_properties, construct_params);
self = SELF(object);

/* hi */

return object;
}

override (G:Object) void
dispose (GObject *object)
{
Self *self = SELF(object);

/* hi */

PARENT_HANDLER(object);
}

override (G:Object) void
finalize (GObject *object)
{
Self *self = SELF(object);

/* hi */

PARENT_HANDLER(object);
}

In my opinion, these virtual methods are used so often that they
deserve such first-class support.

Of course, to preserve backwards compatibility, the normal override
syntax is still supported.

--
Jean-Yves Lefort <jylefort@...>

[gob2-2.0.15-gobject-overrides.diff]

--- src/main.c.orig 2007-10-17 16:49:04.000000000 +0200 +++ src/main.c 2008-01-21 00:53:57.000000000 +0100 @@ -92,11 +92,16 @@ static gboolean special_array[SPECIAL_LAST] = {0}; static gboolean any_special = FALSE; +static gboolean need_constructor = FALSE; +static Method * user_constructor = NULL; + static gboolean need_dispose = FALSE; static Method * dispose_handler = NULL; +static Method * user_dispose_method = NULL; static gboolean need_finalize = FALSE; static Method * finalize_handler = NULL; +static Method * user_finalize_method = NULL; FILE *out = NULL; FILE *outh = NULL; @@ -269,6 +274,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -291,6 +299,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -330,6 +341,9 @@ if(m->method == INIT_METHOD || m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD || m->method == OVERRIDE_METHOD) continue; @@ -543,7 +557,10 @@ g_free(s); } else if(m->scope == PRIVATE_SCOPE || m->method == INIT_METHOD || - m->method == CLASS_INIT_METHOD) { + m->method == CLASS_INIT_METHOD || + m->method == CONSTRUCTOR_METHOD || + m->method == DISPOSE_METHOD || + m->method == FINALIZE_METHOD) { print_method(out, "static ", "", "", " ", "", no_gnu?";\n":" G_GNUC_UNUSED;\n", m, FALSE, FALSE, TRUE, FALSE, FALSE); @@ -629,66 +646,68 @@ } } -static void -find_dispose(const Class *cl) +static Method * +find_method(const Class *cl, int method, const char *id) { GList *li; - dispose_handler = NULL; for(li=cl->nodes;li;li=g_list_next(li)) { Node *n = li->data; if(n->type == METHOD_NODE) { Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "dispose")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "dispose method override " - "with more then one " - "parameter"); - } - dispose_handler = m; - break; - } + if (m->method == method + && (id == NULL || strcmp(m->id, id)==0)) + return m; } } + + return NULL; } static void -find_finalize(const Class *cl) +find_constructor(const Class *cl) { - GList *li; + user_constructor = find_method(cl, CONSTRUCTOR_METHOD, NULL); +} - finalize_handler = NULL; - for(li=cl->nodes;li;li=g_list_next(li)) { - Node *n = li->data; - if(n->type == METHOD_NODE) { - Method *m = (Method *)n; - if(m->method == OVERRIDE_METHOD && - strcmp(m->id, "finalize")==0) { - if(strcmp(m->otype, "G:Object") != 0) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "of class other then " - "G:Object"); - } - if(g_list_length(m->args) != 1) { - error_print(GOB_ERROR, m->line_no, - "finalize method override " - "with more then one " - "parameter"); - } - finalize_handler = m; - break; - } - } +static void +find_dispose(const Class *cl) +{ + dispose_handler = find_method(cl, OVERRIDE_METHOD, "dispose"); + if (dispose_handler != NULL) { + if(strcmp(dispose_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "of class other then " + "G:Object"); + if(g_list_length(dispose_handler->args) != 1) + error_print(GOB_ERROR, dispose_handler->line_no, + "dispose method override " + "with more then one " + "parameter"); } + + user_dispose_method = find_method(cl, DISPOSE_METHOD, NULL); +} + +static void +find_finalize(const Class *cl) +{ + finalize_handler = find_method(cl, OVERRIDE_METHOD, "finalize"); + if (finalize_handler != NULL) { + if(strcmp(finalize_handler->otype, "G:Object") != 0) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "of class other then " + "G:Object"); + if(g_list_length(finalize_handler->args) != 1) + error_print(GOB_ERROR, finalize_handler->line_no, + "finalize method override " + "with more then one " + "parameter"); + } + + user_finalize_method = find_method(cl, FINALIZE_METHOD, NULL); } @@ -2118,6 +2137,33 @@ } static void +add_constructor (Class *c) +{ + out_printf(out, "\nstatic GObject *\n" + "___constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)\n" + "{\n"); + out_printf(out, + "#define __GOB_FUNCTION__ \"%s::constructor\"\n", + c->otype); + + out_printf(out, "\tGObject *obj_self;\n"); + out_printf(out, "\t%s *self;\n", typebase); + + out_printf(out, "\tobj_self = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);\n"); + out_printf(out, "\tself = %s (obj_self);\n", macrobase); + + if (user_constructor->line_no > 0) + out_addline_infile (out, user_constructor->line_no); + out_printf (out, "\t%s_constructor (self);\n", funcbase); + if (user_constructor->line_no > 0) + out_addline_outfile (out); + + out_printf(out, "\treturn obj_self;\n"); + out_printf(out, "}\n" + "#undef __GOB_FUNCTION__\n\n"); +} + +static void add_dispose (Class *c) { out_printf(out, "\nstatic void\n" @@ -2127,7 +2173,7 @@ "#define __GOB_FUNCTION__ \"%s::dispose\"\n", c->otype); - if (unreftors > 0) { + if (unreftors > 0 || user_dispose_method != NULL) { out_printf (out, "\t%s *self%s = %s (obj_self);\n", typebase, ! no_gnu ? " G_GNUC_UNUSED" : "", @@ -2143,6 +2189,14 @@ if (dispose_handler->line_no > 0) out_addline_outfile (out); } else { + if (user_dispose_method != NULL) { + if (user_dispose_method->line_no > 0) + out_addline_infile (out, user_dispose_method->line_no); + out_printf (out, "\t%s_dispose (self);\n", funcbase); + if (user_dispose_method->line_no > 0) + out_addline_outfile (out); + } + out_printf (out, "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n" "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n"); @@ -2178,7 +2232,8 @@ c->otype); if (privates > 0 || - destructors > 0) { + destructors > 0 || + user_finalize_method != NULL) { const char *unused = ""; if ( ! no_gnu) unused = " G_GNUC_UNUSED"; @@ -2202,6 +2257,14 @@ if(finalize_handler->line_no > 0) out_addline_outfile(out); } else { + if (user_finalize_method != NULL) { + if (user_finalize_method->line_no > 0) + out_addline_infile (out, user_finalize_method->line_no); + out_printf (out, "\t%s_finalize (self);\n", funcbase); + if (user_finalize_method->line_no > 0) + out_addline_outfile (out); + } + out_printf(out, "\tif(G_OBJECT_CLASS(parent_class)->finalize) \\\n" "\t\t(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);\n"); @@ -2381,6 +2444,9 @@ /* if there are no handlers for these things, we * need to set them up here */ + if(need_constructor) + out_printf(out, "\tg_object_class->constructor " + "= ___constructor;\n"); if(need_dispose && !dispose_handler) out_printf(out, "\tg_object_class->dispose " "= ___dispose;\n"); @@ -3064,6 +3130,15 @@ /* the outfile line was added above */ out_printf(out, "#undef PARENT_HANDLER\n"); break; + case CONSTRUCTOR_METHOD: + case DISPOSE_METHOD: + case FINALIZE_METHOD: + if(m->line_no > 0) + out_addline_infile(out, m->line_no); + print_method(out, "static ", "\n", "", " ", "", "\n", + m, FALSE, FALSE, TRUE, FALSE, FALSE); + print_method_body(m, TRUE, TRUE); + /* the outfile line was added above */ default: break; } @@ -3633,6 +3708,9 @@ funcbase); } + if (need_constructor) + add_constructor (c); + if (need_dispose) add_dispose (c); @@ -4441,15 +4519,24 @@ make_bases (); make_inits ((Class *)class); - if(unreftors > 0) { + + find_constructor ((Class *)class); + if (user_constructor != NULL) + need_constructor = TRUE; + + find_dispose ((Class *)class); + if (unreftors > 0 || + dispose_handler != NULL || + user_dispose_method != NULL) need_dispose = TRUE; - find_dispose ((Class *)class); - } + + find_finalize ((Class *)class); if (destructors > 0 || - privates > 0) { + privates > 0 || + user_finalize_method != NULL) { need_finalize = TRUE; - find_finalize ((Class *)class); } + check_bad_symbols ((Class *)class); check_duplicate_symbols ((Class *)class); check_duplicate_overrides ((Class *)class); --- src/parse.y.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/parse.y 2008-01-21 00:53:13.000000000 +0100 @@ -155,7 +155,11 @@ g_assert(scope != CLASS_SCOPE); - if(method == INIT_METHOD || method == CLASS_INIT_METHOD) { + if(method == INIT_METHOD + || method == CLASS_INIT_METHOD + || method == CONSTRUCTOR_METHOD + || method == DISPOSE_METHOD + || method == FINALIZE_METHOD) { type = (Type *)node_new (TYPE_NODE, "name", "void", NULL); @@ -1767,13 +1771,29 @@ push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, $<id>1, $<cbuf>5, $<line>2, ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "constructor")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "dispose")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); + } else if(strcmp($<id>1, "finalize")==0) { + push_init_arg($<id>3, FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + $<id>1, $<cbuf>5, $<line>2, + ccode_line, FALSE, NULL); } else { g_free($<id>1); g_free($<id>3); g_string_free($<cbuf>5,TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } --- src/treefuncs.def.orig 2007-03-09 18:46:14.000000000 +0100 +++ src/treefuncs.def 2008-01-21 00:53:13.000000000 +0100 @@ -40,6 +40,9 @@ REGULAR_METHOD, INIT_METHOD, CLASS_INIT_METHOD, + CONSTRUCTOR_METHOD, + DISPOSE_METHOD, + FINALIZE_METHOD, VIRTUAL_METHOD, SIGNAL_LAST_METHOD, SIGNAL_FIRST_METHOD,

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

ANNOUNCE: gob2 2.0.15 the "Can't improve perfection" release

2007-11-20T21:50:16Z

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOGUGUGUGUGPEEEEEKAAAAAA

So quite apparently gob is totally perfect. This is just illustrated by the
fact that there was no release for almost 2 years (was it two years? WOW!)
In any case here are the accumulated patches from users. While the world has
not clearly become a better place for all humankind because of gob, it is
clear that the world has been changed forever by such an important project
such as gob.

So what is this gob thing? Well besides being the cure for cancer, it also
generates GObjects (or GTK+ objects). GOB2 is a replacement for the version
1 GOB, that was for GTK+ 1.x mostly. GOB2 can handle pretty much most of the
GObject features. At least most of the ones that anyone will ever use. It
only requires GLib 2.0 (or higher for some features) and can generate
arbitrary GObjects. You can have both versions installed at the same time if
you wish, but if anyone is still using gob version 1 and GTK+ 1.x, they
should get their head examined.

Here are the news in 2.0.15:

* Fix the United States electoral system
* Fix --file-sep usage with respect to private headers
* Don't use /dev/null to help portability on non-unix
* Allow usage of gob as pet food
* Fix segfault on bad include statement (debian bug #443907)
* Fix my-person.gob example

ftp://ftp.5z.com/pub/gob/
http://ftp.gnome.org/pub/GNOME/sources/gob2/2.0/
http://www.5z.com/jirka/gob.html

Note: I no longer have fedora, so no rpms are built but the specfile is
included. Try it with "rpmbuild -ta gob2-...-tar.gz"

Have fun,

George

--
George <jirka@...>
Examine what is said, not who speaks.
-- Arabian Proverb

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: [BUG] Incorrectly includes private.h when --file-sep=_

2007-10-17T08:53:08Z

Jan Hudec wrote:

> Hello,
>
> When I use --file-sep=_ (but I suspect it would be the same with any
> non-default value), the .c file includes:
>
> #include <foo_bar-private.h>
>
> but the file generated is called:
>
> foo_bar_private.h

Fixed in svn, I will make a release soonish with this and all the other
things that are fixed.

George

--
George <jirka@...>
The surprising thing about this paper is that a man who could write
it would.
-- J. E. Littlewood

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

[BUG] Incorrectly includes private.h when --file-sep=_

2007-10-15T14:51:13Z

Hello,

When I use --file-sep=_ (but I suspect it would be the same with any
non-default value), the .c file includes:

#include <foo_bar-private.h>

but the file generated is called:

foo_bar_private.h

Regards,

Jan

--
Jan 'Bulb' Hudec <bulb@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

signature.asc (196 bytes) Download Attachment

Re: feature request: base_init

2007-09-27T23:38:20Z

alberto colombo wrote:

> hello,
>
> Gob2 manual says that there are two methods that handle the construction
> of an object: init(self) and class_init(class). However, there is a
> third method, base_init(gclass), that gob2 doesn't know about.
>
> would it be possible to define the base_init constructor from gob, just
> like we do with base_init? It is actually required to write GStreamer
> objects.
>
> Thank you very much
> alberto
>
> PS: at the moment, I'm putting the base_init code in the class_init
> constructor, and it works, but this will screw up inheritance, as far as
> I understand.

I know this is a year late, but I just did a search for messages matching
"gob" in my inbox and noticed this:

You want to overide the get_type method. See OVERRIDING THE GET_TYPE METHOD
in the manpage.

George

--
George <jirka@...>
I can live with doubt and uncertainty and not knowing. I think it is much
more interesting to live not knowing than to have answers that might be
wrong.
-- Richard P. Feynman

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: new version of interface patch

2007-09-27T22:52:08Z

Hi Jiri,

I don't think it was ever quite good enough to go in. There is no
more recent version yet. If I get inspired I may take another crack
at it. If I remember correctly, this version worked ok for my
purposes but was terribly limitted in some way. I forget how though
because it has been a while. I think the patch is close but not good
enough yet. Best regards,

Rudi

On 9/27/07, Jiri Lebl <jirka@...> wrote:

> Rudi Cilibrasi, Ph.D. wrote:
> > new version of patch
>
> Is there a newer version of this patch? If so I will put it into svn test
> and make a release of gob in the very near future (I have slightly more time
> recently than up till now)
>
> Also can you please document the new features as well?
>
> George
>
> --
> George <jirka@...>
> If the facts don't fit the theory, change the facts.
> -- Albert Einstein
>

--
"We can try to do it by breaking free of the mental prison of
separation and exclusion and see the world in its interconnectedness
and non-separability, allowing new alternatives to emerge." -- after
Vandana Shiva

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: new version of interface patch

2007-09-27T22:46:31Z

Rudi Cilibrasi, Ph.D. wrote:
> new version of patch

Is there a newer version of this patch? If so I will put it into svn test
and make a release of gob in the very near future (I have slightly more time
recently than up till now)

Also can you please document the new features as well?

George

--
George <jirka@...>
If the facts don't fit the theory, change the facts.
-- Albert Einstein

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: How do to use a gtk_type as a property type

2007-08-29T02:22:53Z

Thanks! We need an example for this in the documentation.

Btw, I had another idea for gob. It seems like it would be quite straightforward to generate language bindings from a gob files. Perhaps some kind of plug-in system for different language backends? What do you think?

Regards,
Dov

On 8/28/07, Jean-Yves Lefort <jylefort@...> wrote:

property OBJECT hadjustment (..., object_type = Gtk:Adjustment)

--
Jean-Yves Lefort <jylefort@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Re: How do to use a gtk_type as a property type

2007-08-28T13:50:44Z

On Tue, 28 Aug 2007 20:55:41 +0300
"Dov Grobgeld" <dov.grobgeld@...> wrote:

> After having used gob2 extensively I finally and for the first time got
> stuck on something that I could not find in the documentation. How do I
> define a property that is defined by Gtk and not by Glib? It seems like the
> name mangling of the property name always sticks on G_TYPE_ to the property
> name. Shouldn't this be modifyable e.g. by doing GTK:ADJUSTMENT to make the
> property GTK_TYPE_ADJUSTMENT instead of G_TYPE_ADJUSTMENT?
>
> In particular, I'm trying to convert the following code from my
> gtk_image_viewer widget to gob:
>
> g_object_class_install_property (gobject_class,
> PROP_HADJUSTMENT,
> g_param_spec_object ("hadjustment",
> ("Horizontal adjustment"),
> ("The GtkAdjustment that determines the values
> of the horizontal position for this image_viewer."),
> GTK_TYPE_ADJUSTMENT,
> G_PARAM_READWRITE));

property OBJECT hadjustment (..., object_type = Gtk:Adjustment)

--
Jean-Yves Lefort <jylefort@...>

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

attachment0 (196 bytes) Download Attachment

How do to use a gtk_type as a property type

2007-08-28T11:55:41Z

After having used gob2 extensively I finally and for the first time got stuck on something that I could not find in the documentation. How do I define a property that is defined by Gtk and not by Glib? It seems like the name mangling of the property name always sticks on G_TYPE_ to the property name. Shouldn't this be modifyable e.g. by doing GTK:ADJUSTMENT to make the property GTK_TYPE_ADJUSTMENT instead of G_TYPE_ADJUSTMENT?

In particular, I'm trying to convert the following code from my gtk_image_viewer widget to gob:

g_object_class_install_property (gobject_class,
                                   PROP_HADJUSTMENT,
                                   g_param_spec_object ("hadjustment",
                            ("Horizontal adjustment"),
                            ("The GtkAdjustment that determines the values of the horizontal position for this image_viewer."),
                                                        GTK_TYPE_ADJUSTMENT,
                                                        G_PARAM_READWRITE));

Thanks a lot for gob!

Regards,
Dov

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

default property values

2007-06-05T18:44:40Z

I have an object with a string property as such:

class My:Example from G:Object
{
..

private char *databasePath destroywith g_free;

..

property STRING databasePath
( nick = "databasePath",
blurb = "Full path to database",
default_value = "/tmp/database.db" )
set
{
g_free (selfp->databasePath);
selfp->databasePath = g_value_dup_string (VAL);
}

get
{
g_value_set_string (VAL, selfp->databasePath);
};

..

From the documentation, I am assuming this will be set after GET_NEW:

> Almost all types also have a 'default_value' attribute which sets
> the initial value of this property (on object initialization, the
> set handler will be run automatically with this value). This value
> will be overriden if the user sets a value of this property on the
> call to g_object_new.

The set handler is never getting called and selfp->databasePath is
NULL after GET_NEW.

I can set the property during g_object_new () or once instantiated
with g_object_set ().

Why aren't the default values being properly set?

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

new patch and thanks to George for putting gob2 together

2007-05-02T13:02:02Z

Dear George,

Thanks so much for taking the time to make the great gob2 utility.
I have tried to improve my patch a bit; particularly the body of the
interface functions. It is now "pretty close"; I am actually using it
in a project of mine and it is mostly ok but not 100% clean compile
yet. It requires a little hand tweaking to use and I am hoping you or
somebody else can improve this patch a bit more (or make a better one)
to provide our interface gob2 functionality. I attach two versions of the patch
(against 2.0.14 again) in the recent email to the list.

Also congratulations on reaching your phd defense! I also just defended mine
and wish you luck. Best regards,

Rudi

--
Democracy is two wolves and a sheep deciding what to eat for lunch.
Liberty is a well-armed sheep contesting the vote.
--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

new version of interface patch

2007-05-02T13:01:20Z

new version of patch

[second-interface-r.patch]

Only in gobnew: config.h Only in gobnew: config.log Only in gobnew: config.status Only in gobnew/doc: gob2.1 Only in gobnew/doc: Makefile Only in gobnew/examples: Makefile Only in gobnew: Makefile Only in gobnew: o diff -r gob2-2.0.14/src/checks.c gobnew/src/checks.c 316c316,336 < m->cbuf = g_strdup("/*empty*/"); --- > if (c->isinterface) { > FuncArg *fa; > fa = m->args->data; > GSList *iter; > GString *gs = g_string_new(""); > // m->cbuf = g_strdup("/*interempty*/"); > char *retstr = (strcmp(m->mtype->name, "void")==0) ? "" : "return "; > g_string_sprintf(gs, "%s%s->%s(", retstr, fa->name, m->id); > iter = g_slist_next(m->args); > char *sep2 = ""; > for (;iter; iter = iter->next) { > g_string_append(gs, sep2); > g_string_append(gs, ((FuncArg *) (iter->data))->name); > sep2 = ","; > } > g_string_append(gs, ");"); > m->cbuf = gs->str; > g_string_free(gs, FALSE); > } > else > m->cbuf = g_strdup("/*empty*/"); Only in gobnew/src: .checks.c.swp Only in gobnew/src: complearn-real-compressor.c Only in gobnew/src: complearn-real-compressor.h Only in gob2-2.0.14/src: lexer.c diff -r gob2-2.0.14/src/lexer.l gobnew/src/lexer.l 407a408,420 > interface { > static int found_classes = 0; > look_for_includes = 2; > BEGIN(CLASS_CODE); > > if(++found_classes > 1) { > error_print(GOB_ERROR, line_no, > "Only one interface per file allowed"); > } > > return INTERFACE; > } > diff -r gob2-2.0.14/src/main.c gobnew/src/main.c 1068c1068,1089 < out_printf(out, --- > if (((Class *)class)->isinterface) > out_printf(out, > "GType\n" > "%s_get_type (void)\n" > "{\n" > "\tstatic GType type = 0;\n\n" > "\tif ___GOB_UNLIKELY(type == 0) {\n" > "\t\tstatic const GTypeInfo info = {\n" > "\t\t\tsizeof (%sClass),\n" > "\t\t\t(GBaseInitFunc) %s_class_init,\n" > "\t\t\t(GBaseFinalizeFunc) NULL,\n" > "\t\t\t(GClassInitFunc) NULL,\n" > "\t\t\t(GClassFinalizeFunc) NULL,\n" > "\t\t\tNULL /* class_data */,\n" > "\t\t\t0,\n" > "\t\t\t0,\n" > "\t\t\tNULL,\n" > "\t\t\tNULL\n" > "\t\t};\n\n", > funcbase, typebase, funcbase); > else > out_printf(out, 2400,2401c2421,2427 < < if(m->cbuf) { --- > if (c->isinterface) { > out_printf(out, " {\n"); > out_printf(out, " %s_GET_CLASS (self)->%s (self);", > macrobase, m->id); > out_printf(out, " }\n"); > } > if(!c->isinterface && m->cbuf) { Only in gobnew/src: Makefile Only in gobnew/src: o Only in gob2-2.0.14/src: parse.c Only in gob2-2.0.14/src: parse.h diff -r gob2-2.0.14/src/parse.y gobnew/src/parse.y 47a48 > static gboolean isinterface = FALSE; 676c677 < %token CLASS FROM --- > %token CLASS INTERFACE FROM 689,692c690,697 < prog: ccodes class ccodes { ; } < | class ccodes { ; } < | ccodes class { ; } < | class { ; } --- > prog: ccodes iclass ccodes { ; } > | iclass ccodes { ; } > | ccodes iclass { ; } > | iclass { ; } > ; > > iclass: class { ; } > | interface { ; } 760a766,786 > interface: interfacedec '{' interfacecode '}'{ > ((Class *)class)->nodes = class_nodes; > isinterface = TRUE; > ((Class *)class)->isinterface = TRUE; > class_nodes = NULL; > nodes = g_list_append(nodes,class); > } > | interfacedec ';' { > ((Class *)class)->nodes = class_nodes; > isinterface = TRUE; > ((Class *)class)->isinterface = TRUE; > class_nodes = NULL; > nodes = g_list_append(nodes,class); > } > | interfacedec '{' '}' { > ((Class *)class)->nodes = NULL; > class_nodes = NULL; > nodes = g_list_append(nodes,class); > } > ; > 772a799,897 > interfacedec: INTERFACE TYPETOKEN FROM TYPETOKEN interfaceflags { > class = node_new (CLASS_NODE, > "otype:steal", $<id>2, > "ptype:steal", $<id>4, > "bonobo_object_class:steal", bonobo_object_class, > "glade_xml", glade_xml, > "interfaces:steal", interfaces, > "chunk_size:steal", chunk_size, > "abstract", abstract, > "isinterface", isinterface, > NULL); > bonobo_object_class = NULL; > glade_xml = FALSE; > chunk_size = NULL; > interfaces = NULL; > isinterface = FALSE; > } > ; > > interfaceflags: > | '(' TOKEN ')' interfaceflags { > if(strcmp($<id>2,"abstract") == 0) { > abstract = TRUE; > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN ')' interfaceflags { > if(strcmp($<id>2,"chunks") == 0) { > g_free (chunk_size); > chunk_size = g_strdup($<id>3); > } else if(strcmp($<id>2,"BonoboObject") == 0) { > g_free (bonobo_object_class); > bonobo_object_class = g_strdup($<id>3); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TYPETOKEN ')' interfaceflags { > if (strcmp ($<id>2, "interface") == 0) { > interfaces = g_list_append (interfaces, > g_strdup ($<id>3)); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN NUMBER ')' interfaceflags { > if(strcmp($<id>2,"chunks") == 0) { > g_free (chunk_size); > if(atoi($<id>3) != 0) > chunk_size = g_strdup($<id>3); > else > chunk_size = NULL; > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, NULL); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN STRING STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, $<id>5); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, NULL); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, $<id>5); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > ; > 873a999,1027 > interfacecode: interfacecode interfacething { ; } > | interfacething { ; } > ; > > interfacething: method { ; } > | TOKEN method { > if (strcmp ($<id>1, "BonoboObject") != 0) { > g_free ($<id>1); > yyerror (_("parse error")); > YYERROR; > } > g_free ($<id>1); > last_added_method->bonobo_object_func = TRUE; > } > | TOKEN TYPETOKEN method { > if (strcmp ($<id>1, "interface") != 0) { > g_free ($<id>1); > g_free ($<id>2); > yyerror (_("parse error")); > YYERROR; > } > g_free ($<id>1); > node_set ((Node *)last_added_method, > "interface:steal", $<id>2, > NULL); > } > | ';' { ; } > ; > Only in gobnew/src: t2.gob diff -r gob2-2.0.14/src/test.gob gobnew/src/test.gob 1,11c1 < /* this is a TEST file, it's VERY VERY ugly, it's just supposed to test < the parser of gob and somewhat test some output as well, you can < look in here to see a whole array of different syntax options, but < don't expect this to be an easy to read file */ < < requires 1.99.0 < < %at{ < /* ALL TOP */ < %} < --- > requires 2.0.0 13,44c3,4 < /* this should go on the very top of the header */ < < %} < %ht{ < /* this should go on the very top of the header as well */ < %} < %ph{ < /* this should go into the private header */ < %} < %privateheader{ < /* this should go into the private header as well*/ < %} < < < %{ < #include <stdio.h> < #include <gtk/gtk.h> < /* the next line is not mandatory, but if gob finds an include in one of < the %{ %} sections above the class definitions, it will not put it in < the file itself. So you can this way select where the include file is < at */ < #include "test-object.h" < #include "test-object-private.h" < < /* this is to test if the lexer won't get confused by requires inside < some c code < requires 99.99.99 < */ < < static void jjjj(void); < < #define _(x) x --- > #include <glib/garray.h> > #include "real-compressor.h" 47,629c7 < %h{ < enum _gob__enum_t { < BUDLIKY, BUDLIKY2 < }; < < struct _gob__struct_t { < int i, x, y, z; < }; < union _gob__union_t { < int i, x, y, z; < }; < void bubu(void); < < /* Fake boxed */ < #define PACKAGE_TYPE_BOXED 1 < typedef void * PackageBoxed; < < %} < %header{ < /* this should be in the header, just under bubu prototype */ < #define TEST_ARRAY 5 < %} < < enum LAME_CLIENT { < IS_CONNECTED, < NONE = 9, < LAST < } Test:Enum; < < flags BUGA_BUGA { < ONE, < TWO, < MANY, < } Some:Flags; < < error TEST_OBJECT_ERROR { < BAD_THIS, < BAD_THAT < } Test:Object:Error; < < enum BUBLE { < KEIN = 0, < STANDARD, < STANDARD_RO, < KOMPLETT, < ALT < } Buble:Enum; < < class Test:Object from /*G:Object*/ Gtk:Container < (interface Gtk:Tree:Model) < /* We can add more interfaces by adding more lines like the above */ < /* Note that there must exist a GtkTreeModelIface structure */ < { < < /* function implemented for the Gtk:Tree:Model interface */ < interface Gtk:Tree:Model < private GtkTreeModelFlags < get_flags (Gtk:Tree:Model *self (check null type)) < { < /* FOO */ < return (GtkTreeModelFlags)0; < } < < < < public int test_array[TEST_ARRAY]; < public int i; < argument INT i set { self->i = ARG; } get { ARG = self->i; } ; < < public int testing = 1; < argument INT testing link; < < public char * testingstring = {g_strdup("test")} < destroywith g_free; < argument POINTER testingstring stringlink; < < public Test:Object * testingobj < unrefwith g_object_unref; < argument POINTER testingobj objectlink; < < public Test:Object * testingobjllll < unrefwith gtk_widget_destroy; < argument POINTER testingobjllll objectlink; < < public Test:Object * testingobjfoo < unref { if (VAR) g_object_unref (VAR); }; < argument POINTER testingobjfoo objectlink; < < classwide int foo = 20; < argument INT foo link; < < public G:Object * testingobj2 < destroy { < if(VAR) < g_object_unref(G_OBJECT(VAR)); < }; < argument POINTER (type G:Object *) testingobj2 objectlink; < < argument POINTER (type GObject *) some_object < set { /* set some_object */ } < get { /* get some_object */ < ARG=NULL; }; < argument (CONSTRUCT) LONG (type long) write_only_long < set { /* set write_only_long */ }; < argument POINTER (type char *) read_only_string < get { /* get readonly_long */ < ARG = g_strdup("BLAH"); }; < < private char a_property; < property CHAR a_property < (nick = _("Nick"), < blurb = _("Blurb"), < minimum = 'a', < maximum = 'Z', < default_value = 'C', < export) < set { self->_priv->a_property = g_value_get_char (VAL); } < get { g_value_set_char (VAL, self->_priv->a_property); }; < < property OBJECT foobarblahllll1 < (nick = "xxxxxxx1", < blurb = "yyyyyy", < object_type = Gtk:Button) < get { /* FOO1 */ }; < property OBJECT foobarblahllll2 < (nick = "xxxxxxx2", < blurb = "yyyyyy", < object_type = G:Object) < set { /* FOO2 */ }; < < private double dblnum; < property DOUBLE dblnum < (nick = _("dblnum"), < blurb = _("dblnum"), < minimum = 0.1, < maximum = 99.1, < default_value = 0.3, < flags = CONSTRUCT|CONSTRUCT_ONLY, < export, < link); < < private char *b_property; < property STRING b_property < (nick = _("Nick b"), < blurb = _("Blurb b"), < default_value = "default", < type = char *, < flags = CONSTRUCT, < export, < link); < < private Test:Object *objectproperty; < property OBJECT objectproperty (nick = "object", < blurb = "obj property", < object_type = Test:Object, < link); < < private Test:Enum enum_property; < property ENUM enum_property (nick = "enumprop", < blurb = "enumprop", < enum_type = Test:Enum, < link); < < private Some:Flags flags_property; < property FLAGS flags_property (nick = "flagsprop", < blurb = "flagsprop", < flags_type = Some:Flags, < link); < < private PackageBoxed prop; < property BOXED prop (nick="prop", < blurb="prop", < boxed_type=Package:Boxed, < link); < /* testing old semantics */ < private PackageBoxed prop2; < property BOXED prop2 (nick="prop2", < blurb="prop2", < boxed_type=PACKAGE_TYPE_BOXED, < link); < < private char ov_prop; < property CHAR ov_prop < (export, < override) < set { self->_priv->ov_prop = g_value_get_char (VAL); } < get { g_value_set_char (VAL, self->_priv->ov_prop); }; < < < private int j; < public GObject * h; < public char *bleh; < public double array[23][18]; < protected unsigned long int wagawaga; < public int wagawaga_should_be_after_this_in_the_header; < < init(object) { < object->i=0; < } < class_init(klass); < < /** < * new: < * @j: foo < * < * budliky budliky < * < * Returns: new object < */ < public GObject * new(int j (check > 0)) { < GObject *ret; < ret = G_OBJECT (GET_NEW); < < SELF(ret)->_priv->j = j; < < return ret; < } < private int blah(self, G:Object * wid (check null type), < int h (check > 0)) onerror -1 { < g_object_set (G_OBJECT (self), < TEST_OBJECT_PROP_I (99), < NULL); < return h; < } < /** < * bleh: < * @self: foo < * @wid: foo < * @h: foo < * < * budliky budliky 2 < * < * Returns: new object < **/ < signal last STRING (POINTER, INT) < char * bleh(self, G:Object * wid (check null type), < int h (check > 0)) { < return self_blah(self,wid,h) > 0 ? g_strdup ("foo") : g_strdup ("bar"); < } < < private < char * < test_handler (self, GObject *w, int h, gpointer data) < { < data = w = NULL; < h = 0; < < return NULL; < } < < /** < * gtk_weird_button_bleh2: < * @self: foo < * @wid: foo < * @h: foo < * < * budliky budliky 3 < * < * Returns: new object */ < signal last INT (POINTER, INT) < int bleh2(self, const G:Object * wid (check null type), < int h (check > 0)) { < < test_object_connect__bleh (self, self_test_handler, NULL); < self_connect__bleh (self, self_test_handler, NULL); < test_object_connect_after__bleh (self, self_test_handler, NULL); < self_connect_after__bleh (self, self_test_handler, NULL); < test_object_connect_data__bleh (self, self_test_handler, NULL, NULL, 0); < self_connect_data__bleh (self, self_test_handler, NULL, NULL, 0); < < wid = NULL; < h = 0; < < /* testing multiple marshaller support */ < return 0; < } < /* this should not get documented as it's nonstandard */ < /** < * bloh: < < ******/ < < /* Here we are testing how the gtk-doc extraction code error handeling < it should just ingore these */ < /** < */ < < /** */ < /** < * < * bubu < *********/ < /** < * < * bubu < **zblunk*******/ < /** < * < * bubu < *zblunk*******//**//**/ < signal first NONE (NONE) < void bloh(self); < virtual void * bah(self, int h (check > 0)) onerror NULL defreturn 0 { < self_beh(self,h); < return NULL; < } < virtual int beh(self, int h (check > 0)); < override(Gtk:Container) < void add(Gtk:Container * self (check null type), < Gtk:Widget * wid (check null type)) { < PARENT_HANDLER(self,wid); < } < < override(G:Object) < void dispatch_properties_changed (G:Object *object, < guint n_pspecs, < GParamSpec **pspecs) < { < object = NULL; < n_pspecs = 0; < pspecs = NULL; < /* EKI! */ < } < < public int consttest(self, const gchar *text, ...) < { < text = NULL; < return 25; < } < public int consttest2(self, gchar const *text, ...) < { < text = NULL; < return 25; < } < public int consttest3(self, G:Object const *wid (check null type)) < { < wid = NULL; < return 25; < } < public int consttest4(const self) < { < return 25; < } < public int consttest5(self const) < { < return 25; < } < virtual int consttest6(const self) < { < return 25; < } < virtual int consttest7(self const) < { < return 25; < } < public int consttest8(self) < { < Self const *selfconst1, *selfconst2; < selfconst1 = SELF_CONST(self); < selfconst2 = TEST_OBJECT_CONST(self); < return 25; < } < public int consttest9(const self, int i, double b) < { < b = 0.0; < i = 0; < return 25; < } < public int consttest10(self const, int i, double b) < { < b = 0.0; < i = 0; < return 25; < } < signal private first NONE (NONE) < void googlegoogle(self) < { < puts("TEST1"); < self_googlegoogle2(self); < } < signal first private NONE (NONE) < void googlegoogle2(self) < { < int array[5][8][9]={{{0}}}; < Self *foo = self; < puts("TEST2"); < self_testprivvirtual(foo, array); < } < private signal first NONE (NONE) < void googlegoogle3(self) < { < puts("TEST3"); < } < protected signal first NONE (NONE) < void googlegoogle4(self) < { < puts("TEST4"); < } < protected signal first NONE (NONE) < void googlegoogle_const1(const self) < { < puts("TEST4"); < } < protected signal first NONE (NONE) < void googlegoogle_const2(self const) < { < puts("TEST4"); < } < virtual private < void testprivvirtual(self, int some_array[5][8][9]) < { < puts("TEST3"); < self_googlegoogle(self); < if (some_array[0]) return; < } < private virtual < void testprivvirtual2(self, const int some_array[5][8][9]) < { < /* nothing here */ < if (some_array[0]) return; < } < public virtual < void testpublicvirtual(self, int const some_array[5][8][9]) < { < /* nothing here */ < if (some_array[0]) return; < } < protected virtual < void testprotectedvirtual(self, int some_array[5][8][9]) < { < /* nothing here */ < if (some_array[0]) return; < } < signal first NONE (POINTER, ENUM) < void testarrsignal(self, long arr[8], Buble:Enum foo) < { < /* foo */ < arr[0] = 1; < foo = BUBLE_KEIN; < } < < /* testing empty func */ < public void foofoofoo(self) {} < /* testing empty func 2 */ < public void foofoofoo2(self); < /* testing empty func 3 */ < public void foofoofoo3(self) { } < /* testing empty func 4 */ < public void foofoofoo4(self) < { < } < < // override (Gtk:Widget) < // int event(Gtk:Widget *self (check null type), < // GdkEvent *event (check null)) onerror FALSE < // { < // int ret; < // /* some code */ < // ret = PARENT_HANDLER(self,event); < // /* some code */ < // return ret; < // } < // override(Gtk:Container) < // void < // remove(Gtk:Container * self (check null type), < // Gtk:Widget * wid (check null type)); < // < // override(Gtk:Object) < // void < // destroy(Gtk:Object * self (check null type)) < // { < // /* foo bar */ < // PARENT_HANDLER(self); < // } < < protected < int foobar(self) { < /* just an empty function */ < return 5; < } < < signal last NONE(CHAR,UCHAR,BOOLEAN,INT,UINT,LONG,ULONG,FLOAT,DOUBLE, < STRING,ENUM,POINTER,OBJECT) < void < testargs(self, gchar a, guchar b, gboolean c, gint d, guint e, glong f, < gulong g, gfloat h, gdouble i, gchar * j, gint k, < gpointer o, GObject *p) < { < h = i = k = 0; < a = b = c = d = e = f = g = 0; < o = p = (GObject *)NULL; < j = (char *)NULL; < /* ugh, testing casting */ < } < < public signal (NO_HOOKS) last INT (INT) < int testflags(self, int w (check > 0)) defreturn -99 { < /*foo*/ < return w; < } < < /* testing NONE */ < signal BOOLEAN (NONE) < gboolean < test_none_thing (self) < { < return FALSE; < } < < /* some more enum testing */ < public BubleEnum buble; < property ENUM buble < (nick = "Buble", < blurb = "Buble", < enum_type = Buble:Enum, < default_value = BUBLE_STANDARD, < link, export); < < /* testing types */ < public int t1; < public long int t2; < public int long t3; < public int long const t4; < public const int long t5; < public const char * const t6; < public char const * const t7; < public enum _gob__enum_t const * const t8; < public union _gob__union_t t9; < public union _gob__union_t * const * const * t10; < public struct _gob__struct_t * const * const * t11; < public const struct _gob__struct_t * const * const * t13; < public const enum _gob__enum_t * const * const * t14; < public enum _gob__enum_t t15; < public gchar const t16; < public const gchar * const t17; < public const gchar t18; < < /* testing method with no arguments */ < public void method_with_no_arguments (void) < { < /* FOO */ < } < < /* testing calling the above method */ < public void foo (self) { < self_method_with_no_arguments (); < } < < /* this is to test custom get_type */ < /*public GtkType < get_type (void) < { < static guint type = 0; < < if ( ! type) { < static const GtkTypeInfo info = { < "GtkWeirdButton", < sizeof (GtkWeirdButton), < sizeof (GtkWeirdButtonClass), < (GtkClassInitFunc) gtk_weird_button_class_init, < (GtkObjectInitFunc) gtk_weird_button_init, < NULL, < NULL, < (GtkClassInitFunc) NULL < }; < < type = gtk_type_unique (gtk_button_get_type(), &info); < } < < return type; < }*/ < < < /* testing empty statements */ < ; < ; < ; < } < < %{ < < static void < jjjj(void) --- > interface CompLearn:Real:Compressor from G:Type:Interface 630a9,39 > public G:Object * > new(void) { > GObject *ret = (GObject *) GET_NEW; > return G_OBJECT (ret); > } > public GString * > compress(CompLearnRealCompressor *rc,const GString *input); > public GString * > decompress(CompLearnRealCompressor *rc,const GString *input); > public GString * > canonical_extension(CompLearnRealCompressor *rc); > public GString * > blurb(CompLearnRealCompressor *rc); > public GString * > name(CompLearnRealCompressor *rc); > public GString * > compressor_version(CompLearnRealCompressor *rc); > public GString * > binding_version(CompLearnRealCompressor *rc); > public gdouble > compressed_size(CompLearnRealCompressor *rc, const GString *input); > public gboolean > is_just_size(CompLearnRealCompressor *rc); > public gboolean > is_operational(CompLearnRealCompressor *self); > public gboolean > is_decompressible(CompLearnRealCompressor *rc, const GString *input); > public gboolean > is_private_property(CompLearnRealCompressor *rc, const char *input); > public guint64 > window_size(CompLearnRealCompressor *rc); 632,639d40 < < void < bubu(void) < { < jjjj(); < } < < %} diff -r gob2-2.0.14/src/treefuncs.c gobnew/src/treefuncs.c 108a109 > QUARK_isinterface, 216a218 > g_hash_table_insert (quark_ht, "isinterface", GINT_TO_POINTER (QUARK_isinterface)); 365a368 > new->isinterface = self->isinterface; 957a961,965 > case QUARK_isinterface: { > gboolean isinterface = va_arg (__ap, gboolean); > self->isinterface = isinterface; > break; > } diff -r gob2-2.0.14/src/treefuncs.def gobnew/src/treefuncs.def 59c59,60 < BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used --- > BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used > BOOL isinterface # if it is an interface instead of a class diff -r gob2-2.0.14/src/treefuncs.h gobnew/src/treefuncs.h 121a122 > gboolean isinterface; Only in gobnew: stamp-h

[second-interface-u.patch]

Only in gobnew: config.h Only in gobnew: config.log Only in gobnew: config.status Common subdirectories: gob2-2.0.14/debian and gobnew/debian Common subdirectories: gob2-2.0.14/doc and gobnew/doc Common subdirectories: gob2-2.0.14/examples and gobnew/examples Only in gobnew: Makefile Only in gobnew: o Common subdirectories: gob2-2.0.14/src and gobnew/src Only in gobnew: stamp-h

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

delays in responding

2007-04-30T23:09:14Z

Hi,
To all that have emailed the mailing list recently and I have not responded.
The mailing list was not broken, but I'm very busy at the moment. I just
defended my phd thesis, am in the process of moving to illinois, and have
lots of work. I see there have been some recent new activity in the form of
patches to gob, I will look at all of them as I can hopefully in the next
week. Apply those that merit it and perhaps make a new release in the near
future.

George

--
George <jirka@...>
If Christ were here now there is one thing he would not be - a Christian.
-- Mark Twain

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

Circular includes

2007-04-28T09:22:00Z

Hello,

I just discovered gob as a great thing hopefully simplifying my GObject
programming a lot. There's just one thing that seems awkward to me: the
__TYPEDEF_*__ approach to circular type dependencies. In hand-written
classes, I usually just put the typedefs before the includes—e.g.
instead of

<begin %h code>
#include "another-class.h"
<end %h code>

[...]

#ifndef __TYPEDEF_A_CLASS__
#define __TYPEDEF_A_CLASS__
typedef struct _aClass aClass;
#endif

I would suggest

typedef struct _aClass aClass;

<begin %h code>
#include "another-class.h"
<end %h code>

and circular includes would resolve comfortably. Is there a reason why
gob2 doesn't do it like that?

Kind regards,
Patrik

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

signature.asc (196 bytes) Download Attachment

Re: introduction, gob2 interface patch, misc

2007-04-22T05:46:36Z

Sure; it is attached. I hope we can get this patch into something useful.
Cheers,

Rudi

On 4/22/07, Behdad Esfahbod <behdad@...> wrote:

On Sun, 2007-04-22 at 05:52 -0400, Rudi Cilibrasi, Ph.D . wrote:

> Hi everybody,
>
> I have recently started learning about GObject, GType, and DBus.  It
> is a nice system and seems very well
> designed.  But it is a bit rough and so I was led to find Gob2.  It
> seems like just about exactly what I needed
> for my purposes and so I wanted to use it but I found one small
> problem: no interface support.  I have spent
> some time trying to add interface support to gob2.  Since I have very
> little experience with GType it is a bit
> challenging for me, however I think I have made some good progress.
> At this point I have a patch and wanted
> to find out if anybody else is interested.  I think it is reasonably
> close to useful but would like more experienced
> GObject opinions on the matter (maybe help finish whatever is still
> broken) before I move on to the next part of
> my project. I  would also like to eventually get this functionality
> into the main Gob2 source base if we can figure
> out how to properly clean it up.  I had a look at the mailing list
> archives and it seems they might be broken; or
> is it just otherwise low activity?  I attach the patch in this email.
> Best regards,

Nice work.  Can you send the patch again, producing it with diff -u
instead?

behdad

> Rudi
>
> --
> Democracy is two wolves and a sheep deciding what to eat for lunch.
> Liberty is a well-armed sheep contesting the vote.
--
behdad
http://behdad.org/

"Those who would give up Essential Liberty to purchase a little
Temporary Safety, deserve neither Liberty nor Safety."
        -- Benjamin Franklin, 1759

--
Democracy is two wolves and a sheep deciding what to eat for lunch.
Liberty is a well-armed sheep contesting the vote.
[interface-gob2u-2.0.14.patch]

Only in gob2-2.0.14/src: lexer.c diff -u gob2-2.0.14/src/lexer.l gobnew/src/lexer.l --- gob2-2.0.14/src/lexer.l 2005-07-22 20:50:37.000000000 +0200 +++ gobnew/src/lexer.l 2007-04-22 11:45:14.000000000 +0200 @@ -405,6 +405,19 @@ <C_CODE>. { add_to_cbuf(yytext); } <C_CODE>\n { add_to_cbuf(yytext); } +interface { + static int found_classes = 0; + look_for_includes = 2; + BEGIN(CLASS_CODE); + + if(++found_classes > 1) { + error_print(GOB_ERROR, line_no, + "Only one interface per file allowed"); + } + + return INTERFACE; + } + class { static int found_classes = 0; look_for_includes = 2; diff -u gob2-2.0.14/src/main.c gobnew/src/main.c --- gob2-2.0.14/src/main.c 2006-01-05 19:05:45.000000000 +0100 +++ gobnew/src/main.c 2007-04-22 11:45:14.000000000 +0200 @@ -1065,7 +1065,28 @@ { /*char *chunk_size = ((Class*)class)->chunk_size;*/ - out_printf(out, + if (((Class *)class)->isinterface) + out_printf(out, + "GType\n" + "%s_get_type (void)\n" + "{\n" + "\tstatic GType type = 0;\n\n" + "\tif ___GOB_UNLIKELY(type == 0) {\n" + "\t\tstatic const GTypeInfo info = {\n" + "\t\t\tsizeof (%sClass),\n" + "\t\t\t(GBaseInitFunc) %s_class_init,\n" + "\t\t\t(GBaseFinalizeFunc) NULL,\n" + "\t\t\t(GClassInitFunc) NULL,\n" + "\t\t\t(GClassFinalizeFunc) NULL,\n" + "\t\t\tNULL /* class_data */,\n" + "\t\t\t0,\n" + "\t\t\t0,\n" + "\t\t\tNULL,\n" + "\t\t\tNULL\n" + "\t\t};\n\n", + funcbase, typebase, funcbase); + else + out_printf(out, "GType\n" "%s_get_type (void)\n" "{\n" @@ -2397,8 +2418,13 @@ } } else continue; - - if(m->cbuf) { + if (c->isinterface) { + out_printf(out, " {\n"); + out_printf(out, " %s_GET_CLASS (self)->%s (self);", + macrobase, m->id); + out_printf(out, " }\n"); + } + if(!c->isinterface && m->cbuf) { out_printf(out, " {\n"); out_addline_infile(out, m->ccode_line); out_printf(out, "%s\n", m->cbuf); Only in gobnew/src: .main.c.swp Only in gobnew/src: Makefile Only in gobnew/src: o Only in gob2-2.0.14/src: parse.c Only in gob2-2.0.14/src: parse.h diff -u gob2-2.0.14/src/parse.y gobnew/src/parse.y --- gob2-2.0.14/src/parse.y 2005-12-16 20:11:20.000000000 +0100 +++ gobnew/src/parse.y 2007-04-22 11:45:14.000000000 +0200 @@ -45,6 +45,7 @@ static GList *error_vals = NULL; static gboolean abstract = FALSE; +static gboolean isinterface = FALSE; static char *chunk_size = NULL; static char *bonobo_object_class = NULL; static int glade_xml = FALSE; @@ -673,7 +674,7 @@ int sigtype; } -%token CLASS FROM +%token CLASS INTERFACE FROM %token CONST VOID STRUCT UNION ENUM THREEDOTS %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR @@ -686,10 +687,14 @@ %% -prog: ccodes class ccodes { ; } - | class ccodes { ; } - | ccodes class { ; } - | class { ; } +prog: ccodes iclass ccodes { ; } + | iclass ccodes { ; } + | ccodes iclass { ; } + | iclass { ; } + ; + +iclass: class { ; } + | interface { ; } ; ccode: CCODE { @@ -758,6 +763,20 @@ | errorcode { ; } ; +interface: interfacedec '{' interfacecode '}' { + ((Class *)class)->nodes = class_nodes; + isinterface = TRUE; + ((Class *)class)->isinterface = TRUE; + class_nodes = NULL; + nodes = g_list_append(nodes,class); + } + | interfacedec '{' '}' { + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); + } + ; + class: classdec '{' classcode '}' { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -770,6 +789,105 @@ } ; +interfacedec: INTERFACE TYPETOKEN FROM TYPETOKEN interfaceflags { + class = node_new (CLASS_NODE, + "otype:steal", $<id>2, + "ptype:steal", $<id>4, + "bonobo_object_class:steal", bonobo_object_class, + "glade_xml", glade_xml, + "interfaces:steal", interfaces, + "chunk_size:steal", chunk_size, + "abstract", abstract, + "isinterface", isinterface, + NULL); + bonobo_object_class = NULL; + glade_xml = FALSE; + chunk_size = NULL; + interfaces = NULL; + isinterface = FALSE; + } + ; + +interfaceflags: + | '(' TOKEN ')' interfaceflags { + if(strcmp($<id>2,"abstract") == 0) { + abstract = TRUE; + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN TOKEN ')' interfaceflags { + if(strcmp($<id>2,"chunks") == 0) { + g_free (chunk_size); + chunk_size = g_strdup($<id>3); + } else if(strcmp($<id>2,"BonoboObject") == 0) { + g_free (bonobo_object_class); + bonobo_object_class = g_strdup($<id>3); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN TYPETOKEN ')' interfaceflags { + if (strcmp ($<id>2, "interface") == 0) { + interfaces = g_list_append (interfaces, + g_strdup ($<id>3)); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN NUMBER ')' interfaceflags { + if(strcmp($<id>2,"chunks") == 0) { + g_free (chunk_size); + if(atoi($<id>3) != 0) + chunk_size = g_strdup($<id>3); + else + chunk_size = NULL; + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN STRING STRING ')' interfaceflags { + if (strcmp ($<id>2, "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade($<id>3, $<id>4, NULL); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN STRING STRING STRING ')' interfaceflags { + if (strcmp ($<id>2, "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade($<id>3, $<id>4, $<id>5); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN TOKEN STRING ')' interfaceflags { + if (strcmp ($<id>2, "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade($<id>3, $<id>4, NULL); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + | '(' TOKEN TOKEN STRING STRING ')' interfaceflags { + if (strcmp ($<id>2, "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade($<id>3, $<id>4, $<id>5); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + ; + classdec: CLASS TYPETOKEN FROM TYPETOKEN classflags { class = node_new (CLASS_NODE, "otype:steal", $<id>2, @@ -871,6 +989,35 @@ | thing { ; } ; +interfacecode: interfacecode interfacething { ; } + | interfacething { ; } + ; + +interfacething: method { ; } + | TOKEN method { + if (strcmp ($<id>1, "BonoboObject") != 0) { + g_free ($<id>1); + yyerror (_("parse error")); + YYERROR; + } + g_free ($<id>1); + last_added_method->bonobo_object_func = TRUE; + } + | TOKEN TYPETOKEN method { + if (strcmp ($<id>1, "interface") != 0) { + g_free ($<id>1); + g_free ($<id>2); + yyerror (_("parse error")); + YYERROR; + } + g_free ($<id>1); + node_set ((Node *)last_added_method, + "interface:steal", $<id>2, + NULL); + } + | ';' { ; } + ; + thing: method { ; } | TOKEN method { if (strcmp ($<id>1, "BonoboObject") != 0) { Only in gobnew/src: t2.gob diff -u gob2-2.0.14/src/treefuncs.c gobnew/src/treefuncs.c --- gob2-2.0.14/src/treefuncs.c 2005-12-16 20:11:38.000000000 +0100 +++ gobnew/src/treefuncs.c 2007-04-22 11:45:14.000000000 +0200 @@ -106,6 +106,7 @@ QUARK_nodes, QUARK_nodes_STEAL, QUARK_abstract, + QUARK_isinterface, QUARK_name, QUARK_name_STEAL, QUARK_pointer, @@ -214,6 +215,7 @@ g_hash_table_insert (quark_ht, "nodes", GINT_TO_POINTER (QUARK_nodes)); g_hash_table_insert (quark_ht, "nodes:steal", GINT_TO_POINTER (QUARK_nodes_STEAL)); g_hash_table_insert (quark_ht, "abstract", GINT_TO_POINTER (QUARK_abstract)); + g_hash_table_insert (quark_ht, "isinterface", GINT_TO_POINTER (QUARK_isinterface)); g_hash_table_insert (quark_ht, "name", GINT_TO_POINTER (QUARK_name)); g_hash_table_insert (quark_ht, "name:steal", GINT_TO_POINTER (QUARK_name_STEAL)); g_hash_table_insert (quark_ht, "pointer", GINT_TO_POINTER (QUARK_pointer)); @@ -363,6 +365,7 @@ new->interfaces = g_list_copy (self->interfaces); COPY_LIST_VALS(new->interfaces, g_strdup); new->nodes = node_list_copy (self->nodes); new->abstract = self->abstract; + new->isinterface = self->isinterface; return new; } @@ -955,6 +958,11 @@ self->abstract = abstract; break; } + case QUARK_isinterface: { + gboolean isinterface = va_arg (__ap, gboolean); + self->isinterface = isinterface; + break; + } default: g_warning ("Argument named 'Class::%s' does not exist", arg); break; diff -u gob2-2.0.14/src/treefuncs.def gobnew/src/treefuncs.def --- gob2-2.0.14/src/treefuncs.def 2005-12-16 20:11:20.000000000 +0100 +++ gobnew/src/treefuncs.def 2007-04-22 11:45:14.000000000 +0200 @@ -56,7 +56,8 @@ STRING chunk_size # if the object should be allocated with mem_chunks STRINGLIST interfaces # GObject interfaces this class exports NODELIST nodes - BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used + BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used + BOOL isinterface # if it is an interface instead of a class ENDCLASS CLASS Type diff -u gob2-2.0.14/src/treefuncs.h gobnew/src/treefuncs.h --- gob2-2.0.14/src/treefuncs.h 2005-12-16 20:11:38.000000000 +0100 +++ gobnew/src/treefuncs.h 2007-04-22 11:45:14.000000000 +0200 @@ -119,6 +119,7 @@ GList * interfaces; GList * nodes; gboolean abstract; + gboolean isinterface; }; struct _EnumDef {

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject

introduction, gob2 interface patch, misc

2007-04-22T03:52:45Z

Hi everybody,

I have recently started learning about GObject, GType, and DBus. It is a nice system and seems very well
designed. But it is a bit rough and so I was led to find Gob2. It seems like just about exactly what I needed
for my purposes and so I wanted to use it but I found one small problem: no interface support. I have spent
some time trying to add interface support to gob2. Since I have very little experience with GType it is a bit
challenging for me, however I think I have made some good progress. At this point I have a patch and wanted
to find out if anybody else is interested. I think it is reasonably close to useful but would like more experienced
GObject opinions on the matter (maybe help finish whatever is still broken) before I move on to the next part of
my project. I would also like to eventually get this functionality into the main Gob2 source base if we can figure
out how to properly clean it up. I had a look at the mailing list archives and it seems they might be broken; or
is it just otherwise low activity? I attach the patch in this email. Best regards,

Rudi

--
Democracy is two wolves and a sheep deciding what to eat for lunch.
Liberty is a well-armed sheep contesting the vote.
[interface-gob2-2.0.14.patch]

diff -r gob2-2.0.14/src/lexer.l gobnew/src/lexer.l 407a408,420 > interface { > static int found_classes = 0; > look_for_includes = 2; > BEGIN(CLASS_CODE); > > if(++found_classes > 1) { > error_print(GOB_ERROR, line_no, > "Only one interface per file allowed"); > } > > return INTERFACE; > } > diff -r gob2-2.0.14/src/main.c gobnew/src/main.c 1068c1068,1089 < out_printf(out, --- > if (((Class *)class)->isinterface) > out_printf(out, > "GType\n" > "%s_get_type (void)\n" > "{\n" > "\tstatic GType type = 0;\n\n" > "\tif ___GOB_UNLIKELY(type == 0) {\n" > "\t\tstatic const GTypeInfo info = {\n" > "\t\t\tsizeof (%sClass),\n" > "\t\t\t(GBaseInitFunc) %s_class_init,\n" > "\t\t\t(GBaseFinalizeFunc) NULL,\n" > "\t\t\t(GClassInitFunc) NULL,\n" > "\t\t\t(GClassFinalizeFunc) NULL,\n" > "\t\t\tNULL /* class_data */,\n" > "\t\t\t0,\n" > "\t\t\t0,\n" > "\t\t\tNULL,\n" > "\t\t\tNULL\n" > "\t\t};\n\n", > funcbase, typebase, funcbase); > else > out_printf(out, 2400,2401c2421,2427 < < if(m->cbuf) { --- > if (c->isinterface) { > out_printf(out, " {\n"); > out_printf(out, " %s_GET_CLASS (self)->%s (self);", > macrobase, m->id); > out_printf(out, " }\n"); > } > if(!c->isinterface && m->cbuf) { diff -r gob2-2.0.14/src/parse.y gobnew/src/parse.y 47a48 > static gboolean isinterface = FALSE; 676c677 < %token CLASS FROM --- > %token CLASS INTERFACE FROM 689,692c690,697 < prog: ccodes class ccodes { ; } < | class ccodes { ; } < | ccodes class { ; } < | class { ; } --- > prog: ccodes iclass ccodes { ; } > | iclass ccodes { ; } > | ccodes iclass { ; } > | iclass { ; } > ; > > iclass: class { ; } > | interface { ; } 760a766,779 > interface: interfacedec '{' interfacecode '}' { > ((Class *)class)->nodes = class_nodes; > isinterface = TRUE; > ((Class *)class)->isinterface = TRUE; > class_nodes = NULL; > nodes = g_list_append(nodes,class); > } > | interfacedec '{' '}' { > ((Class *)class)->nodes = NULL; > class_nodes = NULL; > nodes = g_list_append(nodes,class); > } > ; > 772a792,890 > interfacedec: INTERFACE TYPETOKEN FROM TYPETOKEN interfaceflags { > class = node_new (CLASS_NODE, > "otype:steal", $<id>2, > "ptype:steal", $<id>4, > "bonobo_object_class:steal", bonobo_object_class, > "glade_xml", glade_xml, > "interfaces:steal", interfaces, > "chunk_size:steal", chunk_size, > "abstract", abstract, > "isinterface", isinterface, > NULL); > bonobo_object_class = NULL; > glade_xml = FALSE; > chunk_size = NULL; > interfaces = NULL; > isinterface = FALSE; > } > ; > > interfaceflags: > | '(' TOKEN ')' interfaceflags { > if(strcmp($<id>2,"abstract") == 0) { > abstract = TRUE; > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN ')' interfaceflags { > if(strcmp($<id>2,"chunks") == 0) { > g_free (chunk_size); > chunk_size = g_strdup($<id>3); > } else if(strcmp($<id>2,"BonoboObject") == 0) { > g_free (bonobo_object_class); > bonobo_object_class = g_strdup($<id>3); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TYPETOKEN ')' interfaceflags { > if (strcmp ($<id>2, "interface") == 0) { > interfaces = g_list_append (interfaces, > g_strdup ($<id>3)); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN NUMBER ')' interfaceflags { > if(strcmp($<id>2,"chunks") == 0) { > g_free (chunk_size); > if(atoi($<id>3) != 0) > chunk_size = g_strdup($<id>3); > else > chunk_size = NULL; > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, NULL); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN STRING STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, $<id>5); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, NULL); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > | '(' TOKEN TOKEN STRING STRING ')' interfaceflags { > if (strcmp ($<id>2, "GladeXML") == 0) { > glade_xml = TRUE; > add_construct_glade($<id>3, $<id>4, $<id>5); > } else { > yyerror(_("parse error")); > YYERROR; > } > } > ; > 873a992,1020 > interfacecode: interfacecode interfacething { ; } > | interfacething { ; } > ; > > interfacething: method { ; } > | TOKEN method { > if (strcmp ($<id>1, "BonoboObject") != 0) { > g_free ($<id>1); > yyerror (_("parse error")); > YYERROR; > } > g_free ($<id>1); > last_added_method->bonobo_object_func = TRUE; > } > | TOKEN TYPETOKEN method { > if (strcmp ($<id>1, "interface") != 0) { > g_free ($<id>1); > g_free ($<id>2); > yyerror (_("parse error")); > YYERROR; > } > g_free ($<id>1); > node_set ((Node *)last_added_method, > "interface:steal", $<id>2, > NULL); > } > | ';' { ; } > ; > diff -r gob2-2.0.14/src/treefuncs.c gobnew/src/treefuncs.c 108a109 > QUARK_isinterface, 216a218 > g_hash_table_insert (quark_ht, "isinterface", GINT_TO_POINTER (QUARK_isinterface)); 365a368 > new->isinterface = self->isinterface; 957a961,965 > case QUARK_isinterface: { > gboolean isinterface = va_arg (__ap, gboolean); > self->isinterface = isinterface; > break; > } diff -r gob2-2.0.14/src/treefuncs.def gobnew/src/treefuncs.def 59c59,60 < BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used --- > BOOL abstract # if G_TYPE_FLAG_ABSTRACT should be used > BOOL isinterface # if it is an interface instead of a class diff -r gob2-2.0.14/src/treefuncs.h gobnew/src/treefuncs.h 121a122 > gboolean isinterface;

--
to unsubscribe:
send mail to minimalist@... with "unsubscribe gob-list" in the subject