From 001631bf9b9e672154492bf6547c0c7c985ed3e0 Mon Sep 17 00:00:00 2001
From: Dieter Verfaillie
Date: Fri, 23 Aug 2013 08:48:05 +0200
Subject: giscanner: write virtual method instance parameter docs to .gir file
---
.../Regress.FooObject-read_fn.page | 2 +-
.../Regress.TestObj-matrix.page | 2 +-
.../Regress.FooObject-read_fn.page | 2 +-
.../Regress.TestObj-matrix.page | 2 +-
tests/scanner/Regress-1.0-expected.gir | 4 ++
tests/scanner/WarnLib-1.0-expected.gir | 59 ++++++++++++++++++++++
.../annotationparser/gi/syntax_whitespace.xml | 49 ++++++++++++++++++
tests/scanner/warnlib.c | 14 +++++
tests/scanner/warnlib.h | 3 ++
9 files changed, 133 insertions(+), 4 deletions(-)
(limited to 'tests/scanner')
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
index a316adb5..f99f3c0d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page
@@ -27,7 +27,7 @@ void read_fn (RegressFooObject* object,
-
object
-
+obj
-
offset
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
index 4c8247b5..43203655 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page
@@ -28,7 +28,7 @@ case.
-
obj
-
+A
-
somestr
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
index c2ca1c09..6cf532b8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
@@ -27,7 +27,7 @@ def do_read_fn(object, offset, length):
-
object
-
+obj
-
offset
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
index fe7066a2..742e6da4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
@@ -29,7 +29,7 @@ case.
-
obj
-
+A
-
somestr
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index f9ba48c8..7b823a3f 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -1311,6 +1311,7 @@ uses a C sugar return type.
+ obj
@@ -1572,6 +1573,7 @@ uses a C sugar return type.
+ obj
@@ -2825,6 +2827,7 @@ case.
+ A #RegressTestObj
@@ -3514,6 +3517,7 @@ the introspection client langage.
+ A #RegressTestObj
diff --git a/tests/scanner/WarnLib-1.0-expected.gir b/tests/scanner/WarnLib-1.0-expected.gir
index 0fc0d846..47e3666c 100644
--- a/tests/scanner/WarnLib-1.0-expected.gir
+++ b/tests/scanner/WarnLib-1.0-expected.gir
@@ -19,6 +19,26 @@ and/or use gtk-doc annotations. -->
glib:type-name="WarnLibWhatever"
glib:get-type="warnlib_whatever_get_type"
glib:type-struct="WhateverIface">
+
+ Does boo.
+
+
+
+
+
+ a WarnLibWhatever
+
+
+
+ x parameter
+
+
+
+ y parameter
+
+
+
+
@@ -35,6 +55,24 @@ and/or use gtk-doc annotations. -->
+
+ Does boo.
+
+
+
+
+
+ a WarnLibWhatever
+
+
+
+
+
+
+
+
+
+
@@ -76,6 +114,27 @@ and/or use gtk-doc annotations. -->
+
+
+
+
+
+
+
+ a WarnLibWhatever
+
+
+
+ x parameter
+
+
+
+ y parameter
+
+
+
+
+
*/
+
+ /**
+ *atk_text_get_default_attributes:
+ *@text: an #AtkText
+ *
+ *Creates ...
+ *
+ *Returns: (transfer full): an ...
+ */
+
+
+
+ atk_text_get_default_attributes
+
+
+
+ text
+ an #AtkText
+
+
+ Creates ...
+
+
+ returns
+
+
+ transfer
+
+
+
+
+
+ an ...
+
+
+
+
+
+
+
diff --git a/tests/scanner/warnlib.c b/tests/scanner/warnlib.c
index 940d2b6a..d7c1e2a1 100644
--- a/tests/scanner/warnlib.c
+++ b/tests/scanner/warnlib.c
@@ -31,3 +31,17 @@ warnlib_whatever_do_moo (WarnLibWhatever *self, int x, gpointer y)
{
WARNLIB_WHATEVER_GET_IFACE(self)->do_moo (self, x, y);
}
+
+/**
+ * warnlib_whatever_do_boo:
+ * @self: a WarnLibWhatever
+ * @x: x parameter
+ * @y: y parameter
+ *
+ * Does boo.
+ */
+void
+warnlib_whatever_do_boo (WarnLibWhatever *self, int x, gpointer y)
+{
+ WARNLIB_WHATEVER_GET_IFACE(self)->do_boo (self, x, y);
+}
diff --git a/tests/scanner/warnlib.h b/tests/scanner/warnlib.h
index 9e448c08..a4c28b47 100644
--- a/tests/scanner/warnlib.h
+++ b/tests/scanner/warnlib.h
@@ -27,9 +27,12 @@ struct _WarnLibWhateverIface
/* explicitly test un-named parameters */
void (*do_moo) (WarnLibWhatever *self, int, gpointer);
+
+ void (*do_boo) (WarnLibWhatever *self, int x, gpointer y);
};
void warnlib_whatever_do_moo (WarnLibWhatever *self, int, gpointer);
+void warnlib_whatever_do_boo (WarnLibWhatever *self, int, gpointer);
GType warnlib_whatever_get_type (void) G_GNUC_CONST;
--
cgit v1.2.1