summaryrefslogtreecommitdiff
path: root/tests/scanner
diff options
context:
space:
mode:
authorPavel Holejsovsky <pholejs@src.gnome.org>2011-01-09 16:12:46 +0100
committerPavel Holejsovsky <pholejs@src.gnome.org>2011-01-13 16:28:05 +0100
commit8896eb04d9cb9f8792da34ae9814c7d7b97a9729 (patch)
treed8d49c81ed5961929ad88b0f17f045d89e818191 /tests/scanner
parentf3f3cb62abec946f82fe44a8382a04b28d6c7313 (diff)
downloadgobject-introspection-8896eb04d9cb9f8792da34ae9814c7d7b97a9729.tar.gz
Make caller-allocates detection work for struct aliases
Scanner tries to detect caller-allocates attribute automatically if not explicitly specified by checking that parameter is not double-referenced and is struct or union. This patch adds resolving of aliases when checking whether parameter is struct or union. Also removes old incorrect method transformer.follow_aliases, which was never used in current code. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=639081
Diffstat (limited to 'tests/scanner')
-rw-r--r--tests/scanner/Regress-1.0-expected.gir18
-rw-r--r--tests/scanner/regress.c10
-rw-r--r--tests/scanner/regress.h9
3 files changed, 37 insertions, 0 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index c7fb7835..3d4e56f7 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -16,6 +16,10 @@ and/or use gtk-doc annotations. -->
shared-library="libregress.so"
c:identifier-prefixes="Regress"
c:symbol-prefixes="regress">
+ <alias name="AliasedTestBoxed" c:type="RegressAliasedTestBoxed">
+ <doc xml:whitespace="preserve">Typedef TestBoxed to test caller-allocates correctness</doc>
+ <type name="TestBoxed" c:type="RegressTestBoxed"/>
+ </alias>
<alias name="IntSet" c:type="RegressIntSet" introspectable="0">
<doc xml:whitespace="preserve">Compatibility typedef, like telepathy-glib's TpIntSet</doc>
<type name="Intset" c:type="RegressIntset"/>
@@ -963,6 +967,20 @@ TpAccount::status-changed</doc>
<type name="GObject.Object" c:type="GObject*"/>
</field>
</record>
+ <function name="aliased_caller_alloc"
+ c:identifier="regress_aliased_caller_alloc">
+ <return-value transfer-ownership="none">
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="boxed"
+ direction="out"
+ caller-allocates="1"
+ transfer-ownership="none">
+ <type name="AliasedTestBoxed" c:type="RegressAliasedTestBoxed*"/>
+ </parameter>
+ </parameters>
+ </function>
<function name="func_obj_null_in" c:identifier="regress_func_obj_null_in">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index faac481e..f9c4b371 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -2889,3 +2889,13 @@ void
regress_not_introspectable_via_alias (RegressVaListAlias ok)
{
}
+
+/**
+ * regress_aliased_caller_alloc:
+ * @boxed: (out):
+ */
+void regress_aliased_caller_alloc (RegressAliasedTestBoxed *boxed)
+{
+ boxed->priv = g_slice_new0 (RegressTestBoxedPrivate);
+ boxed->priv->magic = 0xdeadbeef;
+}
diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index 5f82bbce..2a3b3516 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -579,6 +579,15 @@ typedef va_list RegressVaListAlias;
void regress_not_introspectable_via_alias (RegressVaListAlias ok);
+/**
+ * RegressAliasedTestBoxed:
+ *
+ * Typedef TestBoxed to test caller-allocates correctness
+ */
+typedef RegressTestBoxed RegressAliasedTestBoxed;
+
+void regress_aliased_caller_alloc (RegressAliasedTestBoxed *boxed);
+
/* private testing */
typedef struct {