[gobject-introspection] tests: Move Annotation into Regress



commit 2df621c53cdffbc3c43c3745947ee859020c8338
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sat Feb 2 11:49:48 2013 -0500

    tests: Move Annotation into Regress
    
    The goal here is to have one master library for testing lots of
    edge cases for GIRs rather than lots of individual libraries.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=693097

 .gitignore                                |    1 -
 tests/scanner/Annotation-1.0-expected.gir |  994 ----------------------------
 tests/scanner/Makefile.am                 |   12 +-
 tests/scanner/Regress-1.0-expected.gir    | 1005 +++++++++++++++++++++++++++++
 tests/scanner/annotation.c                |  372 ++++++------
 tests/scanner/annotation.h                |  152 +++---
 6 files changed, 1268 insertions(+), 1268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d07a66d..7051e4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,6 @@ tests/offsets/gitestoffsets.c
 tests/repository/gitestrepo
 tests/repository/gitestthrows
 tests/repository/gitypelibtest
-tests/scanner/Annotation-1.0.gir
 tests/scanner/Bar-1.0.gir
 tests/scanner/Foo-1.0.gir
 tests/scanner/GetType-1.0.gir
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 2753c50..91ab9a8 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -7,7 +7,6 @@ INTROSPECTION_SCANNER_ARGS += --warn-all
 
 check_LTLIBRARIES = \
 	libsletter.la \
-	libannotation.la \
 	libtestinherit.la \
 	libfoo.la \
 	libutility.la \
@@ -29,13 +28,12 @@ libsletter_la_LIBADD = $(GIO_LIBS)
 libsletter_la_CFLAGS = $(AM_CFLAGS)
 libsletter_la_LDFLAGS = $(AM_LDFLAGS)
 
-libannotation_la_SOURCES = $(srcdir)/annotation.c $(srcdir)/annotation.h
 libtestinherit_la_SOURCES = $(srcdir)/drawable.c $(srcdir)/drawable.h
 libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo.h
 libfoo_la_LIBADD = $(top_builddir)/libgirepository-1.0.la
 libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h
 libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h
-libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h
+libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h $(srcdir)/annotation.c $(srcdir)/annotation.h
 libregress_la_LIBADD = $(GIO_LIBS)
 if HAVE_CAIRO
 libregress_la_LIBADD += $(CAIRO_LIBS)
@@ -97,14 +95,6 @@ WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES)
 WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_
 GIRS += WarnLib-1.0.gir
 
-Annotation-1.0.gir: Utility-1.0.gir libannotation.la
-Annotation_1_0_gir_PACKAGES = gobject-2.0
-Annotation_1_0_gir_LIBS = libannotation.la
-Annotation_1_0_gir_INCLUDES = GObject-2.0 Utility-1.0
-Annotation_1_0_gir_FILES = $(libannotation_la_SOURCES)
-Annotation_1_0_gir_SCANNERFLAGS = --c-include="annotation.h" --warn-error
-GIRS += Annotation-1.0.gir
-
 TestInherit-1.0.gir: Utility-1.0.gir libtestinherit.la
 TestInherit_1_0_gir_PACKAGES = gobject-2.0
 TestInherit_1_0_gir_LIBS = libtestinherit.la
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 4f285eb..61fb07a 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -35,6 +35,24 @@ and/or use gtk-doc annotations.  -->
       <doc xml:whitespace="preserve">Typedef'd va_list for additional reasons</doc>
       <type name="va_list" c:type="va_list"/>
     </alias>
+    <constant name="ANNOTATION_CALCULATED_DEFINE"
+              value="100"
+              c:type="REGRESS_ANNOTATION_CALCULATED_DEFINE">
+      <type name="gint" c:type="gint"/>
+    </constant>
+    <constant name="ANNOTATION_CALCULATED_LARGE"
+              value="10000000000UL"
+              c:type="REGRESS_ANNOTATION_CALCULATED_LARGE"
+              version="1.4">
+      <doc xml:whitespace="preserve">Constant to define a calculated large value</doc>
+      <type name="gint" c:type="gint"/>
+    </constant>
+    <constant name="ANNOTATION_CALCULATED_LARGE_DIV"
+              value="1000000UL"
+              c:type="REGRESS_ANNOTATION_CALCULATED_LARGE_DIV">
+      <doc xml:whitespace="preserve">Constant to define a calculated large value</doc>
+      <type name="gint" c:type="gint"/>
+    </constant>
     <enumeration name="ATestError"
                  c:type="RegressATestError"
                  glib:error-domain="regress-atest-error">
@@ -45,6 +63,779 @@ and/or use gtk-doc annotations.  -->
       <member name="code2" value="2" c:identifier="REGRESS_ATEST_ERROR_CODE2">
       </member>
     </enumeration>
