After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 694593 - doctool: Various patches
doctool: Various patches
Status: RESOLVED FIXED
Product: gobject-introspection
Classification: Platform
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: gobject-introspection Maintainer(s)
gobject-introspection Maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2013-02-24 15:32 UTC by Colin Walters
Modified: 2015-02-07 16:58 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
scanner: Synthesize argument names if we don't see one (6.00 KB, patch)
2013-02-24 15:32 UTC, Colin Walters
accepted-commit_now Details | Review
doctool: Switch default language to C (933 bytes, patch)
2013-02-24 15:32 UTC, Colin Walters
accepted-commit_now Details | Review
scanner: Also traverse GObject properties when walking namespace (902 bytes, patch)
2013-02-24 15:33 UTC, Colin Walters
accepted-commit_now Details | Review
doctool: Use builtin namespace walker (4.43 KB, patch)
2013-02-24 15:33 UTC, Colin Walters
accepted-commit_now Details | Review
scanner: internals cleanup: Key more things off Namespace (14.21 KB, patch)
2013-02-24 15:33 UTC, Colin Walters
accepted-commit_now Details | Review
0001-scanner-Don-t-re-parse-includes-we-already-found.patch (1.10 KB, patch)
2013-02-27 16:10 UTC, Colin Walters
none Details | Review

Description Colin Walters 2013-02-24 15:32:47 UTC
See attached.
Comment 1 Colin Walters 2013-02-24 15:32:50 UTC
Created attachment 237278 [details] [review]
scanner: Synthesize argument names if we don't see one

While this is a bit lame, we need to do something.  We preserve the
warning message.
Comment 2 Colin Walters 2013-02-24 15:32:58 UTC
Created attachment 237279 [details] [review]
doctool: Switch default language to C
Comment 3 Colin Walters 2013-02-24 15:33:01 UTC
Created attachment 237280 [details] [review]
scanner: Also traverse GObject properties when walking namespace

This could be done manually by the caller, but it's better if we're
consistent here, since we do traverse fields.
Comment 4 Colin Walters 2013-02-24 15:33:05 UTC
Created attachment 237281 [details] [review]
doctool: Use builtin namespace walker

Rather than hand-rolling our own.  This ensures we traverse all nodes.
Comment 5 Colin Walters 2013-02-24 15:33:08 UTC
Created attachment 237282 [details] [review]
scanner: internals cleanup: Key more things off Namespace

The .gir format has a weird legacy where stuff like the includes are
outside of the <namespace>.  But conceptually they're tied together,
so let's start reflecting this in the code.

This way we can just pass around and look at a Namespace object
instead of a 4-tuple of (namespace, includes, c_includes, pkg_config).
Comment 6 Jasper St. Pierre (not reading bugmail) 2013-02-26 18:15:06 UTC
Review of attachment 237278 [details] [review]:

OK.
Comment 7 Jasper St. Pierre (not reading bugmail) 2013-02-26 18:15:19 UTC
Review of attachment 237279 [details] [review]:

OK.
Comment 8 Jasper St. Pierre (not reading bugmail) 2013-02-26 18:15:39 UTC
Review of attachment 237280 [details] [review]:

OK.
Comment 9 Jasper St. Pierre (not reading bugmail) 2013-02-26 18:18:36 UTC
Review of attachment 237282 [details] [review]:

This looks OK, but you clarify the second paragraph of the commit message to say that this will be something done in the future -- right now we just strip off the includes.

::: tests/scanner/Bar-1.0-expected.gir
@@ -7,3 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="GLib" version="2.0"/>

Is it intentional that this is removed here?
Comment 10 Jasper St. Pierre (not reading bugmail) 2013-02-26 18:19:20 UTC
Review of attachment 237281 [details] [review]:

Looks to be a semi-nice cleanup. The _chain stuff isn't too pretty but it works for now.
Comment 11 Colin Walters 2013-02-26 19:40:20 UTC
(In reply to comment #9)
> Review of attachment 237282 [details] [review]:
> 
> This looks OK, but you clarify the second paragraph of the commit message to
> say that this will be something done in the future -- right now we just strip
> off the includes.

Hmm?  Oh I see, no - we aren't stripping the includes.  This patch just ends up fixing the bug where we recursively traversed dependencies of includes, and added them to the generated .gir file.  See below.


> ::: tests/scanner/Bar-1.0-expected.gir
> @@ -7,3 @@
>              xmlns:c="http://www.gtk.org/introspection/c/1.0"
>              xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
> -  <include name="GLib" version="2.0"/>
> 
> Is it intentional that this is removed here?

Yes because the scanner already processes dependencies, it was busted that we were putting the full dep tree in every .gir file.
Comment 12 Jasper St. Pierre (not reading bugmail) 2013-02-26 19:42:35 UTC
(In reply to comment #11)
> (In reply to comment #9)
> > Review of attachment 237282 [details] [review] [details]:
> > 
> > This looks OK, but you clarify the second paragraph of the commit message to
> > say that this will be something done in the future -- right now we just strip
> > off the includes.
> 
> Hmm?  Oh I see, no - we aren't stripping the includes.  This patch just ends up
> fixing the bug where we recursively traversed dependencies of includes, and
> added them to the generated .gir file.  See below.

erm, I mean that we're not passing just namespace yet, we're passing a 3-tuple
Comment 13 Colin Walters 2013-02-27 15:47:06 UTC
commit dfeaf33c8a4ae7e25b4a83d0b31c4d435b4ef7de broke the pango build...it looks like we're trying to find --pkg-export at build time.
Comment 14 Colin Walters 2013-02-27 16:10:32 UTC
Created attachment 237529 [details] [review]
0001-scanner-Don-t-re-parse-includes-we-already-found.patch
Comment 15 André Klapper 2015-02-07 16:58:02 UTC
[Mass-moving gobject-introspection tickets to its own Bugzilla product - see bug 708029. Mass-filter your bugmail for this message: introspection20150207 ]