diff options
author | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2019-01-05 00:00:00 +0000 |
---|---|---|
committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2019-01-05 17:22:30 +0100 |
commit | aec1c5a3c1206c26c4d0e553558f40ac8a81b68c (patch) | |
tree | 4b064fc5dc7a44110d2f577b0eb7de1f6cf07ec1 /tests | |
parent | ca4f195684a65f09b2367029f66fa7694e515708 (diff) | |
download | gobject-introspection-aec1c5a3c1206c26c4d0e553558f40ac8a81b68c.tar.gz |
scanner: Merge basic types in `specifier_qualifier_list` production.
This is necessary to parse types like `unsigned char` or `long double`,
and is already done when parsing `declarations_specifiers`. Examples
that are fixed by this change include:
* `GLib.TestLogMsg.nums` previously parsed as `long` but should be `long
double`.
* `GMime.Encoding.uubuf` previously parsed as `unsigned` but should be
`unsigned char`.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/offsets/gitestoffsets.c | 5 | ||||
-rw-r--r-- | tests/offsets/offsets.h | 5 | ||||
-rw-r--r-- | tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data7.page | 14 | ||||
-rw-r--r-- | tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data7.page | 18 | ||||
-rw-r--r-- | tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page | 1 | ||||
-rw-r--r-- | tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data7.page | 14 | ||||
-rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 373 | ||||
-rw-r--r-- | tests/scanner/regress.h | 1 |
8 files changed, 246 insertions, 185 deletions
diff --git a/tests/offsets/gitestoffsets.c b/tests/offsets/gitestoffsets.c index 538f3216..9ce673e9 100644 --- a/tests/offsets/gitestoffsets.c +++ b/tests/offsets/gitestoffsets.c @@ -109,6 +109,11 @@ compiled (FILE *outfile) PRINT_MEMBER (OffsetsBasic, field_double); PRINT_MEMBER (OffsetsBasic, dummy8); PRINT_MEMBER (OffsetsBasic, field_size); + PRINT_MEMBER (OffsetsBasic, dummy9); + PRINT_MEMBER (OffsetsBasic, field_uchar1); + PRINT_MEMBER (OffsetsBasic, dummy10); + PRINT_MEMBER (OffsetsBasic, field_uchar2); + PRINT_MEMBER (OffsetsBasic, dummy11); g_fprintf (outfile, "\n"); PRINT_TYPE (OffsetsEnum); diff --git a/tests/offsets/offsets.h b/tests/offsets/offsets.h index 10485327..658601f5 100644 --- a/tests/offsets/offsets.h +++ b/tests/offsets/offsets.h @@ -30,6 +30,11 @@ struct _OffsetsBasic { gdouble field_double; char dummy8; gsize field_size; + char dummy9; + guchar field_uchar1; + char dummy10; + unsigned char field_uchar2; + char dummy11; }; typedef enum { diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data7.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data7.page new file mode 100644 index 00000000..644c4c62 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data7.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data7" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data7</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data7.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data7.page new file mode 100644 index 00000000..4b6c0da0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data7.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data7" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data7</title> + </info> + <title>Regress.TestStructF.data7</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data7: Number(guint8) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page index feae9a2c..41a82305 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page @@ -20,6 +20,7 @@ let testStructF = new Regress.TestStructF({ <link xref='Regress.TestStructF-data4'>data4</link>: value <link xref='Regress.TestStructF-data5'>data5</link>: value <link xref='Regress.TestStructF-data6'>data6</link>: value + <link xref='Regress.TestStructF-data7'>data7</link>: value }); </code></synopsis> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data7.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data7.page new file mode 100644 index 00000000..644c4c62 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data7.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data7" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data7</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 9236f9ab..55a910b3 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -18,8 +18,8 @@ and/or use gtk-doc annotations. --> <alias name="AliasedTestBoxed" c:type="RegressAliasedTestBoxed"> <doc xml:space="preserve" filename="regress.h" - line="1374">Typedef TestBoxed to test caller-allocates correctness</doc> - <source-position filename="regress.h" line="1379"/> + line="1375">Typedef TestBoxed to test caller-allocates correctness</doc> + <source-position filename="regress.h" line="1380"/> <type name="TestBoxed" c:type="RegressTestBoxed"/> </alias> <alias name="FooObjectCookie" c:type="RegressFooObjectCookie"> @@ -33,15 +33,15 @@ and/or use gtk-doc annotations. --> <alias name="IntsetAlias" c:type="RegressIntsetAlias" introspectable="0"> <doc xml:space="preserve" filename="regress.h" - line="1344">Compatibility typedef, like telepathy-glib's TpIntSet</doc> - <source-position filename="regress.h" line="1350"/> + line="1345">Compatibility typedef, like telepathy-glib's TpIntSet</doc> + <source-position filename="regress.h" line="1351"/> <type name="Intset" c:type="RegressIntset"/> </alias> <alias name="PtrArrayAlias" c:type="RegressPtrArrayAlias"> <doc xml:space="preserve" filename="regress.h" - line="1352">Typedef'd GPtrArray for some reason</doc> - <source-position filename="regress.h" line="1357"/> + line="1353">Typedef'd GPtrArray for some reason</doc> + <source-position filename="regress.h" line="1358"/> <type name="GLib.PtrArray" c:type="GPtrArray"/> </alias> <alias name="TestTypeGUInt64" c:type="RegressTestTypeGUInt64"> @@ -51,8 +51,8 @@ and/or use gtk-doc annotations. --> <alias name="VaListAlias" c:type="RegressVaListAlias" introspectable="0"> <doc xml:space="preserve" filename="regress.h" - line="1363">Typedef'd va_list for additional reasons</doc> - <source-position filename="regress.h" line="1368"/> + line="1364">Typedef'd va_list for additional reasons</doc> + <source-position filename="regress.h" line="1369"/> <type name="va_list" c:type="va_list"/> </alias> <constant name="ANNOTATION_CALCULATED_DEFINE" @@ -92,12 +92,12 @@ and/or use gtk-doc annotations. --> </member> </enumeration> <record name="AnAnonymousUnion" c:type="RegressAnAnonymousUnion"> - <source-position filename="regress.h" line="1480"/> + <source-position filename="regress.h" line="1481"/> <field name="x" writable="1"> <type name="gint" c:type="int"/> </field> <union> - <source-position filename="regress.h" line="1479"/> + <source-position filename="regress.h" line="1480"/> <field name="a" writable="1"> <array zero-terminated="0" c:type="RegressLikeGnomeKeyringPasswordSchema" @@ -1218,14 +1218,14 @@ it says it's pointer but it's actually a string.</doc> </record> <record name="AnonymousUnionAndStruct" c:type="RegressAnonymousUnionAndStruct"> - <source-position filename="regress.h" line="1493"/> + <source-position filename="regress.h" line="1494"/> <field name="x" writable="1"> <type name="gint" c:type="int"/> </field> <union> - <source-position filename="regress.h" line="1492"/> + <source-position filename="regress.h" line="1493"/> <record> - <source-position filename="regress.h" line="1489"/> + <source-position filename="regress.h" line="1490"/> <field name="a" writable="1"> <type name="LikeGnomeKeyringPasswordSchema" c:type="RegressLikeGnomeKeyringPasswordSchema*"/> @@ -2460,13 +2460,13 @@ exposed to language bindings.</doc> <constant name="GI_SCANNER_ELSE" value="3" c:type="REGRESS_GI_SCANNER_ELSE"> - <source-position filename="regress.h" line="1457"/> + <source-position filename="regress.h" line="1458"/> <type name="gint" c:type="gint"/> </constant> <constant name="GI_SCANNER_IFDEF" value="3" c:type="REGRESS_GI_SCANNER_IFDEF"> - <source-position filename="regress.h" line="1461"/> + <source-position filename="regress.h" line="1462"/> <type name="gint" c:type="gint"/> </constant> <constant name="GUINT64_CONSTANT" @@ -2494,18 +2494,18 @@ exposed to language bindings.</doc> <record name="Intset" c:type="RegressIntset" disguised="1"> <doc xml:space="preserve" filename="regress.h" - line="1336">Like telepathy-glib's TpIntset.</doc> - <source-position filename="regress.h" line="1342"/> + line="1337">Like telepathy-glib's TpIntset.</doc> + <source-position filename="regress.h" line="1343"/> </record> <constant name="LONG_STRING_CONSTANT" value="TYPE,VALUE,ENCODING,CHARSET,LANGUAGE,DOM,INTL,POSTAL,PARCEL,HOME,WORK,PREF,VOICE,FAX,MSG,CELL,PAGER,BBS,MODEM,CAR,ISDN,VIDEO,AOL,APPLELINK,ATTMAIL,CIS,EWORLD,INTERNET,IBMMAIL,MCIMAIL,POWERSHARE,PRODIGY,TLX,X400,GIF,CGM,WMF,BMP,MET,PMB,DIB,PICT,TIFF,PDF,PS,JPEG,QTIME,MPEG,MPEG2,AVI,WAVE,AIFF,PCM,X509,PGP" c:type="REGRESS_LONG_STRING_CONSTANT"> - <source-position filename="regress.h" line="1428"/> + <source-position filename="regress.h" line="1429"/> <type name="utf8" c:type="gchar*"/> </constant> <record name="LikeGnomeKeyringPasswordSchema" c:type="RegressLikeGnomeKeyringPasswordSchema"> - <source-position filename="regress.h" line="1447"/> + <source-position filename="regress.h" line="1448"/> <field name="dummy" writable="1"> <type name="gint" c:type="int"/> </field> @@ -2519,7 +2519,7 @@ exposed to language bindings.</doc> </field> </record> <record name="LikeXklConfigItem" c:type="RegressLikeXklConfigItem"> - <source-position filename="regress.h" line="1414"/> + <source-position filename="regress.h" line="1415"/> <field name="name" writable="1"> <array zero-terminated="0" c:type="gchar" fixed-size="32"> <type name="gchar" c:type="gchar"/> @@ -2527,7 +2527,7 @@ exposed to language bindings.</doc> </field> <method name="set_name" c:identifier="regress_like_xkl_config_item_set_name"> - <source-position filename="regress.h" line="1418"/> + <source-position filename="regress.h" line="1419"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2544,13 +2544,13 @@ exposed to language bindings.</doc> <constant name="MAXUINT64" value="18446744073709551615" c:type="REGRESS_MAXUINT64"> - <source-position filename="regress.h" line="1451"/> + <source-position filename="regress.h" line="1452"/> <type name="guint64" c:type="guint64"/> </constant> <constant name="MININT64" value="-9223372036854775808" c:type="REGRESS_MININT64"> - <source-position filename="regress.h" line="1450"/> + <source-position filename="regress.h" line="1451"/> <type name="gint64" c:type="gint64"/> </constant> <constant name="Mixed_Case_Constant" @@ -2576,9 +2576,9 @@ exposed to language bindings.</doc> introspectable="0"> <doc xml:space="preserve" filename="regress.h" - line="1318">This should be skipped, and moreover, all function which + line="1319">This should be skipped, and moreover, all function which use it should be.</doc> - <source-position filename="regress.h" line="1328"/> + <source-position filename="regress.h" line="1329"/> <field name="x" writable="1"> <type name="gint" c:type="int"/> </field> @@ -2617,7 +2617,7 @@ use it should be.</doc> glib:type-name="RegressTestBoxed" glib:get-type="regress_test_boxed_get_type" c:symbol-prefix="test_boxed"> - <source-position filename="regress.h" line="673"/> + <source-position filename="regress.h" line="674"/> <field name="some_int8" writable="1"> <type name="gint8" c:type="gint8"/> </field> @@ -2628,14 +2628,14 @@ use it should be.</doc> <type name="TestBoxedPrivate" c:type="RegressTestBoxedPrivate*"/> </field> <constructor name="new" c:identifier="regress_test_boxed_new"> - <source-position filename="regress.h" line="679"/> + <source-position filename="regress.h" line="680"/> <return-value transfer-ownership="full"> <type name="TestBoxed" c:type="RegressTestBoxed*"/> </return-value> </constructor> <constructor name="new_alternative_constructor1" c:identifier="regress_test_boxed_new_alternative_constructor1"> - <source-position filename="regress.h" line="682"/> + <source-position filename="regress.h" line="683"/> <return-value transfer-ownership="full"> <type name="TestBoxed" c:type="RegressTestBoxed*"/> </return-value> @@ -2647,7 +2647,7 @@ use it should be.</doc> </constructor> <constructor name="new_alternative_constructor2" c:identifier="regress_test_boxed_new_alternative_constructor2"> - <source-position filename="regress.h" line="685"/> + <source-position filename="regress.h" line="686"/> <return-value transfer-ownership="full"> <type name="TestBoxed" c:type="RegressTestBoxed*"/> </return-value> @@ -2662,7 +2662,7 @@ use it should be.</doc> </constructor> <constructor name="new_alternative_constructor3" c:identifier="regress_test_boxed_new_alternative_constructor3"> - <source-position filename="regress.h" line="688"/> + <source-position filename="regress.h" line="689"/> <return-value transfer-ownership="full"> <type name="TestBoxed" c:type="RegressTestBoxed*"/> </return-value> @@ -2675,7 +2675,7 @@ use it should be.</doc> <method name="_not_a_method" c:identifier="regress_test_boxeds_not_a_method" moved-to="test_boxeds_not_a_method"> - <source-position filename="regress.h" line="700"/> + <source-position filename="regress.h" line="701"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2686,7 +2686,7 @@ use it should be.</doc> </parameters> </method> <method name="copy" c:identifier="regress_test_boxed_copy"> - <source-position filename="regress.h" line="692"/> + <source-position filename="regress.h" line="693"/> <return-value transfer-ownership="full"> <type name="TestBoxed" c:type="RegressTestBoxed*"/> </return-value> @@ -2697,7 +2697,7 @@ use it should be.</doc> </parameters> </method> <method name="equals" c:identifier="regress_test_boxed_equals"> - <source-position filename="regress.h" line="695"/> + <source-position filename="regress.h" line="696"/> <return-value transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </return-value> @@ -2716,7 +2716,7 @@ use it should be.</doc> glib:type-name="RegressTestBoxedB" glib:get-type="regress_test_boxed_b_get_type" c:symbol-prefix="test_boxed_b"> - <source-position filename="regress.h" line="711"/> + <source-position filename="regress.h" line="712"/> <field name="some_int8" writable="1"> <type name="gint8" c:type="gint8"/> </field> @@ -2724,7 +2724,7 @@ use it should be.</doc> <type name="glong" c:type="glong"/> </field> <constructor name="new" c:identifier="regress_test_boxed_b_new"> - <source-position filename="regress.h" line="718"/> + <source-position filename="regress.h" line="719"/> <return-value transfer-ownership="full"> <type name="TestBoxedB" c:type="RegressTestBoxedB*"/> </return-value> @@ -2738,7 +2738,7 @@ use it should be.</doc> </parameters> </constructor> <method name="copy" c:identifier="regress_test_boxed_b_copy"> - <source-position filename="regress.h" line="721"/> + <source-position filename="regress.h" line="722"/> <return-value transfer-ownership="full"> <type name="TestBoxedB" c:type="RegressTestBoxedB*"/> </return-value> @@ -2754,7 +2754,7 @@ use it should be.</doc> glib:type-name="RegressTestBoxedC" glib:get-type="regress_test_boxed_c_get_type" c:symbol-prefix="test_boxed_c"> - <source-position filename="regress.h" line="729"/> + <source-position filename="regress.h" line="730"/> <field name="refcount" writable="1"> <type name="guint" c:type="guint"/> </field> @@ -2762,7 +2762,7 @@ use it should be.</doc> <type name="guint" c:type="guint"/> </field> <constructor name="new" c:identifier="regress_test_boxed_c_new"> - <source-position filename="regress.h" line="735"/> + <source-position filename="regress.h" line="736"/> <return-value transfer-ownership="full"> <type name="TestBoxedC" c:type="RegressTestBoxedC*"/> </return-value> @@ -2773,9 +2773,9 @@ use it should be.</doc> glib:type-name="RegressTestBoxedD" glib:get-type="regress_test_boxed_d_get_type" c:symbol-prefix="test_boxed_d"> - <source-position filename="regress.h" line="737"/> + <source-position filename="regress.h" line="738"/> <constructor name="new" c:identifier="regress_test_boxed_d_new"> - <source-position filename="regress.h" line="745"/> + <source-position filename="regress.h" line="746"/> <return-value transfer-ownership="full"> <type name="TestBoxedD" c:type="RegressTestBoxedD*"/> </return-value> @@ -2789,7 +2789,7 @@ use it should be.</doc> </parameters> </constructor> <method name="copy" c:identifier="regress_test_boxed_d_copy"> - <source-position filename="regress.h" line="748"/> + <source-position filename="regress.h" line="749"/> <return-value transfer-ownership="full"> <type name="TestBoxedD" c:type="RegressTestBoxedD*"/> </return-value> @@ -2800,7 +2800,7 @@ use it should be.</doc> </parameters> </method> <method name="free" c:identifier="regress_test_boxed_d_free"> - <source-position filename="regress.h" line="751"/> + <source-position filename="regress.h" line="752"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2811,7 +2811,7 @@ use it should be.</doc> </parameters> </method> <method name="get_magic" c:identifier="regress_test_boxed_d_get_magic"> - <source-position filename="regress.h" line="755"/> + <source-position filename="regress.h" line="756"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -2825,16 +2825,16 @@ use it should be.</doc> <record name="TestBoxedPrivate" c:type="RegressTestBoxedPrivate" disguised="1"> - <source-position filename="regress.h" line="665"/> + <source-position filename="regress.h" line="666"/> </record> <callback name="TestCallback" c:type="RegressTestCallback"> - <source-position filename="regress.h" line="1074"/> + <source-position filename="regress.h" line="1075"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> </callback> <callback name="TestCallbackArray" c:type="RegressTestCallbackArray"> - <source-position filename="regress.h" line="1106"/> + <source-position filename="regress.h" line="1107"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -2859,7 +2859,7 @@ use it should be.</doc> </callback> <callback name="TestCallbackArrayInOut" c:type="RegressTestCallbackArrayInOut"> - <source-position filename="regress.h" line="1112"/> + <source-position filename="regress.h" line="1113"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2881,7 +2881,7 @@ use it should be.</doc> </parameters> </callback> <callback name="TestCallbackFull" c:type="RegressTestCallbackFull"> - <source-position filename="regress.h" line="1093"/> + <source-position filename="regress.h" line="1094"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -2889,25 +2889,25 @@ use it should be.</doc> <parameter name="foo" transfer-ownership="none"> <doc xml:space="preserve" filename="regress.h" - line="1089">the investment rate</doc> + line="1090">the investment rate</doc> <type name="gint" c:type="int"/> </parameter> <parameter name="bar" transfer-ownership="none"> <doc xml:space="preserve" filename="regress.h" - line="1090">how much money</doc> + line="1091">how much money</doc> <type name="gdouble" c:type="double"/> </parameter> <parameter name="path" transfer-ownership="none"> <doc xml:space="preserve" filename="regress.h" - line="1091">Path to file</doc> + line="1092">Path to file</doc> <type name="filename" c:type="char*"/> </parameter> </parameters> </callback> <callback name="TestCallbackGError" c:type="RegressTestCallbackGError"> - <source-position filename="regress.h" line="1081"/> + <source-position filename="regress.h" line="1082"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2919,7 +2919,7 @@ use it should be.</doc> </callback> <callback name="TestCallbackHashtable" c:type="RegressTestCallbackHashtable"> - <source-position filename="regress.h" line="1080"/> + <source-position filename="regress.h" line="1081"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2927,7 +2927,7 @@ use it should be.</doc> <parameter name="data" transfer-ownership="none"> <doc xml:space="preserve" filename="regress.h" - line="1078">a hash table; will be modified</doc> + line="1079">a hash table; will be modified</doc> <type name="GLib.HashTable" c:type="GHashTable*"> <type name="utf8"/> <type name="gint"/> @@ -2937,7 +2937,7 @@ use it should be.</doc> </callback> <callback name="TestCallbackOwnedGError" c:type="RegressTestCallbackOwnedGError"> - <source-position filename="regress.h" line="1086"/> + <source-position filename="regress.h" line="1087"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -2945,20 +2945,20 @@ use it should be.</doc> <parameter name="error" transfer-ownership="full"> <doc xml:space="preserve" filename="regress.h" - line="1084">GError instance; must be freed by the callback</doc> + line="1085">GError instance; must be freed by the callback</doc> <type name="GLib.Error" c:type="GError*"/> </parameter> </parameters> </callback> <callback name="TestCallbackReturnFull" c:type="RegressTestCallbackReturnFull"> - <source-position filename="regress.h" line="1098"/> + <source-position filename="regress.h" line="1099"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> </callback> <callback name="TestCallbackUserData" c:type="RegressTestCallbackUserData"> - <source-position filename="regress.h" line="1075"/> + <source-position filename="regress.h" line="1076"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -3087,7 +3087,7 @@ use it should be.</doc> </enumeration> <callback name="TestExternallyDefinedCallback" c:type="RegressTestExternallyDefinedCallback"> - <source-position filename="regress.h" line="790"/> + <source-position filename="regress.h" line="791"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3127,9 +3127,9 @@ use it should be.</doc> glib:type-name="RegressTestFloating" glib:get-type="regress_test_floating_get_type" glib:type-struct="TestFloatingClass"> - <source-position filename="regress.h" line="1258"/> + <source-position filename="regress.h" line="1259"/> <constructor name="new" c:identifier="regress_test_floating_new"> - <source-position filename="regress.h" line="1265"/> + <source-position filename="regress.h" line="1266"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -3144,7 +3144,7 @@ use it should be.</doc> <record name="TestFloatingClass" c:type="RegressTestFloatingClass" glib:is-gtype-struct-for="TestFloating"> - <source-position filename="regress.h" line="1258"/> + <source-position filename="regress.h" line="1259"/> <field name="parent_class"> <type name="GObject.InitiallyUnownedClass" c:type="GInitiallyUnownedClass"/> @@ -3162,9 +3162,9 @@ use it should be.</doc> glib:unref-func="regress_test_fundamental_object_unref" glib:set-value-func="regress_test_value_set_fundamental_object" glib:get-value-func="regress_test_value_get_fundamental_object"> - <source-position filename="regress.h" line="1026"/> + <source-position filename="regress.h" line="1027"/> <virtual-method name="copy"> - <source-position filename="regress.h" line="1011"/> + <source-position filename="regress.h" line="1012"/> <return-value transfer-ownership="full"> <type name="TestFundamentalObject" c:type="RegressTestFundamentalObject*"/> @@ -3177,7 +3177,7 @@ use it should be.</doc> </parameters> </virtual-method> <virtual-method name="finalize"> - <source-position filename="regress.h" line="1012"/> + <source-position filename="regress.h" line="1013"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3189,7 +3189,7 @@ use it should be.</doc> </parameters> </virtual-method> <method name="ref" c:identifier="regress_test_fundamental_object_ref"> - <source-position filename="regress.h" line="1032"/> + <source-position filename="regress.h" line="1033"/> <return-value transfer-ownership="full"> <doc xml:space="preserve" filename="regress.c" @@ -3207,7 +3207,7 @@ use it should be.</doc> </method> <method name="unref" c:identifier="regress_test_fundamental_object_unref"> - <source-position filename="regress.h" line="1035"/> + <source-position filename="regress.h" line="1036"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3232,7 +3232,7 @@ use it should be.</doc> <record name="TestFundamentalObjectClass" c:type="RegressTestFundamentalObjectClass" glib:is-gtype-struct-for="TestFundamentalObject"> - <source-position filename="regress.h" line="1026"/> + <source-position filename="regress.h" line="1027"/> <field name="type_class"> <type name="GObject.TypeClass" c:type="GTypeClass"/> </field> @@ -3247,7 +3247,7 @@ use it should be.</doc> </record> <callback name="TestFundamentalObjectCopyFunction" c:type="RegressTestFundamentalObjectCopyFunction"> - <source-position filename="regress.h" line="1011"/> + <source-position filename="regress.h" line="1012"/> <return-value transfer-ownership="full"> <type name="TestFundamentalObject" c:type="RegressTestFundamentalObject*"/> @@ -3261,7 +3261,7 @@ use it should be.</doc> </callback> <callback name="TestFundamentalObjectFinalizeFunction" c:type="RegressTestFundamentalObjectFinalizeFunction"> - <source-position filename="regress.h" line="1012"/> + <source-position filename="regress.h" line="1013"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3280,10 +3280,10 @@ use it should be.</doc> glib:get-type="regress_test_fundamental_sub_object_get_type" glib:type-struct="TestFundamentalSubObjectClass" glib:fundamental="1"> - <source-position filename="regress.h" line="1056"/> + <source-position filename="regress.h" line="1057"/> <constructor name="new" c:identifier="regress_test_fundamental_sub_object_new"> - <source-position filename="regress.h" line="1065"/> + <source-position filename="regress.h" line="1066"/> <return-value transfer-ownership="full"> <type name="TestFundamentalSubObject" c:type="RegressTestFundamentalSubObject*"/> @@ -3305,7 +3305,7 @@ use it should be.</doc> <record name="TestFundamentalSubObjectClass" c:type="RegressTestFundamentalSubObjectClass" glib:is-gtype-struct-for="TestFundamentalSubObject"> - <source-position filename="regress.h" line="1056"/> + <source-position filename="regress.h" line="1057"/> <field name="fundamental_object_class"> <type name="TestFundamentalObjectClass" c:type="RegressTestFundamentalObjectClass"/> @@ -3429,10 +3429,10 @@ use it should be.</doc> glib:type-name="RegressTestInterface" glib:get-type="regress_test_interface_get_type" glib:type-struct="TestInterfaceIface"> - <source-position filename="regress.h" line="1202"/> + <source-position filename="regress.h" line="1203"/> <method name="emit_signal" c:identifier="regress_test_interface_emit_signal"> - <source-position filename="regress.h" line="1208"/> + <source-position filename="regress.h" line="1209"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3469,13 +3469,13 @@ use it should be.</doc> <record name="TestInterfaceIface" c:type="RegressTestInterfaceIface" glib:is-gtype-struct-for="TestInterface"> - <source-position filename="regress.h" line="1202"/> + <source-position filename="regress.h" line="1203"/> <field name="base_iface"> <type name="GObject.TypeInterface" c:type="GTypeInterface"/> </field> </record> <callback name="TestNoPtrCallback" c:type="RegressTestNoPtrCallback"> - <source-position filename="regress.h" line="1073"/> + <source-position filename="regress.h" line="1074"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3487,15 +3487,15 @@ use it should be.</doc> glib:type-name="RegressTestObj" glib:get-type="regress_test_obj_get_type" glib:type-struct="TestObjClass"> - <source-position filename="regress.h" line="812"/> + <source-position filename="regress.h" line="813"/> <constructor name="constructor" c:identifier="regress_constructor"> - <source-position filename="regress.h" line="821"/> + <source-position filename="regress.h" line="822"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> </constructor> <constructor name="new" c:identifier="regress_test_obj_new"> - <source-position filename="regress.h" line="818"/> + <source-position filename="regress.h" line="819"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> @@ -3510,7 +3510,7 @@ use it should be.</doc> </constructor> <constructor name="new_callback" c:identifier="regress_test_obj_new_callback"> - <source-position filename="regress.h" line="1170"/> + <source-position filename="regress.h" line="1171"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> @@ -3537,7 +3537,7 @@ use it should be.</doc> <constructor name="new_from_file" c:identifier="regress_test_obj_new_from_file" throws="1"> - <source-position filename="regress.h" line="824"/> + <source-position filename="regress.h" line="825"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> @@ -3548,7 +3548,7 @@ use it should be.</doc> </parameters> </constructor> <function name="null_out" c:identifier="regress_test_obj_null_out"> - <source-position filename="regress.h" line="946"/> + <source-position filename="regress.h" line="947"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3568,7 +3568,7 @@ use it should be.</doc> </function> <function name="static_method" c:identifier="regress_test_obj_static_method"> - <source-position filename="regress.h" line="854"/> + <source-position filename="regress.h" line="855"/> <return-value transfer-ownership="none"> <type name="gdouble" c:type="double"/> </return-value> @@ -3580,7 +3580,7 @@ use it should be.</doc> </function> <function name="static_method_callback" c:identifier="regress_test_obj_static_method_callback"> - <source-position filename="regress.h" line="1167"/> + <source-position filename="regress.h" line="1168"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3595,7 +3595,7 @@ use it should be.</doc> </parameters> </function> <virtual-method name="allow_none_vfunc"> - <source-position filename="regress.h" line="802"/> + <source-position filename="regress.h" line="803"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3609,13 +3609,13 @@ use it should be.</doc> allow-none="1"> <doc xml:space="preserve" filename="regress.h" - line="800">Another object</doc> + line="801">Another object</doc> <type name="TestObj" c:type="RegressTestObj*"/> </parameter> </parameters> </virtual-method> <virtual-method name="complex_vfunc"> - <source-position filename="regress.h" line="790"/> + <source-position filename="regress.h" line="791"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3634,7 +3634,7 @@ use it should be.</doc> line="3130">This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</doc> - <source-position filename="regress.h" line="796"/> + <source-position filename="regress.h" line="797"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -3659,7 +3659,7 @@ case.</doc> line="3130">This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</doc> - <source-position filename="regress.h" line="939"/> + <source-position filename="regress.h" line="940"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -3680,7 +3680,7 @@ case.</doc> </method> <method name="emit_sig_with_array_len_prop" c:identifier="regress_test_obj_emit_sig_with_array_len_prop"> - <source-position filename="regress.h" line="842"/> + <source-position filename="regress.h" line="843"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3692,7 +3692,7 @@ case.</doc> </method> <method name="emit_sig_with_foreign_struct" c:identifier="regress_test_obj_emit_sig_with_foreign_struct"> - <source-position filename="regress.h" line="833"/> + <source-position filename="regress.h" line="834"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3707,7 +3707,7 @@ case.</doc> <doc xml:space="preserve" filename="regress.c" line="2858">The signal handler must increment the inout parameter by 1.</doc> - <source-position filename="regress.h" line="845"/> + <source-position filename="regress.h" line="846"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3722,7 +3722,7 @@ case.</doc> </method> <method name="emit_sig_with_int64" c:identifier="regress_test_obj_emit_sig_with_int64"> - <source-position filename="regress.h" line="836"/> + <source-position filename="regress.h" line="837"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3734,7 +3734,7 @@ case.</doc> </method> <method name="emit_sig_with_obj" c:identifier="regress_test_obj_emit_sig_with_obj"> - <source-position filename="regress.h" line="830"/> + <source-position filename="regress.h" line="831"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3746,7 +3746,7 @@ case.</doc> </method> <method name="emit_sig_with_uint64" c:identifier="regress_test_obj_emit_sig_with_uint64"> - <source-position filename="regress.h" line="839"/> + <source-position filename="regress.h" line="840"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3757,7 +3757,7 @@ case.</doc> </parameters> </method> <method name="forced_method" c:identifier="regress_forced_method"> - <source-position filename="regress.h" line="857"/> + <source-position filename="regress.h" line="858"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3772,7 +3772,7 @@ case.</doc> </method> <method name="instance_method" c:identifier="regress_test_obj_instance_method"> - <source-position filename="regress.h" line="848"/> + <source-position filename="regress.h" line="849"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -3784,7 +3784,7 @@ case.</doc> </method> <method name="instance_method_callback" c:identifier="regress_test_obj_instance_method_callback"> - <source-position filename="regress.h" line="1164"/> + <source-position filename="regress.h" line="1165"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3803,7 +3803,7 @@ case.</doc> </method> <method name="instance_method_full" c:identifier="regress_test_obj_instance_method_full"> - <source-position filename="regress.h" line="851"/> + <source-position filename="regress.h" line="852"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3815,7 +3815,7 @@ case.</doc> </method> <method name="name_conflict" c:identifier="regress_test_obj_name_conflict"> - <source-position filename="regress.h" line="958"/> + <source-position filename="regress.h" line="959"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3830,7 +3830,7 @@ case.</doc> </method> <method name="not_nullable_element_typed_gpointer_in" c:identifier="regress_test_obj_not_nullable_element_typed_gpointer_in"> - <source-position filename="regress.h" line="953"/> + <source-position filename="regress.h" line="954"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3859,7 +3859,7 @@ case.</doc> </method> <method name="not_nullable_typed_gpointer_in" c:identifier="regress_test_obj_not_nullable_typed_gpointer_in"> - <source-position filename="regress.h" line="950"/> + <source-position filename="regress.h" line="951"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3879,7 +3879,7 @@ case.</doc> </parameters> </method> <method name="set_bare" c:identifier="regress_test_obj_set_bare"> - <source-position filename="regress.h" line="827"/> + <source-position filename="regress.h" line="828"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -3901,7 +3901,7 @@ case.</doc> <doc xml:space="preserve" filename="regress.c" line="3094">Check that the out value is skipped</doc> - <source-position filename="regress.h" line="927"/> + <source-position filename="regress.h" line="928"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -3975,7 +3975,7 @@ case.</doc> <doc xml:space="preserve" filename="regress.c" line="3058">Check that the out value is skipped</doc> - <source-position filename="regress.h" line="915"/> + <source-position filename="regress.h" line="916"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -4049,7 +4049,7 @@ case.</doc> <doc xml:space="preserve" filename="regress.c" line="3022">Check that a parameter is skipped</doc> - <source-position filename="regress.h" line="903"/> + <source-position filename="regress.h" line="904"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -4122,7 +4122,7 @@ case.</doc> <doc xml:space="preserve" filename="regress.c" line="2962">Check that the return value is skipped</doc> - <source-position filename="regress.h" line="885"/> + <source-position filename="regress.h" line="886"/> <return-value transfer-ownership="none" skip="1"> <doc xml:space="preserve" filename="regress.c" @@ -4196,7 +4196,7 @@ case.</doc> filename="regress.c" line="2998">Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.</doc> - <source-position filename="regress.h" line="897"/> + <source-position filename="regress.h" line="898"/> <return-value transfer-ownership="none" skip="1"> <doc xml:space="preserve" filename="regress.c" @@ -4220,7 +4220,7 @@ raise an error.</doc> </method> <method name="torture_signature_0" c:identifier="regress_test_obj_torture_signature_0"> - <source-position filename="regress.h" line="865"/> + <source-position filename="regress.h" line="866"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -4266,7 +4266,7 @@ raise an error.</doc> <doc xml:space="preserve" filename="regress.c" line="2930">This function throws an error if m is odd.</doc> - <source-position filename="regress.h" line="874"/> + <source-position filename="regress.h" line="875"/> <return-value transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </return-value> @@ -4421,7 +4421,7 @@ raise an error.</doc> </field> <field name="function_ptr"> <callback name="function_ptr"> - <source-position filename="regress.h" line="787"/> + <source-position filename="regress.h" line="788"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -4652,13 +4652,13 @@ the introspection client langage.</doc> <record name="TestObjClass" c:type="RegressTestObjClass" glib:is-gtype-struct-for="TestObj"> - <source-position filename="regress.h" line="812"/> + <source-position filename="regress.h" line="813"/> <field name="parent_class"> <type name="GObject.ObjectClass" c:type="GObjectClass"/> </field> <field name="matrix"> <callback name="matrix"> - <source-position filename="regress.h" line="796"/> + <source-position filename="regress.h" line="797"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -4680,7 +4680,7 @@ the introspection client langage.</doc> </field> <field name="allow_none_vfunc"> <callback name="allow_none_vfunc"> - <source-position filename="regress.h" line="802"/> + <source-position filename="regress.h" line="803"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -4694,7 +4694,7 @@ the introspection client langage.</doc> allow-none="1"> <doc xml:space="preserve" filename="regress.h" - line="800">Another object</doc> + line="801">Another object</doc> <type name="TestObj" c:type="RegressTestObj*"/> </parameter> </parameters> @@ -4712,7 +4712,7 @@ the introspection client langage.</doc> </field> <field name="_regress_reserved1" introspectable="0"> <callback name="_regress_reserved1"> - <source-position filename="regress.h" line="810"/> + <source-position filename="regress.h" line="811"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -4720,7 +4720,7 @@ the introspection client langage.</doc> </field> <field name="_regress_reserved2" introspectable="0"> <callback name="_regress_reserved2"> - <source-position filename="regress.h" line="811"/> + <source-position filename="regress.h" line="812"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -4755,7 +4755,7 @@ the introspection client langage.</doc> </function> </enumeration> <bitfield name="TestPrivateEnum" c:type="RegressTestPrivateEnum"> - <source-position filename="regress.h" line="1401"/> + <source-position filename="regress.h" line="1402"/> <member name="public_enum_before" value="1" c:identifier="REGRESS_TEST_PUBLIC_ENUM_BEFORE"> @@ -4766,7 +4766,7 @@ the introspection client langage.</doc> </member> </bitfield> <record name="TestPrivateStruct" c:type="RegressTestPrivateStruct"> - <source-position filename="regress.h" line="1393"/> + <source-position filename="regress.h" line="1394"/> <field name="this_is_public_before" writable="1"> <type name="gint" c:type="gint"/> </field> @@ -4778,7 +4778,7 @@ the introspection client langage.</doc> </field> </record> <record name="TestReferenceCounters" c:type="RegressTestReferenceCounters"> - <source-position filename="regress.h" line="1503"/> + <source-position filename="regress.h" line="1504"/> <field name="refcount" writable="1"> <type name="gint" c:type="grefcount"/> </field> @@ -4806,7 +4806,7 @@ the introspection client langage.</doc> glib:type-name="RegressTestSimpleBoxedA" glib:get-type="regress_test_simple_boxed_a_get_gtype" c:symbol-prefix="test_simple_boxed_a"> - <source-position filename="regress.h" line="631"/> + <source-position filename="regress.h" line="632"/> <field name="some_int" writable="1"> <type name="gint" c:type="gint"/> </field> @@ -4820,7 +4820,7 @@ the introspection client langage.</doc> <type name="TestEnum" c:type="RegressTestEnum"/> </field> <method name="copy" c:identifier="regress_test_simple_boxed_a_copy"> - <source-position filename="regress.h" line="638"/> + <source-position filename="regress.h" line="639"/> <return-value transfer-ownership="full"> <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA*"/> </return-value> @@ -4831,7 +4831,7 @@ the introspection client langage.</doc> </parameters> </method> <method name="equals" c:identifier="regress_test_simple_boxed_a_equals"> - <source-position filename="regress.h" line="641"/> + <source-position filename="regress.h" line="642"/> <return-value transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </return-value> @@ -4846,7 +4846,7 @@ the introspection client langage.</doc> </method> <function name="const_return" c:identifier="regress_test_simple_boxed_a_const_return"> - <source-position filename="regress.h" line="645"/> + <source-position filename="regress.h" line="646"/> <return-value transfer-ownership="none"> <type name="TestSimpleBoxedA" c:type="const RegressTestSimpleBoxedA*"/> @@ -4858,7 +4858,7 @@ the introspection client langage.</doc> glib:type-name="RegressTestSimpleBoxedB" glib:get-type="regress_test_simple_boxed_b_get_type" c:symbol-prefix="test_simple_boxed_b"> - <source-position filename="regress.h" line="652"/> + <source-position filename="regress.h" line="653"/> <field name="some_int8" writable="1"> <type name="gint8" c:type="gint8"/> </field> @@ -4866,7 +4866,7 @@ the introspection client langage.</doc> <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA"/> </field> <method name="copy" c:identifier="regress_test_simple_boxed_b_copy"> - <source-position filename="regress.h" line="659"/> + <source-position filename="regress.h" line="660"/> <return-value transfer-ownership="full"> <type name="TestSimpleBoxedB" c:type="RegressTestSimpleBoxedB*"/> </return-value> @@ -4878,7 +4878,7 @@ the introspection client langage.</doc> </method> </record> <callback name="TestSimpleCallback" c:type="RegressTestSimpleCallback"> - <source-position filename="regress.h" line="1072"/> + <source-position filename="regress.h" line="1073"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5058,7 +5058,7 @@ the introspection client langage.</doc> </field> </union> <record name="TestStructF" c:type="RegressTestStructF"> - <source-position filename="regress.h" line="619"/> + <source-position filename="regress.h" line="620"/> <field name="ref_count" writable="1"> <type name="gint" c:type="volatile gint"/> </field> @@ -5080,9 +5080,12 @@ the introspection client langage.</doc> <field name="data6" writable="1"> <type name="gint" c:type="const gint* volatile"/> </field> + <field name="data7" writable="1"> + <type name="guint8" c:type="volatile unsigned char"/> + </field> </record> <record name="TestStructFixedArray" c:type="RegressTestStructFixedArray"> - <source-position filename="regress.h" line="1406"/> + <source-position filename="regress.h" line="1407"/> <field name="just_int" writable="1"> <type name="gint" c:type="gint"/> </field> @@ -5092,7 +5095,7 @@ the introspection client langage.</doc> </array> </field> <method name="frob" c:identifier="regress_test_struct_fixed_array_frob"> - <source-position filename="regress.h" line="1410"/> + <source-position filename="regress.h" line="1411"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5111,17 +5114,17 @@ the introspection client langage.</doc> glib:type-name="RegressTestSubObj" glib:get-type="regress_test_sub_obj_get_type" glib:type-struct="TestSubObjClass"> - <source-position filename="regress.h" line="980"/> + <source-position filename="regress.h" line="981"/> <implements name="TestInterface"/> <constructor name="new" c:identifier="regress_test_sub_obj_new"> - <source-position filename="regress.h" line="987"/> + <source-position filename="regress.h" line="988"/> <return-value transfer-ownership="full"> <type name="TestObj" c:type="RegressTestObj*"/> </return-value> </constructor> <method name="instance_method" c:identifier="regress_test_sub_obj_instance_method"> - <source-position filename="regress.h" line="993"/> + <source-position filename="regress.h" line="994"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -5132,7 +5135,7 @@ the introspection client langage.</doc> </parameters> </method> <method name="unset_bare" c:identifier="regress_test_sub_obj_unset_bare"> - <source-position filename="regress.h" line="990"/> + <source-position filename="regress.h" line="991"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5161,7 +5164,7 @@ the introspection client langage.</doc> <record name="TestSubObjClass" c:type="RegressTestSubObjClass" glib:is-gtype-struct-for="TestSubObj"> - <source-position filename="regress.h" line="980"/> + <source-position filename="regress.h" line="981"/> <field name="parent_class"> <type name="TestObjClass" c:type="RegressTestObjClass"/> </field> @@ -5173,16 +5176,16 @@ the introspection client langage.</doc> glib:type-name="RegressTestWi8021x" glib:get-type="regress_test_wi_802_1x_get_type" glib:type-struct="TestWi8021xClass"> - <source-position filename="regress.h" line="1226"/> + <source-position filename="regress.h" line="1227"/> <constructor name="new" c:identifier="regress_test_wi_802_1x_new"> - <source-position filename="regress.h" line="1233"/> + <source-position filename="regress.h" line="1234"/> <return-value transfer-ownership="full"> <type name="TestWi8021x" c:type="RegressTestWi8021x*"/> </return-value> </constructor> <function name="static_method" c:identifier="regress_test_wi_802_1x_static_method"> - <source-position filename="regress.h" line="1242"/> + <source-position filename="regress.h" line="1243"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -5194,7 +5197,7 @@ the introspection client langage.</doc> </function> <method name="get_testbool" c:identifier="regress_test_wi_802_1x_get_testbool"> - <source-position filename="regress.h" line="1236"/> + <source-position filename="regress.h" line="1237"/> <return-value transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </return-value> @@ -5206,7 +5209,7 @@ the introspection client langage.</doc> </method> <method name="set_testbool" c:identifier="regress_test_wi_802_1x_set_testbool"> - <source-position filename="regress.h" line="1239"/> + <source-position filename="regress.h" line="1240"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5232,7 +5235,7 @@ the introspection client langage.</doc> <record name="TestWi8021xClass" c:type="RegressTestWi8021xClass" glib:is-gtype-struct-for="TestWi8021x"> - <source-position filename="regress.h" line="1226"/> + <source-position filename="regress.h" line="1227"/> <field name="parent_class"> <type name="GObject.ObjectClass" c:type="GObjectClass"/> </field> @@ -5240,12 +5243,12 @@ the introspection client langage.</doc> <constant name="UTF8_CONSTANT" value="const ♥ utf8" c:type="REGRESS_UTF8_CONSTANT"> - <source-position filename="regress.h" line="1421"/> + <source-position filename="regress.h" line="1422"/> <type name="utf8" c:type="gchar*"/> </constant> <function name="aliased_caller_alloc" c:identifier="regress_aliased_caller_alloc"> - <source-position filename="regress.h" line="1383"/> + <source-position filename="regress.h" line="1384"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5902,7 +5905,7 @@ exposed to language bindings.</doc> </parameters> </function> <function name="func_obj_null_in" c:identifier="regress_func_obj_null_in"> - <source-position filename="regress.h" line="943"/> + <source-position filename="regress.h" line="944"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5920,7 +5923,7 @@ exposed to language bindings.</doc> </function> <function name="func_obj_nullable_in" c:identifier="regress_func_obj_nullable_in"> - <source-position filename="regress.h" line="948"/> + <source-position filename="regress.h" line="949"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5937,7 +5940,7 @@ exposed to language bindings.</doc> </parameters> </function> <function name="get_variant" c:identifier="regress_get_variant"> - <source-position filename="regress.h" line="1496"/> + <source-position filename="regress.h" line="1497"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -5969,7 +5972,7 @@ exposed to language bindings.</doc> filename="regress.c" line="4447">This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.</doc> - <source-position filename="regress.h" line="1436"/> + <source-position filename="regress.h" line="1437"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -5992,7 +5995,7 @@ libgnome-keyring.</doc> </function> <function name="introspectable_via_alias" c:identifier="regress_introspectable_via_alias"> - <source-position filename="regress.h" line="1361"/> + <source-position filename="regress.h" line="1362"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6005,7 +6008,7 @@ libgnome-keyring.</doc> <function name="not_introspectable_via_alias" c:identifier="regress_not_introspectable_via_alias" introspectable="0"> - <source-position filename="regress.h" line="1372"/> + <source-position filename="regress.h" line="1373"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6018,7 +6021,7 @@ libgnome-keyring.</doc> <function name="random_function_with_skipped_structure" c:identifier="regress_random_function_with_skipped_structure" introspectable="0"> - <source-position filename="regress.h" line="1332"/> + <source-position filename="regress.h" line="1333"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6055,7 +6058,7 @@ libgnome-keyring.</doc> </function> <function name="test_array_callback" c:identifier="regress_test_array_callback"> - <source-position filename="regress.h" line="1127"/> + <source-position filename="regress.h" line="1128"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6067,7 +6070,7 @@ libgnome-keyring.</doc> </function> <function name="test_array_fixed_out_objects" c:identifier="regress_test_array_fixed_out_objects"> - <source-position filename="regress.h" line="861"/> + <source-position filename="regress.h" line="862"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6242,7 +6245,7 @@ libgnome-keyring.</doc> </function> <function name="test_array_inout_callback" c:identifier="regress_test_array_inout_callback"> - <source-position filename="regress.h" line="1130"/> + <source-position filename="regress.h" line="1131"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6456,7 +6459,7 @@ libgnome-keyring.</doc> </function> <function name="test_async_ready_callback" c:identifier="regress_test_async_ready_callback"> - <source-position filename="regress.h" line="1160"/> + <source-position filename="regress.h" line="1161"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6507,7 +6510,7 @@ libgnome-keyring.</doc> </function> <function name="test_boxeds_not_a_method" c:identifier="regress_test_boxeds_not_a_method"> - <source-position filename="regress.h" line="700"/> + <source-position filename="regress.h" line="701"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6519,7 +6522,7 @@ libgnome-keyring.</doc> </function> <function name="test_boxeds_not_a_static" c:identifier="regress_test_boxeds_not_a_static"> - <source-position filename="regress.h" line="703"/> + <source-position filename="regress.h" line="704"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6585,7 +6588,7 @@ libgnome-keyring.</doc> </return-value> </function> <function name="test_callback" c:identifier="regress_test_callback"> - <source-position filename="regress.h" line="1121"/> + <source-position filename="regress.h" line="1122"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6601,7 +6604,7 @@ libgnome-keyring.</doc> </function> <function name="test_callback_async" c:identifier="regress_test_callback_async"> - <source-position filename="regress.h" line="1153"/> + <source-position filename="regress.h" line="1154"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6627,7 +6630,7 @@ libgnome-keyring.</doc> filename="regress.c" line="3802">Notified - callback persists until a DestroyNotify delegate is invoked.</doc> - <source-position filename="regress.h" line="1140"/> + <source-position filename="regress.h" line="1141"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6657,7 +6660,7 @@ is invoked.</doc> filename="regress.c" line="3829">Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.</doc> - <source-position filename="regress.h" line="1145"/> + <source-position filename="regress.h" line="1146"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6676,7 +6679,7 @@ condition in bindings which needs to be tested.</doc> </function> <function name="test_callback_return_full" c:identifier="regress_test_callback_return_full"> - <source-position filename="regress.h" line="1137"/> + <source-position filename="regress.h" line="1138"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -6689,7 +6692,7 @@ condition in bindings which needs to be tested.</doc> </function> <function name="test_callback_thaw_async" c:identifier="regress_test_callback_thaw_async"> - <source-position filename="regress.h" line="1156"/> + <source-position filename="regress.h" line="1157"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6701,7 +6704,7 @@ condition in bindings which needs to be tested.</doc> line="3843">Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.</doc> - <source-position filename="regress.h" line="1149"/> + <source-position filename="regress.h" line="1150"/> <return-value transfer-ownership="none"> <doc xml:space="preserve" filename="regress.c" @@ -6715,7 +6718,7 @@ corresponding destroy notfications.</doc> filename="regress.c" line="3771">Call - callback parameter persists for the duration of the method call and can be released on return.</doc> - <source-position filename="regress.h" line="1133"/> + <source-position filename="regress.h" line="1134"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -6787,7 +6790,7 @@ call and can be released on return.</doc> </function> <function name="test_create_fundamental_hidden_class_instance" c:identifier="regress_test_create_fundamental_hidden_class_instance"> - <source-position filename="regress.h" line="1069"/> + <source-position filename="regress.h" line="1070"/> <return-value transfer-ownership="full"> <type name="TestFundamentalObject" c:type="RegressTestFundamentalObject*"/> @@ -6795,7 +6798,7 @@ call and can be released on return.</doc> </function> <function name="test_date_in_gvalue" c:identifier="regress_test_date_in_gvalue"> - <source-position filename="regress.h" line="1299"/> + <source-position filename="regress.h" line="1300"/> <return-value transfer-ownership="full"> <type name="GObject.Value" c:type="GValue*"/> </return-value> @@ -6880,7 +6883,7 @@ call and can be released on return.</doc> </function> <function name="test_gerror_callback" c:identifier="regress_test_gerror_callback"> - <source-position filename="regress.h" line="1178"/> + <source-position filename="regress.h" line="1179"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7343,7 +7346,7 @@ element-type annotation.</doc> </function> <function name="test_hash_table_callback" c:identifier="regress_test_hash_table_callback"> - <source-position filename="regress.h" line="1175"/> + <source-position filename="regress.h" line="1176"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7461,7 +7464,7 @@ element-type annotation.</doc> </function> <function name="test_multi_callback" c:identifier="regress_test_multi_callback"> - <source-position filename="regress.h" line="1124"/> + <source-position filename="regress.h" line="1125"/> <return-value transfer-ownership="none"> <type name="gint" c:type="int"/> </return-value> @@ -7510,7 +7513,7 @@ It has multiple lines in the documentation. The sky is blue. You will give me your credit card number.</doc> - <source-position filename="regress.h" line="1313"/> + <source-position filename="regress.h" line="1314"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7547,7 +7550,7 @@ rgb(20%, 30%, 0%)</literallayout></entry> </informaltable> What we're testing here is that the scanner ignores the @a nested inside XML.</doc> - <source-position filename="regress.h" line="1316"/> + <source-position filename="regress.h" line="1317"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7562,7 +7565,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d </function> <function name="test_noptr_callback" c:identifier="regress_test_noptr_callback"> - <source-position filename="regress.h" line="1118"/> + <source-position filename="regress.h" line="1119"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7578,7 +7581,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d </function> <function name="test_null_gerror_callback" c:identifier="regress_test_null_gerror_callback"> - <source-position filename="regress.h" line="1181"/> + <source-position filename="regress.h" line="1182"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7590,14 +7593,14 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d </function> <function name="test_null_strv_in_gvalue" c:identifier="regress_test_null_strv_in_gvalue"> - <source-position filename="regress.h" line="1305"/> + <source-position filename="regress.h" line="1306"/> <return-value transfer-ownership="full"> <type name="GObject.Value" c:type="GValue*"/> </return-value> </function> <function name="test_owned_gerror_callback" c:identifier="regress_test_owned_gerror_callback"> - <source-position filename="regress.h" line="1184"/> + <source-position filename="regress.h" line="1185"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7636,14 +7639,14 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d <function name="test_simple_boxed_a_const_return" c:identifier="regress_test_simple_boxed_a_const_return" moved-to="TestSimpleBoxedA.const_return"> - <source-position filename="regress.h" line="645"/> + <source-position filename="regress.h" line="646"/> <return-value transfer-ownership="none"> <type name="TestSimpleBoxedA" c:type="const RegressTestSimpleBoxedA*"/> </return-value> </function> <function name="test_simple_callback" c:identifier="regress_test_simple_callback"> - <source-position filename="regress.h" line="1115"/> + <source-position filename="regress.h" line="1116"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7675,7 +7678,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d filename="regress.c" line="4023">Should not emit a warning: https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> - <source-position filename="regress.h" line="1188"/> + <source-position filename="regress.h" line="1189"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7739,7 +7742,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> </function> <function name="test_strv_in_gvalue" c:identifier="regress_test_strv_in_gvalue"> - <source-position filename="regress.h" line="1302"/> + <source-position filename="regress.h" line="1303"/> <return-value transfer-ownership="full"> <type name="GObject.Value" c:type="GValue*"/> </return-value> @@ -7798,7 +7801,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> </function> <function name="test_torture_signature_0" c:identifier="regress_test_torture_signature_0"> - <source-position filename="regress.h" line="1270"/> + <source-position filename="regress.h" line="1271"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -7838,7 +7841,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> <doc xml:space="preserve" filename="regress.c" line="4243">This function throws an error if m is odd.</doc> - <source-position filename="regress.h" line="1278"/> + <source-position filename="regress.h" line="1279"/> <return-value transfer-ownership="none"> <type name="gboolean" c:type="gboolean"/> </return-value> @@ -7874,7 +7877,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> </function> <function name="test_torture_signature_2" c:identifier="regress_test_torture_signature_2"> - <source-position filename="regress.h" line="1287"/> + <source-position filename="regress.h" line="1288"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -8175,7 +8178,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> <function name="test_value_get_fundamental_object" c:identifier="regress_test_value_get_fundamental_object" introspectable="0"> - <source-position filename="regress.h" line="1043"/> + <source-position filename="regress.h" line="1044"/> <return-value> <type name="TestFundamentalObject" c:type="RegressTestFundamentalObject*"/> @@ -8207,7 +8210,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc> <function name="test_value_set_fundamental_object" c:identifier="regress_test_value_set_fundamental_object" introspectable="0"> - <source-position filename="regress.h" line="1040"/> + <source-position filename="regress.h" line="1041"/> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 66467d0a..44d36e15 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -616,6 +616,7 @@ struct _RegressTestStructF const gint **const* data4; volatile gint *const data5; const gint *volatile data6; + volatile unsigned const char data7; }; /* plain-old-data boxed types */ |