+    <bitfield name="AnnotationBitfield" c:type="RegressAnnotationBitfield">
+      <member name="foo" value="1" c:identifier="ANN_FLAG_FOO">
+      </member>
+      <member name="bar" value="2" c:identifier="ANN_FLAG_BAR">
+      </member>
+    </bitfield>
+    <callback name="AnnotationCallback" c:type="RegressAnnotationCallback">
+      <doc xml:whitespace="preserve">This is a callback.</doc>
+      <return-value transfer-ownership="none">
+        <doc xml:whitespace="preserve">array of ints</doc>
+        <type name="gint" c:type="const gint*"/>
+      </return-value>
+      <parameters>
+        <parameter name="in" transfer-ownership="none">
+          <doc xml:whitespace="preserve">array of ints</doc>
+          <type name="gint" c:type="const gint*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="AnnotationForeachFunc"
+              c:type="RegressAnnotationForeachFunc">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object" transfer-ownership="none">
+          <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+        </parameter>
+        <parameter name="item" transfer-ownership="none">
+          <type name="utf8" c:type="const char*"/>
+        </parameter>
+        <parameter name="user_data" transfer-ownership="none" closure="2">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="AnnotationListCallback"
+              c:type="RegressAnnotationListCallback">
+      <doc xml:whitespace="preserve">This is a callback taking a list.</doc>
+      <return-value transfer-ownership="container">
+        <doc xml:whitespace="preserve">list of strings</doc>
+        <type name="GLib.List" c:type="GList*">
+          <type name="utf8"/>
+        </type>
+      </return-value>
+      <parameters>
+        <parameter name="in" transfer-ownership="none">
+          <doc xml:whitespace="preserve">list of strings</doc>
+          <type name="GLib.List" c:type="GList*">
+            <type name="utf8"/>
+          </type>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="AnnotationNotifyFunc" c:type="RegressAnnotationNotifyFunc">
+      <doc xml:whitespace="preserve">This is a callback with a 'closure' argument that is not named
+'user_data' and hence has to be annotated.</doc>
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data" transfer-ownership="none" closure="0">
+          <doc xml:whitespace="preserve">The user data</doc>
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="AnnotationObject"
+           c:symbol-prefix="annotation_object"
+           c:type="RegressAnnotationObject"
+           parent="GObject.Object"
+           glib:type-name="RegressAnnotationObject"
+           glib:get-type="regress_annotation_object_get_type"
+           glib:type-struct="AnnotationObjectClass">
+      <attribute name="org.example.Test" value="cows"/>
+      <doc xml:whitespace="preserve">This is an object used to test regress_annotations.</doc>
+      <method name="allow_none"
+              c:identifier="regress_annotation_object_allow_none">
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">%NULL always</doc>
+          <type name="GObject.Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="somearg" transfer-ownership="none" allow-none="1">
+            <type name="utf8" c:type="const gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="calleeowns"
+              c:identifier="regress_annotation_object_calleeowns">
+        <doc xml:whitespace="preserve">This is a test for out arguments; GObject defaults to transfer</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="toown"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="GObject.Object" c:type="GObject**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="calleesowns"
+              c:identifier="regress_annotation_object_calleesowns">
+        <doc xml:whitespace="preserve">This is a test for out arguments, one transferred, other not</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="toown1"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="GObject.Object" c:type="GObject**"/>
+          </parameter>
+          <parameter name="toown2"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="GObject.Object" c:type="GObject**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compute_sum"
+              c:identifier="regress_annotation_object_compute_sum">
+        <doc xml:whitespace="preserve">Test taking a zero-terminated array</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="nums" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Sequence of numbers</doc>
+            <array zero-terminated="0" c:type="int*">
+              <type name="gint" c:type="int"/>
+            </array>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compute_sum_n"
+              c:identifier="regress_annotation_object_compute_sum_n">
+        <doc xml:whitespace="preserve">Test taking an array with length parameter</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="nums" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Sequence of numbers that are zero-terminated</doc>
+            <array length="1" zero-terminated="0" c:type="int*">
+              <type name="gint" c:type="int"/>
+            </array>
+          </parameter>
+          <parameter name="n_nums" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Length of number array</doc>
+            <type name="gint" c:type="int"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compute_sum_nz"
+              c:identifier="regress_annotation_object_compute_sum_nz">
+        <doc xml:whitespace="preserve">Test taking a zero-terminated array with length parameter</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="nums" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Sequence of numbers that are zero-terminated</doc>
+            <array length="1" zero-terminated="1" c:type="int*">
+              <type name="gint" c:type="int"/>
+            </array>
+          </parameter>
+          <parameter name="n_nums" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Length of number array</doc>
+            <type name="gint" c:type="int"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_object"
+              c:identifier="regress_annotation_object_create_object">
+        <doc xml:whitespace="preserve">Test returning a caller-owned object</doc>
+        <return-value transfer-ownership="full">
+          <doc xml:whitespace="preserve">The object</doc>
+          <type name="GObject.Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="do_not_use"
+              c:identifier="regress_annotation_object_do_not_use"
+              deprecated="Use regress_annotation_object_create_object() instead."
+              deprecated-version="0.12">
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">%NULL always</doc>
+          <type name="GObject.Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="extra_annos"
+              c:identifier="regress_annotation_object_extra_annos">
+        <attribute name="org.foobar" value="testvalue"/>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="foreach" c:identifier="regress_annotation_object_foreach">
+        <doc xml:whitespace="preserve">Test taking a call-scoped callback</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="func"
+                     transfer-ownership="none"
+                     scope="call"
+                     closure="1">
+            <doc xml:whitespace="preserve">Callback to invoke</doc>
+            <type name="AnnotationForeachFunc"
+                  c:type="RegressAnnotationForeachFunc"/>
+          </parameter>
+          <parameter name="user_data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Callback user data</doc>
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hash"
+              c:identifier="regress_annotation_object_get_hash">
+        <doc xml:whitespace="preserve">This is a test for returning a hash table mapping strings to
+objects.</doc>
+        <return-value transfer-ownership="full">
+          <doc xml:whitespace="preserve">hash table</doc>
+          <type name="GLib.HashTable" c:type="GHashTable*">
+            <type name="utf8"/>
+            <type name="GObject.Object"/>
+          </type>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="get_objects"
+              c:identifier="regress_annotation_object_get_objects">
+        <doc xml:whitespace="preserve">This is a test for returning a list of objects.
+The list itself should be freed, but not the internal objects,
+intentionally similar example to gtk_container_get_children</doc>
+        <return-value transfer-ownership="container">
+          <doc xml:whitespace="preserve">list of objects</doc>
+          <type name="GLib.SList" c:type="GSList*">
+            <type name="AnnotationObject"/>
+          </type>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="get_strings"
+              c:identifier="regress_annotation_object_get_strings">
+        <doc xml:whitespace="preserve">This is a test for returning a list of strings, where
+each string needs to be freed.</doc>
+        <return-value transfer-ownership="full">
+          <doc xml:whitespace="preserve">list of strings</doc>
+          <type name="GLib.List" c:type="GList*">
+            <type name="utf8"/>
+          </type>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="hidden_self"
+              c:identifier="regress_annotation_object_hidden_self">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">A #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="gpointer"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="in" c:identifier="regress_annotation_object_in">
+        <doc xml:whitespace="preserve">This is a test for in arguments</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="inarg" transfer-ownership="none">
+            <doc xml:whitespace="preserve">This is an argument test</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="inout" c:identifier="regress_annotation_object_inout">
+        <doc xml:whitespace="preserve">This is a test for out arguments</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="inoutarg"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">This is an argument test</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="inout2" c:identifier="regress_annotation_object_inout2">
+        <doc xml:whitespace="preserve">This is a second test for out arguments</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="inoutarg"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">This is an argument test</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="inout3" c:identifier="regress_annotation_object_inout3">
+        <doc xml:whitespace="preserve">This is a 3th test for out arguments</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="inoutarg"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full"
+                     allow-none="1">
+            <doc xml:whitespace="preserve">This is an argument test</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="method" c:identifier="regress_annotation_object_method">
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="notrans" c:identifier="regress_annotation_object_notrans">
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">An object, not referenced</doc>
+          <type name="GObject.Object" c:type="GObject*"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <method name="out" c:identifier="regress_annotation_object_out">
+        <doc xml:whitespace="preserve">This is a test for out arguments</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">an int</doc>
+          <type name="gint" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="outarg"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">This is an argument test</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="parse_args"
+              c:identifier="regress_annotation_object_parse_args">
+        <doc xml:whitespace="preserve">Test taking a zero-terminated array with length parameter</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="argc"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">Length of the argument vector</doc>
+            <type name="gint" c:type="int*"/>
+          </parameter>
+          <parameter name="argv"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">Argument vector</doc>
+            <array length="0" zero-terminated="1" c:type="char***">
+              <type name="utf8" c:type="char**"/>
+            </array>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data"
+              c:identifier="regress_annotation_object_set_data">
+        <doc xml:whitespace="preserve">Test taking a guchar * with a length.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">The data</doc>
+            <array length="1" zero-terminated="0" c:type="guchar*">
+              <type name="guint8" c:type="guchar"/>
+            </array>
+          </parameter>
+          <parameter name="length" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Length of the data</doc>
+            <type name="gsize" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data2"
+              c:identifier="regress_annotation_object_set_data2">
+        <doc xml:whitespace="preserve">Test taking a gchar * with a length.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">The data</doc>
+            <array length="1" zero-terminated="0" c:type="gchar*">
+              <type name="gint8"/>
+            </array>
+          </parameter>
+          <parameter name="length" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Length of the data</doc>
+            <type name="gsize" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data3"
+              c:identifier="regress_annotation_object_set_data3">
+        <doc xml:whitespace="preserve">Test taking a gchar * with a length, overriding the array element
+type.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">The data</doc>
+            <array length="1" zero-terminated="0" c:type="gpointer">
+              <type name="guint8"/>
+            </array>
+          </parameter>
+          <parameter name="length" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Length of the data</doc>
+            <type name="gsize" c:type="gsize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="string_out"
+              c:identifier="regress_annotation_object_string_out">
+        <doc xml:whitespace="preserve">Test returning a string as an out parameter</doc>
+        <return-value transfer-ownership="none">
+          <doc xml:whitespace="preserve">some boolean</doc>
+          <type name="gboolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="str_out"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:whitespace="preserve">string return value</doc>
+            <type name="utf8" c:type="char**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="use_buffer"
+              c:identifier="regress_annotation_object_use_buffer">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a #GObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="bytes" transfer-ownership="none">
+            <type name="guint8" c:type="guchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="watch"
+              c:identifier="regress_annotation_object_watch"
+              shadowed-by="watch_full"
+              introspectable="0">
+        <doc xml:whitespace="preserve">This is here just for the sake of being overriden by its
+regress_annotation_object_watch_full().</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">A #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="func" transfer-ownership="none" closure="1">
+            <doc xml:whitespace="preserve">The callback</doc>
+            <type name="AnnotationForeachFunc"
+                  c:type="RegressAnnotationForeachFunc"/>
+          </parameter>
+          <parameter name="user_data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">The callback data</doc>
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="watch_full"
+              c:identifier="regress_annotation_object_watch_full"
+              shadows="watch">
+        <doc xml:whitespace="preserve">Test overriding via the "Rename To" regress_annotation.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <doc xml:whitespace="preserve">A #RegressAnnotationObject</doc>
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="func"
+                     transfer-ownership="none"
+                     scope="notified"
+                     closure="1"
+                     destroy="2">
+            <doc xml:whitespace="preserve">The callback</doc>
+            <type name="AnnotationForeachFunc"
+                  c:type="RegressAnnotationForeachFunc"/>
+          </parameter>
+          <parameter name="user_data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">The callback data</doc>
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy" transfer-ownership="none" scope="async">
+            <doc xml:whitespace="preserve">Destroy notification</doc>
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="with_voidp"
+              c:identifier="regress_annotation_object_with_voidp">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="object" transfer-ownership="none">
+            <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+          </instance-parameter>
+          <parameter name="data" transfer-ownership="none">
+            <doc xml:whitespace="preserve">Opaque pointer handle</doc>
+            <type name="gpointer" c:type="void*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="function-property"
+                writable="1"
+                construct="1"
+                transfer-ownership="none">
+        <type name="AnnotationCallback" c:type="gpointer"/>
+      </property>
+      <property name="string-property"
+                version="1.0"
+                deprecated="Use better-string-property instead"
+                deprecated-version="1.2"
+                writable="1"
+                construct="1"
+                transfer-ownership="none">
+        <doc xml:whitespace="preserve">This is a property which is a string</doc>
+        <type name="utf8" c:type="gchar*"/>
+      </property>
+      <property name="tab-property"
+                version="1.2"
+                writable="1"
+                construct="1"
+                transfer-ownership="none">
+        <doc xml:whitespace="preserve">This is a property regress_annotation intentionally indented with a mix
+of tabs and strings to test the tab handling capabilities of the scanner.</doc>
+        <type name="utf8" c:type="gchar*"/>
+      </property>
+      <field name="parent_instance">
+        <type name="GObject.Object" c:type="GObject"/>
+      </field>
+      <glib:signal name="attribute-signal" when="last">
+        <doc xml:whitespace="preserve">This signal tests a signal with attributes.</doc>
+        <return-value transfer-ownership="full">
+          <attribute name="some.regress_annotation.foo3" value="val3"/>
+          <doc xml:whitespace="preserve">the return value</doc>
+          <type name="utf8" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="arg1" transfer-ownership="none">
+            <attribute name="some.regress_annotation.foo1" value="val1"/>
+            <doc xml:whitespace="preserve">a value</doc>
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+          <parameter name="arg2" transfer-ownership="none">
+            <attribute name="some.regress_annotation.foo2" value="val2"/>
+            <doc xml:whitespace="preserve">another value</doc>
+            <type name="utf8" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="doc-empty-arg-parsing" when="last">
+        <doc xml:whitespace="preserve">This signal tests an empty document argument (@arg1)</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="arg1" transfer-ownership="none">
+            <type name="gpointer" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="list-signal" when="last">
+        <doc xml:whitespace="preserve">This is a signal which takes a list of strings, but it's not
+known by GObject as it's only marked as G_TYPE_POINTER</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list" transfer-ownership="container">
+            <doc xml:whitespace="preserve">a list of strings</doc>
+            <type name="GLib.List" c:type="gpointer">
+              <type name="utf8"/>
+            </type>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="string-signal"
+                   when="last"
+                   version="1.0"
+                   deprecated="Use other-signal instead"
+                   deprecated-version="1.2">
+        <doc xml:whitespace="preserve">This is a signal which has a broken signal handler,
+it says it's pointer but it's actually a string.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="string" transfer-ownership="none">
+            <doc xml:whitespace="preserve">a string</doc>
+            <type name="utf8" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="AnnotationObjectClass"
+            c:type="RegressAnnotationObjectClass"
+            glib:is-gtype-struct-for="AnnotationObject">
+      <field name="parent_class">
+        <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+      </field>
+    </record>
+    <record name="AnnotationStruct" c:type="RegressAnnotationStruct">
+      <doc xml:whitespace="preserve">This is a test of an array of object in an field of a struct.</doc>
+      <field name="objects" writable="1">
+        <array zero-terminated="0"
+               c:type="RegressAnnotationObject"
+               fixed-size="10">
+          <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+        </array>
+      </field>
+    </record>
     <constant name="DOUBLE_CONSTANT"
               value="44.220000"
               c:type="REGRESS_DOUBLE_CONSTANT">
