[gobject-introspection] doctool: update tests
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] doctool: update tests
- Date: Wed, 5 Mar 2014 16:13:10 +0000 (UTC)
commit fcd5ce8721bc9c77144e38f257f94f37f3d7cab5
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sun Mar 2 17:16:12 2014 +0100
doctool: update tests
.../Regress.AnnotationBitfield.page | 6 ++--
.../Regress.FooFlagsNoType.page | 6 ++--
.../Regress.FooFlagsType.page | 6 ++--
.../Regress-1.0-C-expected/Regress.TestFlags.page | 6 ++--
.../Regress.TestPrivateEnum.page | 6 ++--
.../Regress.AnnotationBitfield.page | 21 ++++++++++++++--
.../Regress.AnnotationCallback.page | 2 +-
.../Regress.AnnotationListCallback.page | 2 +-
.../Regress.AnnotationObject.allow_none.page | 2 +-
.../Regress.AnnotationObject.calleeowns.page | 2 +-
.../Regress.AnnotationObject.calleesowns.page | 2 +-
.../Regress.AnnotationObject.create_object.page | 2 +-
.../Regress.AnnotationObject.do_not_use.page | 2 +-
.../Regress.AnnotationObject.get_hash.page | 2 +-
.../Regress.AnnotationObject.get_objects.page | 2 +-
.../Regress.AnnotationObject.get_strings.page | 2 +-
.../Regress.AnnotationObject.in.page | 2 +-
.../Regress.AnnotationObject.inout.page | 2 +-
.../Regress.AnnotationObject.inout2.page | 2 +-
.../Regress.AnnotationObject.inout3.page | 2 +-
.../Regress.AnnotationObject.method.page | 2 +-
.../Regress.AnnotationObject.notrans.page | 2 +-
.../Regress.AnnotationObject.out.page | 2 +-
.../Regress.AnnotationObject.parse_args.page | 4 +-
.../Regress.AnnotationObject.string_out.page | 2 +-
.../Regress.FooCallback.page | 2 +-
.../Regress.FooFlagsNoType.page | 25 +++++++++++++++++--
.../Regress.FooFlagsType.page | 25 +++++++++++++++++--
.../Regress.FooObject.external_type.page | 2 +-
.../Regress.FooObject.get_default.page | 2 +-
.../Regress.FooObject.virtual_method.page | 2 +-
.../Regress.TestBoxed.equals.page | 2 +-
.../Regress.TestFlags.page | 25 +++++++++++++++++--
.../Regress.TestFloating.new.page | 2 +-
.../Regress.TestFundamentalObject.ref.page | 2 +-
.../Regress.TestObj-sig-with-hash-prop.page | 2 +-
.../Regress.TestObj.null_out.page | 2 +-
.../Regress.TestObj.skip_inout_param.page | 2 +-
.../Regress.TestObj.skip_out_param.page | 2 +-
.../Regress.TestObj.skip_param.page | 2 +-
.../Regress.TestObj.skip_return_val.page | 2 +-
.../Regress.TestObj.skip_return_val_no_out.page | 4 +-
.../Regress.TestPrivateEnum.page | 21 ++++++++++++++--
.../Regress.TestSimpleBoxedA.equals.page | 2 +-
.../Regress.TestStructA.clone.page | 2 +-
.../Regress.TestStructA.parse.page | 2 +-
.../Regress.TestStructB.clone.page | 2 +-
.../Regress.TestWi8021x.get_testbool.page | 2 +-
.../Regress.aliased_caller_alloc.page | 2 +-
.../Regress.annotation_attribute_func.page | 2 +-
.../Regress.annotation_get_source_file.page | 2 +-
.../Regress.annotation_init.page | 4 +-
.../Regress.annotation_ptr_array.page | 4 +-
.../Regress.annotation_return_array.page | 2 +-
.../Regress.annotation_return_filename.page | 2 +-
.../Regress.annotation_string_zero_terminated.page | 2 +-
...ress.annotation_string_zero_terminated_out.page | 4 +-
.../Regress.annotation_test_parsing_bug630862.page | 2 +-
.../Regress.annotation_transfer_floating.page | 2 +-
.../Regress.global_get_flags_out.page | 2 +-
.../Regress.test_array_fixed_out_objects.page | 2 +-
.../Regress.test_array_fixed_size_int_in.page | 2 +-
.../Regress.test_array_fixed_size_int_out.page | 2 +-
.../Regress.test_array_fixed_size_int_return.page | 2 +-
.../Regress.test_array_gtype_in.page | 2 +-
.../Regress.test_array_int_full_out.page | 2 +-
.../Regress.test_array_int_inout.page | 4 +-
.../Regress.test_array_int_none_out.page | 2 +-
.../Regress.test_array_int_null_out.page | 2 +-
.../Regress.test_array_int_out.page | 2 +-
.../Regress.test_boolean.page | 2 +-
.../Regress.test_boolean_false.page | 2 +-
.../Regress.test_boolean_true.page | 2 +-
.../Regress.test_cairo_surface_full_out.page | 2 +-
.../Regress.test_callback_thaw_notifications.page | 2 +-
.../Regress.test_closure.page | 4 +-
.../Regress.test_closure_one_arg.page | 4 +-
.../Regress.test_closure_variant.page | 6 ++--
.../Regress.test_date_in_gvalue.page | 4 +-
.../Regress.test_filename_return.page | 2 +-
.../Regress.test_ghash_gvalue_in.page | 4 +-
.../Regress.test_ghash_gvalue_return.page | 4 +-
.../Regress.test_ghash_null_out.page | 2 +-
.../Regress.test_glist_null_out.page | 2 +-
.../Regress.test_gslist_null_out.page | 2 +-
.../Regress.test_gvariant_as.page | 2 +-
.../Regress.test_gvariant_asv.page | 2 +-
.../Regress.test_gvariant_i.page | 2 +-
.../Regress.test_gvariant_s.page | 2 +-
.../Regress.test_gvariant_v.page | 2 +-
.../Regress.test_int_out_utf8.page | 2 +-
.../Regress.test_int_value_arg.page | 4 +-
.../Regress.test_strv_in.page | 2 +-
.../Regress.test_strv_in_gvalue.page | 4 +-
.../Regress.test_strv_outarg.page | 2 +-
.../Regress.test_utf8_const_return.page | 2 +-
.../Regress.test_utf8_inout.page | 4 +-
.../Regress.test_utf8_nonconst_return.page | 2 +-
.../Regress.test_utf8_null_out.page | 2 +-
.../Regress.test_utf8_out.page | 2 +-
.../Regress.test_utf8_out_nonconst_return.page | 2 +-
.../Regress.test_value_return.page | 6 ++--
.../Regress.AnnotationBitfield.page | 15 ++++++++++-
.../Regress.FooFlagsNoType.page | 19 +++++++++++++-
.../Regress.FooFlagsType.page | 19 +++++++++++++-
.../Regress.TestFlags.page | 19 +++++++++++++-
.../Regress.TestPrivateEnum.page | 15 ++++++++++-
107 files changed, 304 insertions(+), 150 deletions(-)
---
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page
b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page
index e0e5b00..7964b3b 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<page id="Regress.AnnotationBitfield"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.AnnotationBitfield</title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page
index 930b6d0..f45f4bc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsNoType"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsNoType</title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page
b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page
index 96e9759..3714e53 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsType"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsType</title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page
index efab1a0..54c679a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<page id="Regress.TestFlags"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestFlags</title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page
b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page
index 0cf17c1..e37674e 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<page id="Regress.TestPrivateEnum"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestPrivateEnum</title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
index e0e5b00..355066b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
@@ -1,14 +1,29 @@
<?xml version="1.0"?>
<page id="Regress.AnnotationBitfield"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.AnnotationBitfield</title>
+<terms>
+<item>
+<title><code>AnnotationBitfield.FOO</code></title>
+
+</item>
+<item>
+<title><code>AnnotationBitfield.BAR</code></title>
+
+</item>
+</terms>
+ <links type="topic" ui:expanded="true"
+ api:type="function" api:mime="text/x-gjs"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
index 97b8b65..4c40231 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
@@ -22,7 +22,7 @@ function onAnnotationCallback(in: Number(gint)): Number(gint) {
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>array of ints</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
index a92a4f3..e66cdef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
@@ -22,7 +22,7 @@ function onAnnotationListCallback(in: Array(String)): Array(String) {
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>list of strings</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
index 076d9a2..9a4cc08 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
@@ -33,7 +33,7 @@ function allow_none(somearg: String): <link href="../GObject-2.0/GObject.Object.
</item>
<item>
<title><code>Returns</code></title>
-
+ <p><code>null</code> always</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
index e9620c8..0e458c4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
@@ -25,7 +25,7 @@ function calleeowns(): [return_value: Number(gint), toown: <link href="../GObjec
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>toown</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
index 3741558..401fcb0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
@@ -25,7 +25,7 @@ function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObj
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>toown1</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
index b82f3a3..c659864 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
@@ -25,7 +25,7 @@ function create_object(): <link href="../GObject-2.0/GObject.Object.html">GObjec
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>The object</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
index 2455d62..07a0ed8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
@@ -25,7 +25,7 @@ function do_not_use(): <link href="../GObject-2.0/GObject.Object.html">GObject.O
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p><code>null</code> always</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
index efaa504..ec29a8a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
@@ -26,7 +26,7 @@ objects.</p>
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>hash table</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
index fc8960b..38e3d46 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
@@ -27,7 +27,7 @@ intentionally similar example to gtk_container_get_children</p>
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>list of objects</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
index 8038a7d..03fece1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
@@ -26,7 +26,7 @@ each string needs to be freed.</p>
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>list of strings</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
index 3ef203f..892eb42 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
@@ -33,7 +33,7 @@ function in(inarg: Number(gint)): Number(gint) {
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>an int</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
index 02ad264..5d2eaa5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
@@ -33,7 +33,7 @@ function inout(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: N
</item>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>inoutarg (out)</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
index 00807c0..06c0a83 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
@@ -33,7 +33,7 @@ function inout2(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg:
</item>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>inoutarg (out)</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
index 7bf3374..e20f1f5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
@@ -33,7 +33,7 @@ function inout3(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg:
</item>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>inoutarg (out)</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
index 23836e6..e94067c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
@@ -25,7 +25,7 @@ function method(): Number(gint) {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>an int</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
index ecb3e9a..97d302b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
@@ -25,7 +25,7 @@ function notrans(): <link href="../GObject-2.0/GObject.Object.html">GObject.Obje
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>An object, not referenced</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
index c607202..e9cb17b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
@@ -25,7 +25,7 @@ function out(): [return_value: Number(gint), outarg: Number(gint)] {
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>an int</p>
</item>
<item>
<title><code>outarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
index 7e1a301..8bc6913 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
@@ -28,11 +28,11 @@ function parse_args(argv: Array(String)): Array(String) {
<terms>
<item>
-<title><code>argv</code></title>
+<title><code>Returns</code></title>
<p>Argument vector</p>
</item>
<item>
-<title><code>argv (out)</code></title>
+<title><code>Returns (out)</code></title>
<p>Argument vector</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
index d7a0cf9..9df3a2a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
@@ -25,7 +25,7 @@ function string_out(): [ok: Boolean, str_out: String] {
<terms>
<item>
<title><code>ok</code></title>
-
+ <p>some boolean</p>
</item>
<item>
<title><code>str_out</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
index 0cf20c3..697eab7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
@@ -29,7 +29,7 @@ function onFooCallback(regress_foo: <link xref="Regress.FooObject">Regress.FooOb
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
index 930b6d0..d9b2cc7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
@@ -1,14 +1,33 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsNoType"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsNoType</title>
+<terms>
+<item>
+<title><code>FooFlagsNoType.ETT</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.TVA</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.FYRA</code></title>
+
+</item>
+</terms>
+ <links type="topic" ui:expanded="true"
+ api:type="function" api:mime="text/x-gjs"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
index 96e9759..ec6f34c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
@@ -1,14 +1,33 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsType"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsType</title>
+<terms>
+<item>
+<title><code>FooFlagsType.FIRST</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.SECOND</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.THIRD</code></title>
+
+</item>
+</terms>
+ <links type="topic" ui:expanded="true"
+ api:type="function" api:mime="text/x-gjs"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
index e1e6b81..bd806bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
@@ -25,7 +25,7 @@ function external_type(): <link href="../Utility-1.0/Utility.Object.html">Utilit
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p><code>null</code> always</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
index acb4b46..63fa575 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
@@ -26,7 +26,7 @@ uses a C sugar return type.</p>
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>The global <link xref="Regress.FooSubobject"/></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
index df24439..8a60024 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
@@ -32,7 +32,7 @@ function virtual_method(first_param: Number(gint)): Boolean {
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
index 063c241..257a9f5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
@@ -32,7 +32,7 @@ function equals(other: <link xref="Regress.TestBoxed">Regress.TestBoxed</link>):
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
index efab1a0..f962b6a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
@@ -1,14 +1,33 @@
<?xml version="1.0"?>
<page id="Regress.TestFlags"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestFlags</title>
+<terms>
+<item>
+<title><code>TestFlags.FLAG1</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG2</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG3</code></title>
+
+</item>
+</terms>
+ <links type="topic" ui:expanded="true"
+ api:type="function" api:mime="text/x-gjs"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
index 431c141..e12720e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
@@ -25,7 +25,7 @@ function new(): <link xref="Regress.TestFloating">Regress.TestFloating</link> {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>A new floating <link xref="Regress.TestFloating"/></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
index 153a759..4dd081a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
@@ -25,7 +25,7 @@ function ref(): <link xref="Regress.TestFundamentalObject">Regress.TestFundament
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>A new <link xref="Regress.TestFundamentalObject"/></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
index 6118eff..14f7b2f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -11,7 +11,7 @@
</info>
<title>Regress.TestObj::sig-with-hash-prop</title>
<synopsis><code mime="text/x-gjs">
-connect('sig-with-hash-prop', function (testObj, hash: {String: <link
href="../GObject-2.0/GObject.Value.html">GObject.Value</link>}, ): void);
+connect('sig-with-hash-prop', function (testObj, hash: {String: Any}, ): void);
</code></synopsis>
<p>This test signal is like TelepathyGlib's
TpAccount::status-changed</p>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
index b9d08cf..1237d49 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
@@ -24,7 +24,7 @@ function null_out(): <link xref="Regress.TestObj">Regress.TestObj</link> {
<terms>
<item>
-<title><code>obj</code></title>
+<title><code>Returns</code></title>
<p>A <link xref="Regress.TestObj"/></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
index cd80f3a..f253cce 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
@@ -65,7 +65,7 @@ function skip_inout_param(a: Number(gint), c: Number(gdouble), inout_d: Number(g
</item>
<item>
<title><code>ok</code></title>
-
+ <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
</item>
<item>
<title><code>out_b</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
index de9f031..2f27e86 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
@@ -65,7 +65,7 @@ function skip_out_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gin
</item>
<item>
<title><code>ok</code></title>
-
+ <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
</item>
<item>
<title><code>out_b</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
index 7f764bc..bd193a0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
@@ -65,7 +65,7 @@ function skip_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint),
</item>
<item>
<title><code>ok</code></title>
-
+ <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
</item>
<item>
<title><code>out_b</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
index 575dc93..b7a3a87 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
@@ -65,7 +65,7 @@ function skip_return_val(a: Number(gint), c: Number(gdouble), inout_d: Number(gi
</item>
<item>
<title><code>ok</code></title>
-
+ <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
</item>
<item>
<title><code>out_b</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
index 9e90bcc..2558aa7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -33,8 +33,8 @@ raise an error.</p>
<p>Parameter.</p>
</item>
<item>
-<title><code>ok</code></title>
-
+<title><code>Returns</code></title>
+ <p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
index 0cf17c1..b4cf900 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
@@ -1,14 +1,29 @@
<?xml version="1.0"?>
<page id="Regress.TestPrivateEnum"
- type="topic"
- style="default"
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestPrivateEnum</title>
+<terms>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code></title>
+
+</item>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code></title>
+
+</item>
+</terms>
+ <links type="topic" ui:expanded="true"
+ api:type="function" api:mime="text/x-gjs"
+ groups="function" style="linklist">
+ <title>Functions</title>
+ </links>
</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
index aa033e5..7420b30 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
@@ -32,7 +32,7 @@ function equals(other_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpl
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
index 3d185ec..0be40a4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
@@ -24,7 +24,7 @@ function clone(): <link xref="Regress.TestStructA">Regress.TestStructA</link> {
<terms>
<item>
-<title><code>a_out</code></title>
+<title><code>Returns</code></title>
<p>the cloned structure</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
index 2009ef3..6904c43 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
@@ -32,7 +32,7 @@ function parse(string: String): <link xref="Regress.TestStructA">Regress.TestStr
<p>ignored</p>
</item>
<item>
-<title><code>a_out</code></title>
+<title><code>Returns</code></title>
<p>the structure that is to be filled</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
index c0d2e51..93b9d45 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
@@ -24,7 +24,7 @@ function clone(): <link xref="Regress.TestStructB">Regress.TestStructB</link> {
<terms>
<item>
-<title><code>b_out</code></title>
+<title><code>Returns</code></title>
<p>the cloned structure</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
index 8f8db65..3d83f91 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
@@ -24,7 +24,7 @@ function get_testbool(): Boolean {
<terms>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
index 8ddad6d..ebc301c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
@@ -24,7 +24,7 @@ function aliased_caller_alloc(): <link xref="Regress.AliasedTestBoxed">Regress.A
<terms>
<item>
-<title><code>boxed</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
index dc481fa..da3a39c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
@@ -41,7 +41,7 @@ function annotation_attribute_func(object: <link xref="Regress.AnnotationObject"
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>The return value.</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
index 6187e30..d86c65e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
@@ -25,7 +25,7 @@ function annotation_get_source_file(): String {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>Source file</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
index e1b1ffe..2cd2a0e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
@@ -28,11 +28,11 @@ function annotation_init(argv: Array(String)): Array(String) {
<terms>
<item>
-<title><code>argv</code></title>
+<title><code>Returns</code></title>
<p>The arguments.</p>
</item>
<item>
-<title><code>argv (out)</code></title>
+<title><code>Returns (out)</code></title>
<p>The arguments.</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
index 9d1de5e..1d6d51e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
@@ -13,14 +13,14 @@
</api:returns>
<api:name>regress_annotation_ptr_array</api:name>
<api:arg>
- <api:type>Array(GObject.Value)</api:type>
+ <api:type>Array(Any)</api:type>
<api:name>array</api:name>
</api:arg>
</api:function>
</info>
<title>Regress.annotation_ptr_array</title>
<synopsis><code mime="text/x-gjs">
-function annotation_ptr_array(array: Array(<link
href="../GObject-2.0/GObject.Value.html">GObject.Value</link>)): void {
+function annotation_ptr_array(array: Array(Any)): void {
// Gjs wrapper for regress_annotation_ptr_array()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
index 94f8f35..0ca05e7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
@@ -25,7 +25,7 @@ function annotation_return_array(): [return_value: Array(String), length: Number
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>The return value</p>
</item>
<item>
<title><code>length</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
index 6b8f902..3cc04b9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
@@ -25,7 +25,7 @@ function annotation_return_filename(): String {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>An annotated filename</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
index a3c2e3f..e27b53b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
@@ -25,7 +25,7 @@ function annotation_string_zero_terminated(): Array(String) {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>The return value</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
index c388ad2..00b2e39 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
@@ -28,11 +28,11 @@ function annotation_string_zero_terminated_out(out: Array(String)): Array(String
<terms>
<item>
-<title><code>out</code></title>
+<title><code>Returns</code></title>
</item>
<item>
-<title><code>out (out)</code></title>
+<title><code>Returns (out)</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
index 3fb7093..5ed7f14 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
@@ -25,7 +25,7 @@ function annotation_test_parsing_bug630862(): <link href="../GObject-2.0/GObject
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>An object, note the colon:in here</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
index 25a4aeb..be5134b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
@@ -25,7 +25,7 @@ function annotation_transfer_floating(): <link href="../GObject-2.0/GObject.Obje
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>A floating object</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
index b8b1888..04ded51 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
@@ -24,7 +24,7 @@ function global_get_flags_out(): <link xref="Regress.TestFlags">Regress.TestFlag
<terms>
<item>
-<title><code>v</code></title>
+<title><code>Returns</code></title>
<p>A flags value</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
index 0645559..21ae53e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
@@ -24,7 +24,7 @@ function test_array_fixed_out_objects(): Array(<link xref="Regress.TestObj">Regr
<terms>
<item>
-<title><code>objs</code></title>
+<title><code>Returns</code></title>
<p>An array of <link xref="Regress.TestObj"/></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
index 4d74b6b..22d6a35 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
@@ -33,7 +33,7 @@ function test_array_fixed_size_int_in(ints: Array(Number(gint))): Number(gint) {
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>the sum of the items in <code>ints</code></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
index 37c5aed..ff1479a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
@@ -24,7 +24,7 @@ function test_array_fixed_size_int_out(): Array(Number(gint)) {
<terms>
<item>
-<title><code>ints</code></title>
+<title><code>Returns</code></title>
<p>a list of 5 integers ranging from 0 to 4</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
index 27f8360..d899ec2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
@@ -25,7 +25,7 @@ function test_array_fixed_size_int_return(): Array(Number(gint)) {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>a list of 5 integers ranging from 0 to 4</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
index 7206bea..7f4e5ac 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
@@ -33,7 +33,7 @@ function test_array_gtype_in(types: Array(GObject.Type)): String {
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>string representation of provided types</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
index 73f6250..e526457 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
@@ -25,7 +25,7 @@ function test_array_int_full_out(): [return_value: Array(Number(gint)), len: Num
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>a new array of integers.</p>
</item>
<item>
<title><code>len</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
index 6624efe..a9ee022 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
@@ -28,11 +28,11 @@ function test_array_int_inout(ints: Array(Number(gint))): Array(Number(gint)) {
<terms>
<item>
-<title><code>ints</code></title>
+<title><code>Returns</code></title>
<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
</item>
<item>
-<title><code>ints (out)</code></title>
+<title><code>Returns (out)</code></title>
<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
index 392f4fe..809e64e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
@@ -25,7 +25,7 @@ function test_array_int_none_out(): [return_value: Array(Number(gint)), len: Num
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>a static array of integers.</p>
</item>
<item>
<title><code>len</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
index d48aafd..35368ec 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
@@ -24,7 +24,7 @@ function test_array_int_null_out(): Array(Number(gint)) {
<terms>
<item>
-<title><code>arr</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
index 0707b8d..947f162 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
@@ -24,7 +24,7 @@ function test_array_int_out(): Array(Number(gint)) {
<terms>
<item>
-<title><code>ints</code></title>
+<title><code>Returns</code></title>
<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
index 1ecb415..cfa8f10 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
@@ -32,7 +32,7 @@ function test_boolean(in: Boolean): Boolean {
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
index cff83c6..bc6d239 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
@@ -32,7 +32,7 @@ function test_boolean_false(in: Boolean): Boolean {
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
index 26f4ba9..b4b9f6f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
@@ -32,7 +32,7 @@ function test_boolean_true(in: Boolean): Boolean {
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
index 9005393..8c2876a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
@@ -24,7 +24,7 @@ function test_cairo_surface_full_out(): <link href="../cairo-1.0/cairo.Surface.h
<terms>
<item>
-<title><code>surface</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
index b65b71d..a0b463a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
@@ -27,7 +27,7 @@ corresponding destroy notfications.</p>
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>Sum of the return values of the invoked callbacks.</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
index f83698d..df02862 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
@@ -13,14 +13,14 @@
</api:returns>
<api:name>regress_test_closure</api:name>
<api:arg>
- <api:type>GObject.Closure</api:type>
+ <api:type>Function</api:type>
<api:name>closure</api:name>
</api:arg>
</api:function>
</info>
<title>Regress.test_closure</title>
<synopsis><code mime="text/x-gjs">
-function test_closure(closure: <link href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>):
Number(gint) {
+function test_closure(closure: Function): Number(gint) {
// Gjs wrapper for regress_test_closure()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
index 56d9c0d..86282fd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
@@ -13,7 +13,7 @@
</api:returns>
<api:name>regress_test_closure_one_arg</api:name>
<api:arg>
- <api:type>GObject.Closure</api:type>
+ <api:type>Function</api:type>
<api:name>closure</api:name>
</api:arg>
<api:arg>
@@ -24,7 +24,7 @@
</info>
<title>Regress.test_closure_one_arg</title>
<synopsis><code mime="text/x-gjs">
-function test_closure_one_arg(closure: <link
href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>, arg: Number(gint)): Number(gint) {
+function test_closure_one_arg(closure: Function, arg: Number(gint)): Number(gint) {
// Gjs wrapper for regress_test_closure_one_arg()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
index cbda2a1..b226c3d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
@@ -13,7 +13,7 @@
</api:returns>
<api:name>regress_test_closure_variant</api:name>
<api:arg>
- <api:type>GObject.Closure</api:type>
+ <api:type>Function</api:type>
<api:name>closure</api:name>
</api:arg>
<api:arg>
@@ -24,7 +24,7 @@
</info>
<title>Regress.test_closure_variant</title>
<synopsis><code mime="text/x-gjs">
-function test_closure_variant(closure: <link
href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>, arg: <link
href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link>): <link
href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
+function test_closure_variant(closure: Function, arg: <link
href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link>): <link
href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
// Gjs wrapper for regress_test_closure_variant()
}
</code></synopsis>
@@ -41,7 +41,7 @@ function test_closure_variant(closure: <link href="../GObject-2.0/GObject.Closur
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>the return value of <code>closure</code></p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
index 743cc31..3a2e342 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
@@ -9,14 +9,14 @@
<link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
- <api:type>GObject.Value</api:type>
+ <api:type>Any</api:type>
</api:returns>
<api:name>regress_test_date_in_gvalue</api:name>
</api:function>
</info>
<title>Regress.test_date_in_gvalue</title>
<synopsis><code mime="text/x-gjs">
-function test_date_in_gvalue(): <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
+function test_date_in_gvalue(): Any {
// Gjs wrapper for regress_test_date_in_gvalue()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
index e52cd25..7454760 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
@@ -25,7 +25,7 @@ function test_filename_return(): Array(String) {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>list of strings</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
index fefc9aa..bebf0cc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
@@ -13,14 +13,14 @@
</api:returns>
<api:name>regress_test_ghash_gvalue_in</api:name>
<api:arg>
- <api:type>{String: GObject.Value}</api:type>
+ <api:type>{String: Any}</api:type>
<api:name>hash</api:name>
</api:arg>
</api:function>
</info>
<title>Regress.test_ghash_gvalue_in</title>
<synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_in(hash: {String: <link
href="../GObject-2.0/GObject.Value.html">GObject.Value</link>}): void {
+function test_ghash_gvalue_in(hash: {String: Any}): void {
// Gjs wrapper for regress_test_ghash_gvalue_in()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
index 141015e..728f723 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
@@ -9,14 +9,14 @@
<link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
- <api:type>{String: GObject.Value}</api:type>
+ <api:type>{String: Any}</api:type>
</api:returns>
<api:name>regress_test_ghash_gvalue_return</api:name>
</api:function>
</info>
<title>Regress.test_ghash_gvalue_return</title>
<synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_return(): {String: <link
href="../GObject-2.0/GObject.Value.html">GObject.Value</link>} {
+function test_ghash_gvalue_return(): {String: Any} {
// Gjs wrapper for regress_test_ghash_gvalue_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
index 8ddcc15..c8585e0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
@@ -24,7 +24,7 @@ function test_ghash_null_out(): {String: String} {
<terms>
<item>
-<title><code>out</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
index 057dc68..89ea91e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
@@ -24,7 +24,7 @@ function test_glist_null_out(): Array(String) {
<terms>
<item>
-<title><code>out_list</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
index 438473d..e79e1ad 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
@@ -24,7 +24,7 @@ function test_gslist_null_out(): Array(String) {
<terms>
<item>
-<title><code>out_list</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
index 0e2d25d..e838bdc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
@@ -25,7 +25,7 @@ function test_gvariant_as(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Var
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>New variant</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
index d0fc5b6..5079886 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
@@ -25,7 +25,7 @@ function test_gvariant_asv(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Va
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>New variant</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
index 2244a4d..15bceed 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
@@ -25,7 +25,7 @@ function test_gvariant_i(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Vari
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>New variant</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
index 7c440d6..5ece5f9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
@@ -25,7 +25,7 @@ function test_gvariant_s(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Vari
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>New variant</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
index f10aded..e2eebbd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
@@ -25,7 +25,7 @@ function test_gvariant_v(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Vari
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>New variant</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
index 7141cac..534ea11 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
@@ -32,7 +32,7 @@ function test_int_out_utf8(in: String): Number(gint) {
</item>
<item>
-<title><code>length</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
index 6d61389..9caddd6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
@@ -13,14 +13,14 @@
</api:returns>
<api:name>regress_test_int_value_arg</api:name>
<api:arg>
- <api:type>GObject.Value</api:type>
+ <api:type>Any</api:type>
<api:name>v</api:name>
</api:arg>
</api:function>
</info>
<title>Regress.test_int_value_arg</title>
<synopsis><code mime="text/x-gjs">
-function test_int_value_arg(v: <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>):
Number(gint) {
+function test_int_value_arg(v: Any): Number(gint) {
// Gjs wrapper for regress_test_int_value_arg()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
index b427f9d..224203c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
@@ -32,7 +32,7 @@ function test_strv_in(arr: Array(String)): Boolean {
</item>
<item>
-<title><code>ok</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
index 3aeec50..65e159f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
@@ -9,14 +9,14 @@
<link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
- <api:type>GObject.Value</api:type>
+ <api:type>Any</api:type>
</api:returns>
<api:name>regress_test_strv_in_gvalue</api:name>
</api:function>
</info>
<title>Regress.test_strv_in_gvalue</title>
<synopsis><code mime="text/x-gjs">
-function test_strv_in_gvalue(): <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
+function test_strv_in_gvalue(): Any {
// Gjs wrapper for regress_test_strv_in_gvalue()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
index 04ce85f..0f2d143 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
@@ -24,7 +24,7 @@ function test_strv_outarg(): Array(String) {
<terms>
<item>
-<title><code>retp</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
index a323e44..cf505ee 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
@@ -25,7 +25,7 @@ function test_utf8_const_return(): String {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>UTF-8 string</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
index 48463ac..23364d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
@@ -28,11 +28,11 @@ function test_utf8_inout(inout: String): String {
<terms>
<item>
-<title><code>inout</code></title>
+<title><code>Returns</code></title>
</item>
<item>
-<title><code>inout (out)</code></title>
+<title><code>Returns (out)</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
index 05e2fb4..eef3daf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
@@ -25,7 +25,7 @@ function test_utf8_nonconst_return(): String {
<terms>
<item>
<title><code>Returns</code></title>
-
+ <p>UTF-8 string</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
index b4e23a5..db56a8b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
@@ -24,7 +24,7 @@ function test_utf8_null_out(): String {
<terms>
<item>
-<title><code>char_out</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
index c3e4cac..5162aba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
@@ -24,7 +24,7 @@ function test_utf8_out(): String {
<terms>
<item>
-<title><code>out</code></title>
+<title><code>Returns</code></title>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
index 0966cee..9ae1e7c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
@@ -25,7 +25,7 @@ function test_utf8_out_nonconst_return(): [return_value: String, out: String] {
<terms>
<item>
<title><code>return_value</code></title>
-
+ <p>a copy of "first"</p>
</item>
<item>
<title><code>out</code></title>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
index 1493360..d843d28 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
@@ -9,7 +9,7 @@
<link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
- <api:type>GObject.Value</api:type>
+ <api:type>Any</api:type>
</api:returns>
<api:name>regress_test_value_return</api:name>
<api:arg>
@@ -20,7 +20,7 @@
</info>
<title>Regress.test_value_return</title>
<synopsis><code mime="text/x-gjs">
-function test_value_return(i: Number(gint)): <link
href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
+function test_value_return(i: Number(gint)): Any {
// Gjs wrapper for regress_test_value_return()
}
</code></synopsis>
@@ -33,7 +33,7 @@ function test_value_return(i: Number(gint)): <link href="../GObject-2.0/GObject.
</item>
<item>
<title><code>Returns</code></title>
-
+ <p>the int wrapped in a GValue.</p>
</item>
</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
index e0e5b00..fa303bb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
@@ -1,14 +1,25 @@
<?xml version="1.0"?>
<page id="Regress.AnnotationBitfield"
type="topic"
- style="default"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.AnnotationBitfield</title>
+<terms>
+<item>
+<title><code>AnnotationBitfield.FOO</code></title>
+
+</item>
+<item>
+<title><code>AnnotationBitfield.BAR</code></title>
+
+</item>
+</terms>
+
</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
index 930b6d0..ee0223a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
@@ -1,14 +1,29 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsNoType"
type="topic"
- style="default"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsNoType</title>
+<terms>
+<item>
+<title><code>FooFlagsNoType.ETT</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.TVA</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsNoType.FYRA</code></title>
+
+</item>
+</terms>
+
</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
index 96e9759..26b14e6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
@@ -1,14 +1,29 @@
<?xml version="1.0"?>
<page id="Regress.FooFlagsType"
type="topic"
- style="default"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooFlagsType</title>
+<terms>
+<item>
+<title><code>FooFlagsType.FIRST</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.SECOND</code></title>
+
+</item>
+<item>
+<title><code>FooFlagsType.THIRD</code></title>
+
+</item>
+</terms>
+
</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
index efab1a0..19b28a6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
@@ -1,14 +1,29 @@
<?xml version="1.0"?>
<page id="Regress.TestFlags"
type="topic"
- style="default"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestFlags</title>
+<terms>
+<item>
+<title><code>TestFlags.FLAG1</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG2</code></title>
+
+</item>
+<item>
+<title><code>TestFlags.FLAG3</code></title>
+
+</item>
+</terms>
+
</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
index 0cf17c1..be741c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
@@ -1,14 +1,25 @@
<?xml version="1.0"?>
<page id="Regress.TestPrivateEnum"
type="topic"
- style="default"
+ style="enum"
xmlns="http://projectmallard.org/1.0/";
xmlns:api="http://projectmallard.org/experimental/api/";
xmlns:ui="http://projectmallard.org/1.0/ui/";>
<info>
- <link xref="index" group="default" type="guide"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestPrivateEnum</title>
+<terms>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code></title>
+
+</item>
+<item>
+<title><code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code></title>
+
+</item>
+</terms>
+
</page>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