@@ -2000,6 +2791,220 @@ the introspection client langage.</doc>
         </parameter>
       </parameters>
     </function>
+    <function name="annotation_attribute_func"
+              c:identifier="regress_annotation_attribute_func">
+      <return-value transfer-ownership="none">
+        <attribute name="some.other.regress_annotation" value="value2"/>
+        <attribute name="yet.another.regress_annotation"
+                   value="another_value"/>
+        <doc xml:whitespace="preserve">The return value.</doc>
+        <type name="gint" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="object" transfer-ownership="none">
+          <doc xml:whitespace="preserve">A #RegressAnnotationObject.</doc>
+          <type name="AnnotationObject" c:type="RegressAnnotationObject*"/>
+        </parameter>
+        <parameter name="data" transfer-ownership="none">
+          <attribute name="some.regress_annotation" value="value"/>
+          <attribute name="another.regress_annotation" value="blahvalue"/>
+          <doc xml:whitespace="preserve">Some data.</doc>
+          <type name="utf8" c:type="const gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_custom_destroy"
+              c:identifier="regress_annotation_custom_destroy">
+      <doc xml:whitespace="preserve">Test messing up the heuristic of closure/destroy-notification
+detection, and fixing it via regress_annotations.</doc>
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="callback"
+                   transfer-ownership="none"
+                   scope="notified"
+                   closure="2"
+                   destroy="1">
+          <doc xml:whitespace="preserve">Destroy notification</doc>
+          <type name="AnnotationCallback" c:type="RegressAnnotationCallback"/>
+        </parameter>
+        <parameter name="destroy"
+                   transfer-ownership="none"
+                   scope="notified"
+                   closure="2">
+          <type name="AnnotationNotifyFunc"
+                c:type="RegressAnnotationNotifyFunc"/>
+        </parameter>
+        <parameter name="data" transfer-ownership="none">
+          <type name="gpointer" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_get_source_file"
+              c:identifier="regress_annotation_get_source_file">
+      <return-value transfer-ownership="full">
+        <doc xml:whitespace="preserve">Source file</doc>
+        <type name="filename" c:type="char*"/>
+      </return-value>
+    </function>
+    <function name="annotation_init" c:identifier="regress_annotation_init">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc"
+                   direction="inout"
+                   caller-allocates="0"
+                   transfer-ownership="full">
+          <doc xml:whitespace="preserve">The number of args.</doc>
+          <type name="gint" c:type="int*"/>
+        </parameter>
+        <parameter name="argv"
+                   direction="inout"
+                   caller-allocates="0"
+                   transfer-ownership="full">
+          <doc xml:whitespace="preserve">The arguments.</doc>
+          <array length="0" zero-terminated="0" c:type="char***">
+            <type name="utf8" c:type="char**"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_invalid_regress_annotation"
+              c:identifier="regress_annotation_invalid_regress_annotation">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="foo" transfer-ownership="none">
+          <doc xml:whitespace="preserve">some text (e.g. example) or else</doc>
+          <type name="gint" c:type="int"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_ptr_array"
+              c:identifier="regress_annotation_ptr_array"
+              introspectable="0">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="array" transfer-ownership="none">
+          <doc xml:whitespace="preserve">the array</doc>
+          <array name="GLib.PtrArray" c:type="GPtrArray*">
+            <type name="GLib.Value"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_return_array"
+              c:identifier="regress_annotation_return_array">
+      <return-value transfer-ownership="full">
+        <doc xml:whitespace="preserve">The return value</doc>
+        <array length="0" zero-terminated="0" c:type="char**">
+          <type name="utf8"/>
+        </array>
+      </return-value>
+      <parameters>
+        <parameter name="length"
+                   direction="out"
+                   caller-allocates="0"
+                   transfer-ownership="full">
+          <doc xml:whitespace="preserve">Number of return values</doc>
+          <type name="gint" c:type="int*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_return_filename"
+              c:identifier="regress_annotation_return_filename">
+      <return-value transfer-ownership="full">
+        <doc xml:whitespace="preserve">An annotated filename</doc>
+        <type name="filename" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="annotation_set_source_file"
+              c:identifier="regress_annotation_set_source_file">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="fname" transfer-ownership="none">
+          <doc xml:whitespace="preserve">Source file</doc>
+          <type name="filename" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_space_after_comment_bug631690"
+              c:identifier="regress_annotation_space_after_comment_bug631690">
+      <doc xml:whitespace="preserve">Explicitly test having a space after the ** here.</doc>
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="annotation_string_array_length"
+              c:identifier="regress_annotation_string_array_length">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="n_properties" transfer-ownership="none">
+          <type name="guint" c:type="guint"/>
+        </parameter>
+        <parameter name="properties" transfer-ownership="none">
+          <array length="0" zero-terminated="0" c:type="gchar*">
+            <type name="utf8"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_string_zero_terminated"
+              c:identifier="regress_annotation_string_zero_terminated">
+      <return-value transfer-ownership="full">
+        <doc xml:whitespace="preserve">The return value</doc>
+        <array c:type="char**">
+          <type name="utf8"/>
+        </array>
+      </return-value>
+    </function>
+    <function name="annotation_string_zero_terminated_out"
+              c:identifier="regress_annotation_string_zero_terminated_out">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="out"
+                   direction="inout"
+                   caller-allocates="0"
+                   transfer-ownership="full">
+          <array c:type="char***">
+            <type name="utf8" c:type="char**"/>
+          </array>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="annotation_test_parsing_bug630862"
+              c:identifier="regress_annotation_test_parsing_bug630862">
+      <doc xml:whitespace="preserve">See https://bugzilla.gnome.org/show_bug.cgi?id=630862</doc>
+      <return-value transfer-ownership="none">
+        <doc xml:whitespace="preserve">An object, note the colon:in here</doc>
+        <type name="GObject.Object" c:type="GObject*"/>
+      </return-value>
+    </function>
+    <function name="annotation_transfer_floating"
+              c:identifier="regress_annotation_transfer_floating">
+      <return-value transfer-ownership="none">
+        <doc xml:whitespace="preserve">A floating object</doc>
+        <type name="GObject.Object" c:type="GObject*"/>
+      </return-value>
+    </function>
+    <function name="annotation_versioned"
+              c:identifier="regress_annotation_versioned"
+              version="0.6">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
     <function name="atest_error_quark"
               c:identifier="regress_atest_error_quark">
       <return-value transfer-ownership="none">
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index d23239d..1181644 100644
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -3,7 +3,7 @@
 
 char backslash_parsing_tester = '\\';
 
-G_DEFINE_TYPE (AnnotationObject, annotation_object, G_TYPE_OBJECT);
+G_DEFINE_TYPE (RegressAnnotationObject, regress_annotation_object, G_TYPE_OBJECT);
 
 enum {
   PROP_0,
@@ -20,13 +20,13 @@ enum {
   LAST_SIGNAL
 };
 
-static guint annotation_object_signals[LAST_SIGNAL] = { 0 };
+static guint regress_annotation_object_signals[LAST_SIGNAL] = { 0 };
 
 static void
-annotation_object_set_property (GObject         *object,
-                                guint            prop_id,
-                                const GValue    *value,
-                                GParamSpec      *pspec)
+regress_annotation_object_set_property (GObject         *object,
+                                        guint            prop_id,
+                                        const GValue    *value,
+                                        GParamSpec      *pspec)
 {
   switch (prop_id)
     {
@@ -43,10 +43,10 @@ annotation_object_set_property (GObject         *object,
 }
 
 static void
-annotation_object_get_property (GObject         *object,
-                                guint            prop_id,
-                                GValue          *value,
-                                GParamSpec      *pspec)
+regress_annotation_object_get_property (GObject         *object,
+                                        guint            prop_id,
+                                        GValue          *value,
+                                        GParamSpec      *pspec)
 {
   switch (prop_id)
     {
@@ -63,18 +63,18 @@ annotation_object_get_property (GObject         *object,
 }
 
 static void
-annotation_object_class_init (AnnotationObjectClass *klass)
+regress_annotation_object_class_init (RegressAnnotationObjectClass *klass)
 {
   GObjectClass *gobject_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
 
-  gobject_class->set_property = annotation_object_set_property;
-  gobject_class->get_property = annotation_object_get_property;
+  gobject_class->set_property = regress_annotation_object_set_property;
+  gobject_class->get_property = regress_annotation_object_get_property;
 
   /**
-   * AnnotationObject::string-signal:
-   * @annotation: the annotation object
+   * RegressAnnotationObject::string-signal:
+   * @regress_annotation: the regress_annotation object
    * @string: (type utf8): a string
    *
    * This is a signal which has a broken signal handler,
@@ -83,7 +83,7 @@ annotation_object_class_init (AnnotationObjectClass *klass)
    * Since: 1.0
    * Deprecated: 1.2: Use other-signal instead
    */
-  annotation_object_signals[STRING_SIGNAL] =
+  regress_annotation_object_signals[STRING_SIGNAL] =
     g_signal_new ("string-signal",
 		  G_OBJECT_CLASS_TYPE (gobject_class),
 		  G_SIGNAL_RUN_LAST,
@@ -93,14 +93,14 @@ annotation_object_class_init (AnnotationObjectClass *klass)
 		  G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   /**
-   * AnnotationObject::list-signal:
-   * @annotation: the annotation object
+   * RegressAnnotationObject::list-signal:
+   * @regress_annotation: the regress_annotation object
    * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings
    *
    * This is a signal which takes a list of strings, but it's not
    * known by GObject as it's only marked as G_TYPE_POINTER
    */
-  annotation_object_signals[LIST_SIGNAL] =
+  regress_annotation_object_signals[LIST_SIGNAL] =
     g_signal_new ("list-signal",
 		  G_OBJECT_CLASS_TYPE (gobject_class),
 		  G_SIGNAL_RUN_LAST,
@@ -110,13 +110,13 @@ annotation_object_class_init (AnnotationObjectClass *klass)
 		  G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   /**
-   * AnnotationObject::doc-empty-arg-parsing:
-   * @annotation: the annotation object
+   * RegressAnnotationObject::doc-empty-arg-parsing:
+   * @regress_annotation: the regress_annotation object
    * @arg1:
    *
    * This signal tests an empty document argument (@arg1)
    */
-  annotation_object_signals[DOC_EMPTY_ARG_PARSING] =
+  regress_annotation_object_signals[DOC_EMPTY_ARG_PARSING] =
     g_signal_new ("doc-empty-arg-parsing",
 		  G_OBJECT_CLASS_TYPE (gobject_class),
 		  G_SIGNAL_RUN_LAST,
@@ -126,16 +126,16 @@ annotation_object_class_init (AnnotationObjectClass *klass)
 		  G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   /**
-   * AnnotationObject::attribute-signal:
-   * @annotation: the annotation object
-   * @arg1: (attribute some.annotation.foo1 val1): a value
-   * @arg2: (attribute some.annotation.foo2 val2): another value
+   * RegressAnnotationObject::attribute-signal:
+   * @regress_annotation: the regress_annotation object
+   * @arg1: (attribute some.regress_annotation.foo1 val1): a value
+   * @arg2: (attribute some.regress_annotation.foo2 val2): another value
    *
    * This signal tests a signal with attributes.
    *
-   * Returns: (attribute some.annotation.foo3 val3): the return value
+   * Returns: (attribute some.regress_annotation.foo3 val3): the return value
    */
-  annotation_object_signals[ATTRIBUTE_SIGNAL] =
+  regress_annotation_object_signals[ATTRIBUTE_SIGNAL] =
     g_signal_new ("attribute-signal",
 		  G_OBJECT_CLASS_TYPE (gobject_class),
 		  G_SIGNAL_RUN_LAST,
@@ -148,7 +148,7 @@ annotation_object_class_init (AnnotationObjectClass *klass)
                   G_TYPE_STRING);
 
   /**
-   * AnnotationObject:string-property:
+   * RegressAnnotationObject:string-property:
    *
    * This is a property which is a string
    *
@@ -163,9 +163,9 @@ annotation_object_class_init (AnnotationObjectClass *klass)
                                                         NULL,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   /**
-   * AnnotationObject:function-property:
+   * RegressAnnotationObject:function-property:
    *
-   * Type: AnnotationCallback
+   * Type: RegressAnnotationCallback
    */
   g_object_class_install_property (gobject_class,
                                    PROP_FUNCTION_PROPERTY,
@@ -174,14 +174,14 @@ annotation_object_class_init (AnnotationObjectClass *klass)
                                                          "This property is a function pointer",
                                                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
-	  /**
-	   * AnnotationObject:tab-property:
-	   *
-	   * This is a property annotation intentionally indented with a mix
-	   * of tabs and strings to test the tab handling capabilities of the scanner.
-	   *
-	   * Since: 1.2
-	   */
+  /**
+   * RegressAnnotationObject:tab-property:
+   *
+   * This is a property regress_annotation intentionally indented with a mix
+   * of tabs and strings to test the tab handling capabilities of the scanner.
+   *
+   * Since: 1.2
+   */
   g_object_class_install_property (gobject_class,
                                    PROP_TAB_PROPERTY,
                                    g_param_spec_string ("tab-property",
@@ -192,25 +192,25 @@ annotation_object_class_init (AnnotationObjectClass *klass)
 }
 
 static void
-annotation_object_init (AnnotationObject *object)
+regress_annotation_object_init (RegressAnnotationObject *object)
 {
 
 }
 
 /**
- * annotation_object_method:
+ * regress_annotation_object_method:
  * @object: a #GObject
  *
  * Return value: an int
  **/
 gint
-annotation_object_method (AnnotationObject *object)
+regress_annotation_object_method (RegressAnnotationObject *object)
 {
   return 1;
 }
 
 /**
- * annotation_object_out:
+ * regress_annotation_object_out:
  * @object: a #GObject
  * @outarg: (out): This is an argument test
  *
@@ -219,14 +219,14 @@ annotation_object_method (AnnotationObject *object)
  * Return value: an int
  */
 gint
-annotation_object_out (AnnotationObject *object, int *outarg)
+regress_annotation_object_out (RegressAnnotationObject *object, int *outarg)
 {
   *outarg = 2;
   return 1;
 }
 
 /**
- * annotation_object_in:
+ * regress_annotation_object_in:
  * @object: a #GObject
  * @inarg: (in) (transfer none): This is an argument test
  *
@@ -235,14 +235,14 @@ annotation_object_out (AnnotationObject *object, int *outarg)
  * Return value: an int
  */
 gint
-annotation_object_in (AnnotationObject *object, int *inarg)
+regress_annotation_object_in (RegressAnnotationObject *object, int *inarg)
 {
   return *inarg;
 }
 
 
 /**
- * annotation_object_inout:
+ * regress_annotation_object_inout:
  * @object: a #GObject
  * @inoutarg: (inout): This is an argument test
  *
@@ -251,13 +251,13 @@ annotation_object_in (AnnotationObject *object, int *inarg)
  * Return value: an int
  */
 gint
-annotation_object_inout (AnnotationObject *object, int *inoutarg)
+regress_annotation_object_inout (RegressAnnotationObject *object, int *inoutarg)
 {
   return *inoutarg += 1;
 }
 
 /**
- * annotation_object_inout2:
+ * regress_annotation_object_inout2:
  * @object: a #GObject
  * @inoutarg: (inout): This is an argument test
  *
@@ -266,14 +266,14 @@ annotation_object_inout (AnnotationObject *object, int *inoutarg)
  * Return value: an int
  */
 gint
-annotation_object_inout2 (AnnotationObject *object, int *inoutarg)
+regress_annotation_object_inout2 (RegressAnnotationObject *object, int *inoutarg)
 {
   return *inoutarg += 1;
 }
 
 
 /**
- * annotation_object_inout3:
+ * regress_annotation_object_inout3:
  * @object: a #GObject
  * @inoutarg: (inout) (allow-none): This is an argument test
  *
@@ -282,7 +282,7 @@ annotation_object_inout2 (AnnotationObject *object, int *inoutarg)
  * Return value: an int
  */
 gint
-annotation_object_inout3 (AnnotationObject *object, int *inoutarg)
+regress_annotation_object_inout3 (RegressAnnotationObject *object, int *inoutarg)
 {
   if (inoutarg)
     return *inoutarg + 1;
@@ -290,7 +290,7 @@ annotation_object_inout3 (AnnotationObject *object, int *inoutarg)
 }
 
 /**
- * annotation_object_calleeowns:
+ * regress_annotation_object_calleeowns:
  * @object: a #GObject
  * @toown: (out): a #GObject
  *
@@ -299,14 +299,14 @@ annotation_object_inout3 (AnnotationObject *object, int *inoutarg)
  * Return value: an int
  */
 gint
-annotation_object_calleeowns (AnnotationObject *object, GObject **toown)
+regress_annotation_object_calleeowns (RegressAnnotationObject *object, GObject **toown)
 {
   return 1;
 }
 
 
 /**
- * annotation_object_calleesowns:
+ * regress_annotation_object_calleesowns:
  * @object: a #GObject
  * @toown1: (out) (transfer full): a #GObject
  * @toown2: (out) (transfer none): a #GObject
@@ -316,16 +316,16 @@ annotation_object_calleeowns (AnnotationObject *object, GObject **toown)
  * Return value: an int
  */
 gint
-annotation_object_calleesowns (AnnotationObject *object,
-			       GObject **toown1,
-			       GObject **toown2)
+regress_annotation_object_calleesowns (RegressAnnotationObject *object,
+                                       GObject **toown1,
+                                       GObject **toown2)
 {
   return 1;
 }
 
 
 /**
- * annotation_object_get_strings:
+ * regress_annotation_object_get_strings:
  * @object: a #GObject
  *
  * This is a test for returning a list of strings, where
@@ -334,16 +334,16 @@ annotation_object_calleesowns (AnnotationObject *object,
  * Return value: (element-type utf8) (transfer full): list of strings
  */
 GList*
-annotation_object_get_strings (AnnotationObject *object)
+regress_annotation_object_get_strings (RegressAnnotationObject *object)
 {
   GList *list = NULL;
-  list = g_list_prepend (list, g_strdup ("annotation"));
+  list = g_list_prepend (list, g_strdup ("regress_annotation"));
   list = g_list_prepend (list, g_strdup ("bar"));
   return list;
 }
 
 /**
- * annotation_object_get_hash:
+ * regress_annotation_object_get_hash:
  * @object: a #GObject
  *
  * This is a test for returning a hash table mapping strings to
@@ -352,7 +352,7 @@ annotation_object_get_strings (AnnotationObject *object)
  * Return value: (element-type utf8 GObject) (transfer full): hash table
  */
 GHashTable*
-annotation_object_get_hash (AnnotationObject *object)
+regress_annotation_object_get_hash (RegressAnnotationObject *object)
 {
   GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal,
 					    g_free, g_object_unref);
@@ -362,27 +362,27 @@ annotation_object_get_hash (AnnotationObject *object)
 }
 
 /**
- * annotation_object_with_voidp:
+ * regress_annotation_object_with_voidp:
  * @data: Opaque pointer handle
  */
 void
-annotation_object_with_voidp (AnnotationObject *object, void *data)
+regress_annotation_object_with_voidp (RegressAnnotationObject *object, void *data)
 {
 
 }
 
 /**
- * annotation_object_get_objects:
+ * regress_annotation_object_get_objects:
  * @object: a #GObject
  *
  * This is a test for returning a list of objects.
  * The list itself should be freed, but not the internal objects,
  * intentionally similar example to gtk_container_get_children
  *
- * Return value: (element-type AnnotationObject) (transfer container): list of objects
+ * Return value: (element-type RegressAnnotationObject) (transfer container): list of objects
  */
 GSList*
-annotation_object_get_objects (AnnotationObject *object)
+regress_annotation_object_get_objects (RegressAnnotationObject *object)
 {
   GSList *list = NULL;
   list = g_slist_prepend (list, object);
@@ -390,7 +390,7 @@ annotation_object_get_objects (AnnotationObject *object)
 }
 
 /**
- * annotation_object_create_object:
+ * regress_annotation_object_create_object:
  * @object: a #GObject
  *
  * Test returning a caller-owned object
@@ -398,39 +398,39 @@ annotation_object_get_objects (AnnotationObject *object)
  * Return value: (transfer full): The object
  **/
 GObject*
-annotation_object_create_object (AnnotationObject *object)
+regress_annotation_object_create_object (RegressAnnotationObject *object)
 {
-	return g_object_ref (object);
+  return g_object_ref (object);
 }
 
 /**
- * annotation_object_use_buffer:
+ * regress_annotation_object_use_buffer:
  * @object: a #GObject
  *
  **/
 void
-annotation_object_use_buffer   (AnnotationObject *object,
-				guchar           *bytes)
+regress_annotation_object_use_buffer   (RegressAnnotationObject *object,
+                                        guchar           *bytes)
 {
 
 }
 
 /**
- * annotation_object_compute_sum:
+ * regress_annotation_object_compute_sum:
  * @object: a #GObject
  * @nums: (array): Sequence of numbers
  *
  * Test taking a zero-terminated array
  **/
 void
-annotation_object_compute_sum  (AnnotationObject *object,
-				int              *nums)
+regress_annotation_object_compute_sum  (RegressAnnotationObject *object,
+                                        int              *nums)
 {
 
 }
 
 /**
- * annotation_object_compute_sum_n:
+ * regress_annotation_object_compute_sum_n:
  * @object: a #GObject
  * @nums: (array length=n_nums zero-terminated=0): Sequence of
  *   numbers that are zero-terminated
@@ -439,16 +439,16 @@ annotation_object_compute_sum  (AnnotationObject *object,
  * Test taking an array with length parameter
  **/
 void
-annotation_object_compute_sum_n(AnnotationObject *object,
-				int              *nums,
-				int               n_nums)
+regress_annotation_object_compute_sum_n(RegressAnnotationObject *object,
+                                        int              *nums,
+                                        int               n_nums)
 {
 
 }
 
 /**
- * annotation_object_compute_sum_nz:
- * @object: a #AnnotationObject
+ * regress_annotation_object_compute_sum_nz:
+ * @object: a #RegressAnnotationObject
  * @nums: (array length=n_nums zero-terminated=1): Sequence of numbers that
  * are zero-terminated
  * @n_nums: Length of number array
@@ -456,32 +456,32 @@ annotation_object_compute_sum_n(AnnotationObject *object,
  * Test taking a zero-terminated array with length parameter
  **/
 void
-annotation_object_compute_sum_nz(AnnotationObject *object,
-                                 int             *nums,
-                                 int              n_nums)
+regress_annotation_object_compute_sum_nz(RegressAnnotationObject *object,
+                                         int             *nums,
+                                         int              n_nums)
 {
 
 }
 
 /**
- * annotation_object_parse_args:
- * @object: a #AnnotationObject
+ * regress_annotation_object_parse_args:
+ * @object: a #RegressAnnotationObject
  * @argc: (inout): Length of the argument vector
  * @argv: (inout) (array length=argc zero-terminated=1): Argument vector
  *
  * Test taking a zero-terminated array with length parameter
  **/
 void
-annotation_object_parse_args(AnnotationObject *object,
-                             int              *argc,
-                             char           ***argv)
+regress_annotation_object_parse_args(RegressAnnotationObject *object,
+                                     int              *argc,
+                                     char           ***argv)
 {
 
 }
 
 /**
- * annotation_object_string_out:
- * @object: a #AnnotationObject
+ * regress_annotation_object_string_out:
+ * @object: a #RegressAnnotationObject
  * @str_out: (out) (transfer full): string return value
  *
  * Test returning a string as an out parameter
@@ -489,63 +489,63 @@ annotation_object_parse_args(AnnotationObject *object,
  * Returns: some boolean
  **/
 gboolean
-annotation_object_string_out(AnnotationObject *object,
-                             char            **str_out)
+regress_annotation_object_string_out(RegressAnnotationObject *object,
+                                     char            **str_out)
 {
   return FALSE;
 }
 
 /**
- * annotation_object_foreach:
- * @object: a #AnnotationObject
+ * regress_annotation_object_foreach:
+ * @object: a #RegressAnnotationObject
  * @func: (scope call): Callback to invoke
  * @user_data: Callback user data
  *
  * Test taking a call-scoped callback
  **/
 void
-annotation_object_foreach (AnnotationObject *object,
-                           AnnotationForeachFunc func,
-                           gpointer user_data)
+regress_annotation_object_foreach (RegressAnnotationObject *object,
+                                   RegressAnnotationForeachFunc func,
+                                   gpointer user_data)
 {
-  
+
 }
 
 /**
- * annotation_object_set_data:
- * @object: a #AnnotationObject
+ * regress_annotation_object_set_data:
+ * @object: a #RegressAnnotationObject
  * @data: (array length=length): The data
  * @length: Length of the data
  *
  * Test taking a guchar * with a length.
  **/
 void
-annotation_object_set_data (AnnotationObject *object,
-                            const guchar *data,
-                            gsize length)
+regress_annotation_object_set_data (RegressAnnotationObject *object,
+                                    const guchar *data,
+                                    gsize length)
 {
-  
+
 }
 
 /**
- * annotation_object_set_data2:
- * @object: a #AnnotationObject
+ * regress_annotation_object_set_data2:
+ * @object: a #RegressAnnotationObject
  * @data: (array length=length) (element-type gint8): The data
  * @length: Length of the data
  *
  * Test taking a gchar * with a length.
  **/
 void
-annotation_object_set_data2 (AnnotationObject *object,
-                             const gchar *data,
-                             gsize length)
+regress_annotation_object_set_data2 (RegressAnnotationObject *object,
+                                     const gchar *data,
+                                     gsize length)
 {
-  
+
 }
 
 /**
- * annotation_object_set_data3:
- * @object: a #AnnotationObject
+ * regress_annotation_object_set_data3:
+ * @object: a #RegressAnnotationObject
  * @data: (array length=length) (element-type guint8): The data
  * @length: Length of the data
  *
@@ -553,233 +553,233 @@ annotation_object_set_data2 (AnnotationObject *object,
  * type.
  **/
 void
-annotation_object_set_data3 (AnnotationObject *object,
-                             gpointer data,
-                             gsize length)
+regress_annotation_object_set_data3 (RegressAnnotationObject *object,
+                                     gpointer data,
+                                     gsize length)
 {
-  
+
 }
 
 /**
- * annotation_object_allow_none:
+ * regress_annotation_object_allow_none:
  * @object: a #GObject
  * @somearg: (allow-none):
  *
  * Returns: (transfer none): %NULL always
  **/
 GObject*
-annotation_object_allow_none (AnnotationObject *object, const gchar *somearg)
+regress_annotation_object_allow_none (RegressAnnotationObject *object, const gchar *somearg)
 {
   return NULL;
 }
 
 /**
- * annotation_object_notrans:
+ * regress_annotation_object_notrans:
  * @object: a #GObject
  *
  * Returns: (transfer none): An object, not referenced
  **/
 
 GObject*
-annotation_object_notrans (AnnotationObject *object)
+regress_annotation_object_notrans (RegressAnnotationObject *object)
 {
   return NULL;
 }
 
 /**
- * annotation_object_do_not_use:
+ * regress_annotation_object_do_not_use:
  * @object: a #GObject
  *
  * Returns: (transfer none): %NULL always
- * Deprecated: 0.12: Use annotation_object_create_object() instead.
+ * Deprecated: 0.12: Use regress_annotation_object_create_object() instead.
  **/
 GObject*
-annotation_object_do_not_use (AnnotationObject *object)
+regress_annotation_object_do_not_use (RegressAnnotationObject *object)
 {
   return NULL;
 }
 
 /**
- * annotation_object_watch: (skip)
- * @object: A #AnnotationObject
+ * regress_annotation_object_watch: (skip)
+ * @object: A #RegressAnnotationObject
  * @func: The callback
  * @user_data: The callback data
  *
  * This is here just for the sake of being overriden by its
- * annotation_object_watch_full().
+ * regress_annotation_object_watch_full().
  */
 void
-annotation_object_watch (AnnotationObject *object,
-                         AnnotationForeachFunc func,
-                         gpointer user_data)
+regress_annotation_object_watch (RegressAnnotationObject *object,
+                                 RegressAnnotationForeachFunc func,
+                                 gpointer user_data)
 {
 }
 
 /**
- * annotation_object_watch_full:
- * @object: A #AnnotationObject
+ * regress_annotation_object_watch_full:
+ * @object: A #RegressAnnotationObject
  * @func: The callback
  * @user_data: The callback data
  * @destroy: Destroy notification
  *
- * Test overriding via the "Rename To" annotation.
+ * Test overriding via the "Rename To" regress_annotation.
  *
- * Rename to: annotation_object_watch
+ * Rename to: regress_annotation_object_watch
  */
 void
-annotation_object_watch_full (AnnotationObject *object,
-                              AnnotationForeachFunc func,
-                              gpointer user_data,
-                              GDestroyNotify destroy)
+regress_annotation_object_watch_full (RegressAnnotationObject *object,
+                                      RegressAnnotationForeachFunc func,
+                                      gpointer user_data,
+                                      GDestroyNotify destroy)
 {
 }
 
 /**
- * annotation_object_hidden_self:
- * @object: (type AnnotationObject): A #AnnotationObject
+ * regress_annotation_object_hidden_self:
+ * @object: (type RegressAnnotationObject): A #RegressAnnotationObject
  **/
 void
-annotation_object_hidden_self (gpointer object)
+regress_annotation_object_hidden_self (gpointer object)
 {
 }
 
 /**
- * annotation_init:
- * @argc: (inout): The number of args. 
+ * regress_annotation_init:
+ * @argc: (inout): The number of args.
  * @argv: (inout) (array length=argc): The arguments.
  **/
 void
-annotation_init (int *argc, char ***argv)
+regress_annotation_init (int *argc, char ***argv)
 {
 
 }
 
 /**
- * annotation_return_array:
+ * regress_annotation_return_array:
  * @length: (out): Number of return values
  *
  * Return value: (transfer full) (array length=length): The return value
  **/
 char **
-annotation_return_array (int *length)
+regress_annotation_return_array (int *length)
 {
   return NULL;
 }
 
 /**
- * annotation_string_zero_terminated:
+ * regress_annotation_string_zero_terminated:
  *
  * Return value: (transfer full) (array zero-terminated=1): The return value
  **/
 char **
-annotation_string_zero_terminated (void)
+regress_annotation_string_zero_terminated (void)
 {
   return NULL;
 }
 
 /**
- * annotation_string_zero_terminated_out:
+ * regress_annotation_string_zero_terminated_out:
  * @out: (array zero-terminated=1) (inout):
  **/
 void
-annotation_string_zero_terminated_out (char ***out)
+regress_annotation_string_zero_terminated_out (char ***out)
 {
 }
 
 /**
- * annotation_versioned:
+ * regress_annotation_versioned:
  *
  * Since: 0.6
  **/
 void
-annotation_versioned (void)
+regress_annotation_versioned (void)
 {
 }
 
 /**
- * annotation_string_array_length:
+ * regress_annotation_string_array_length:
  * @n_properties:
  * @properties: (array length=n_properties) (element-type utf8):
  */
 void
-annotation_string_array_length (guint n_properties, const gchar * const properties[])
+regress_annotation_string_array_length (guint n_properties, const gchar * const properties[])
 {
 }
 
 /**
- * annotation_object_extra_annos:
+ * regress_annotation_object_extra_annos:
  *
  * Attributes: (org.foobar testvalue)
  */
 void
-annotation_object_extra_annos (AnnotationObject *object)
+regress_annotation_object_extra_annos (RegressAnnotationObject *object)
 {
 }
 
 /**
- * annotation_custom_destroy:
+ * regress_annotation_custom_destroy:
  * @callback: (destroy destroy) (closure data): Destroy notification
  *
  * Test messing up the heuristic of closure/destroy-notification
- * detection, and fixing it via annotations.
+ * detection, and fixing it via regress_annotations.
  */
 void
-annotation_custom_destroy (AnnotationCallback callback,
-                           AnnotationNotifyFunc destroy,
-                           gpointer data)
+regress_annotation_custom_destroy (RegressAnnotationCallback callback,
+                                   RegressAnnotationNotifyFunc destroy,
+                                   gpointer data)
 {
 }
 
 /**
- * annotation_get_source_file:
+ * regress_annotation_get_source_file:
  *
  * Return value: (type filename) (transfer full): Source file
  */
 char *
-annotation_get_source_file (void)
+regress_annotation_get_source_file (void)
 {
   return NULL;
 }
 
 /**
- * annotation_set_source_file:
+ * regress_annotation_set_source_file:
  * @fname: (type filename): Source file
  *
  */
 void
-annotation_set_source_file (const char *fname)
+regress_annotation_set_source_file (const char *fname)
 {
 }
 
 /**
- * annotation_ptr_array:
+ * regress_annotation_ptr_array:
  * @array: (element-type GLib.Value): the array
  */
 void
-annotation_ptr_array (GPtrArray *array)
+regress_annotation_ptr_array (GPtrArray *array)
 {
 }
 
 /**
- * annotation_attribute_func:
- * @object: A #AnnotationObject.
- * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data.
+ * regress_annotation_attribute_func:
+ * @object: A #RegressAnnotationObject.
+ * @data: (attribute some.regress_annotation value) (attribute another.regress_annotation blahvalue): Some data.
  *
- * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value.
+ * Returns: (attribute some.other.regress_annotation value2) (attribute yet.another.regress_annotation another_value): The return value.
  */
 gint
-annotation_attribute_func (AnnotationObject *object,
-                           const gchar      *data)
+regress_annotation_attribute_func (RegressAnnotationObject *object,
+                                   const gchar      *data)
 {
   return 42;
 }
 
 /**
- * annotation_invalid_annotation:
+ * regress_annotation_invalid_regress_annotation:
  * @foo: some text (e.g. example) or else
  */
 void
-annotation_invalid_annotation (int foo)
+regress_annotation_invalid_regress_annotation (int foo)
 {
 
 }
@@ -789,47 +789,47 @@ char backslash_parsing_tester_2 = '\\';
 
 
 /**
- * annotation_test_parsing_bug630862:
+ * regress_annotation_test_parsing_bug630862:
  *
  * See https://bugzilla.gnome.org/show_bug.cgi?id=630862
  *
  * Returns: (transfer none): An object, note the colon:in here
  */
 GObject  *
-annotation_test_parsing_bug630862 (void)
+regress_annotation_test_parsing_bug630862 (void)
 {
   return NULL;
 }
 
 
-/** 
- * annotation_space_after_comment_bug631690:
+/**
+ * regress_annotation_space_after_comment_bug631690:
  *
  * Explicitly test having a space after the ** here.
  */
 void
-annotation_space_after_comment_bug631690 (void)
+regress_annotation_space_after_comment_bug631690 (void)
 {
 }
 
 /**
- * annotation_return_filename:
+ * regress_annotation_return_filename:
  *
  * Returns: (type filename): An annotated filename
  */
 gchar*
-annotation_return_filename (void)
+regress_annotation_return_filename (void)
 {
   return "a utf-8 filename";
 }
 
 /**
- * annotation_transfer_floating:
+ * regress_annotation_transfer_floating:
  *
  * Returns: (transfer floating): A floating object
  */
 GObject *
-annotation_transfer_floating(void)
+regress_annotation_transfer_floating(void)
 {
   return NULL;
 }
diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h
index 09d4f4f..154b0d8 100644
--- a/tests/scanner/annotation.h
+++ b/tests/scanner/annotation.h
@@ -1,5 +1,5 @@
-#ifndef __ANNOTATION_OBJECT_H__
-#define __ANNOTATION_OBJECT_H__
+#ifndef __REGRESS_ANNOTATION_OBJECT_H__
+#define __REGRESS_ANNOTATION_OBJECT_H__
 
 #include <glib-object.h>
 
@@ -7,175 +7,175 @@ typedef enum /*< flags,prefix=ANN >*/
 {
   ANN_FLAG_FOO = 1,
   ANN_FLAG_BAR = 2
-} AnnotationBitfield;
+} RegressAnnotationBitfield;
 
 /**
- * AnnotationCallback:
+ * RegressAnnotationCallback:
  * @in: (in) (transfer none): array of ints
  *
  * This is a callback.
  * Return value: (transfer none): array of ints
  */
-typedef const gint* (*AnnotationCallback) (const gint *in);
+typedef const gint* (*RegressAnnotationCallback) (const gint *in);
 
 /**
- * AnnotationListCallback:
+ * RegressAnnotationListCallback:
  * @in: (in) (transfer none) (element-type utf8): list of strings
  *
  * This is a callback taking a list.
  * Return value: (transfer container) (element-type utf8): list of strings
  */
-typedef GList* (*AnnotationListCallback) (GList *in);
+typedef GList* (*RegressAnnotationListCallback) (GList *in);
 
 /**
- * AnnotationNotifyFunc:
+ * RegressAnnotationNotifyFunc:
  * @data: (closure): The user data
  *
  * This is a callback with a 'closure' argument that is not named
  * 'user_data' and hence has to be annotated.
  */
-typedef void (*AnnotationNotifyFunc) (gpointer data);
+typedef void (*RegressAnnotationNotifyFunc) (gpointer data);
 
 /**
- * AnnotationObject:
+ * RegressAnnotationObject:
  *
- * This is an object used to test annotations.
+ * This is an object used to test regress_annotations.
  *
  * Attributes: (org.example.Test cows)
  */
-typedef struct _AnnotationObject          AnnotationObject;
-typedef struct _AnnotationObjectClass     AnnotationObjectClass;
+typedef struct _RegressAnnotationObject          RegressAnnotationObject;
+typedef struct _RegressAnnotationObjectClass     RegressAnnotationObjectClass;
 
-typedef void (*AnnotationForeachFunc) (AnnotationObject *object,
+typedef void (*RegressAnnotationForeachFunc) (RegressAnnotationObject *object,
                                        const char *item,
                                        gpointer user_data);
 
-struct _AnnotationObject
+struct _RegressAnnotationObject
 {
   GObject parent_instance;
 };
 
-struct _AnnotationObjectClass
+struct _RegressAnnotationObjectClass
 {
   GObjectClass parent_class;
 };
 
-GType    annotation_object_get_type (void);
+GType    regress_annotation_object_get_type (void);
 
-gint     annotation_object_method       (AnnotationObject *object);
-gint     annotation_object_out          (AnnotationObject *object,
+gint     regress_annotation_object_method       (RegressAnnotationObject *object);
+gint     regress_annotation_object_out          (RegressAnnotationObject *object,
 					 int              *outarg);
-GObject* annotation_object_create_object(AnnotationObject *object);
-GObject* annotation_object_allow_none   (AnnotationObject *object,
+GObject* regress_annotation_object_create_object(RegressAnnotationObject *object);
+GObject* regress_annotation_object_allow_none   (RegressAnnotationObject *object,
 					 const gchar      *somearg);
-GObject* annotation_object_notrans      (AnnotationObject *object);
-gint     annotation_object_inout        (AnnotationObject *object,
+GObject* regress_annotation_object_notrans      (RegressAnnotationObject *object);
+gint     regress_annotation_object_inout        (RegressAnnotationObject *object,
 					 int              *inoutarg);
-gint     annotation_object_inout2       (AnnotationObject *object,
+gint     regress_annotation_object_inout2       (RegressAnnotationObject *object,
 					 int              *inoutarg);
-gint     annotation_object_inout3       (AnnotationObject *object,
+gint     regress_annotation_object_inout3       (RegressAnnotationObject *object,
 					 int              *inoutarg);
-gint     annotation_object_in           (AnnotationObject *object,
+gint     regress_annotation_object_in           (RegressAnnotationObject *object,
 					 int              *inarg);
-gint     annotation_object_calleeowns   (AnnotationObject *object,
+gint     regress_annotation_object_calleeowns   (RegressAnnotationObject *object,
 					 GObject          **toown);
-gint     annotation_object_calleesowns  (AnnotationObject *object,
+gint     regress_annotation_object_calleesowns  (RegressAnnotationObject *object,
 					 GObject          **toown1,
 					 GObject          **toown2);
-GList*   annotation_object_get_strings  (AnnotationObject *object);
-GHashTable*annotation_object_get_hash   (AnnotationObject *object);
-void     annotation_object_with_voidp   (AnnotationObject *object,
+GList*   regress_annotation_object_get_strings  (RegressAnnotationObject *object);
+GHashTable*regress_annotation_object_get_hash   (RegressAnnotationObject *object);
+void     regress_annotation_object_with_voidp   (RegressAnnotationObject *object,
 					 void             *data);
-GSList*  annotation_object_get_objects  (AnnotationObject *object);
+GSList*  regress_annotation_object_get_objects  (RegressAnnotationObject *object);
 
-void     annotation_object_use_buffer   (AnnotationObject *object,
+void     regress_annotation_object_use_buffer   (RegressAnnotationObject *object,
 					 guchar           *bytes);
 
-void     annotation_object_compute_sum  (AnnotationObject *object,
+void     regress_annotation_object_compute_sum  (RegressAnnotationObject *object,
 					 int              *nums);
 
-void     annotation_object_compute_sum_n(AnnotationObject *object,
+void     regress_annotation_object_compute_sum_n(RegressAnnotationObject *object,
 					 int              *nums,
 					 int               n_nums);
-void     annotation_object_compute_sum_nz(AnnotationObject *object,
+void     regress_annotation_object_compute_sum_nz(RegressAnnotationObject *object,
                                           int             *nums,
                                           int              n_nums);
-void     annotation_object_parse_args   (AnnotationObject *object,
+void     regress_annotation_object_parse_args   (RegressAnnotationObject *object,
                                          int              *argc,
                                          char           ***argv);
-gboolean annotation_object_string_out   (AnnotationObject *object,
+gboolean regress_annotation_object_string_out   (RegressAnnotationObject *object,
                                          char            **str_out);
-void     annotation_object_foreach      (AnnotationObject *object,
-                                         AnnotationForeachFunc func,
+void     regress_annotation_object_foreach      (RegressAnnotationObject *object,
+                                         RegressAnnotationForeachFunc func,
                                          gpointer user_data);
 
-void     annotation_object_set_data     (AnnotationObject *object,
+void     regress_annotation_object_set_data     (RegressAnnotationObject *object,
                                          const guchar     *data,
                                          gsize             length);
-void     annotation_object_set_data2    (AnnotationObject *object,
+void     regress_annotation_object_set_data2    (RegressAnnotationObject *object,
                                          const gchar      *data,
                                          gsize             length);
-void     annotation_object_set_data3    (AnnotationObject *object,
+void     regress_annotation_object_set_data3    (RegressAnnotationObject *object,
                                          gpointer          data,
                                          gsize             length);
 
-GObject* annotation_object_do_not_use   (AnnotationObject *object);
-void     annotation_object_watch        (AnnotationObject *object,
-                                         AnnotationForeachFunc func,
+GObject* regress_annotation_object_do_not_use   (RegressAnnotationObject *object);
+void     regress_annotation_object_watch        (RegressAnnotationObject *object,
+                                         RegressAnnotationForeachFunc func,
                                          gpointer user_data);
-void     annotation_object_watch_full   (AnnotationObject *object,
-                                         AnnotationForeachFunc func,
+void     regress_annotation_object_watch_full   (RegressAnnotationObject *object,
+                                         RegressAnnotationForeachFunc func,
                                          gpointer user_data,
                                          GDestroyNotify destroy);
-void     annotation_object_hidden_self  (gpointer object);
+void     regress_annotation_object_hidden_self  (gpointer object);
 
-void     annotation_init                (int              *argc, 
+void     regress_annotation_init                (int              *argc, 
 					 char           ***argv);
-char **  annotation_return_array        (int             *length);
-void     annotation_versioned           (void);
-char **  annotation_string_zero_terminated (void);
-void     annotation_string_zero_terminated_out (char ***out);
+char **  regress_annotation_return_array        (int             *length);
+void     regress_annotation_versioned           (void);
+char **  regress_annotation_string_zero_terminated (void);
+void     regress_annotation_string_zero_terminated_out (char ***out);
 
-void     annotation_string_array_length (guint n_properties, const gchar * const properties[]);
+void     regress_annotation_string_array_length (guint n_properties, const gchar * const properties[]);
 
-void     annotation_object_extra_annos (AnnotationObject *object);
+void     regress_annotation_object_extra_annos (RegressAnnotationObject *object);
 
-void     annotation_custom_destroy (AnnotationCallback callback,
-                                    AnnotationNotifyFunc destroy,
+void     regress_annotation_custom_destroy (RegressAnnotationCallback callback,
+                                    RegressAnnotationNotifyFunc destroy,
                                     gpointer data);
-char *   annotation_get_source_file (void);
-void     annotation_set_source_file (const char *fname);
+char *   regress_annotation_get_source_file (void);
+void     regress_annotation_set_source_file (const char *fname);
 
-gint     annotation_attribute_func (AnnotationObject *object,
+gint     regress_annotation_attribute_func (RegressAnnotationObject *object,
                                     const gchar      *data);
 
-void     annotation_invalid_annotation (int foo);
+void     regress_annotation_invalid_regress_annotation (int foo);
 
 /**
- * AnnotationStruct:
+ * RegressAnnotationStruct:
  *
  * This is a test of an array of object in an field of a struct.
  */
-struct AnnotationStruct
+struct RegressAnnotationStruct
 {
-  AnnotationObject *objects[10];
+  RegressAnnotationObject *objects[10];
 };
 
-void    annotation_ptr_array (GPtrArray *array);
+void    regress_annotation_ptr_array (GPtrArray *array);
 
-GObject  * annotation_test_parsing_bug630862 (void);
+GObject  * regress_annotation_test_parsing_bug630862 (void);
 
-void annotation_space_after_comment_bug631690 (void);
+void regress_annotation_space_after_comment_bug631690 (void);
 
-gchar* annotation_return_filename (void);
+gchar* regress_annotation_return_filename (void);
 
-GObject * annotation_transfer_floating(void);
+GObject * regress_annotation_transfer_floating(void);
 
 /* This one we can handle properly */
-#define ANNOTATION_CALCULATED_DEFINE (10 * 10)
+#define REGRESS_ANNOTATION_CALCULATED_DEFINE (10 * 10)
 
 /**
- * ANNOTATION_CALCULATED_LARGE:
+ * REGRESS_ANNOTATION_CALCULATED_LARGE:
  *
  * Constant to define a calculated large value
  *
@@ -183,16 +183,16 @@ GObject * annotation_transfer_floating(void);
  *
  * Since: 1.4
  */
-#define ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000))
+#define REGRESS_ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000))
 
 /**
- * ANNOTATION_CALCULATED_LARGE_DIV:
+ * REGRESS_ANNOTATION_CALCULATED_LARGE_DIV:
  *
  * Constant to define a calculated large value
  *
  * Value: 1000000UL
  */
-#define ANNOTATION_CALCULATED_LARGE_DIV (1000 / G_GINT64_CONSTANT (10000000))
+#define REGRESS_ANNOTATION_CALCULATED_LARGE_DIV (1000 / G_GINT64_CONSTANT (10000000))
 
-#endif /* __ANNOTATION_OBJECT_H__ */
+#endif /* __REGRESS_ANNOTATION_OBJECT_H__ */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]