summaryrefslogtreecommitdiff
path: root/tests/scanner
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-08-13 09:35:10 -0400
committerColin Walters <walters@verbum.org>2011-08-13 09:38:27 -0400
commitbdeccbd7de9c1e42a879a6f9b01756280a138f47 (patch)
tree3c1e7af5e8f81386c73fe9db0280d8cbec97ac12 /tests/scanner
parentdead144faeeef4c0cd547ca287ede994745dbe7d (diff)
downloadgobject-introspection-bdeccbd7de9c1e42a879a6f9b01756280a138f47.tar.gz
annotationparser: Only accept certain tags
Previously we were eating any line form "* [A-Za-z]: " as a tag, but this is a problem since e.g. gtk/gtk/gtkcssprovder.c had literal CSS e.g. block: which erroneously matched. Fix this by only accepting particular tags, similar to what gtk-doc does (although we accept a superset, e.g. transfer too). https://bugzilla.gnome.org/show_bug.cgi?id=656458
Diffstat (limited to 'tests/scanner')
-rw-r--r--tests/scanner/Regress-1.0-expected.gir6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index 33ceeaec..8904d62a 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -862,7 +862,8 @@ case.</doc>
<type name="utf8" c:type="char*"/>
</field>
<glib:signal name="sig-with-array-prop">
- <doc xml:whitespace="preserve">This test signal is like TelepathyGlib's</doc>
+ <doc xml:whitespace="preserve">This test signal is like TelepathyGlib's
+TpChannel:: group-members-changed-detailed:</doc>
<return-value transfer-ownership="none">
<type name="none"/>
</return-value>
@@ -1908,7 +1909,8 @@ call and can be released on return.</doc>
</function>
<function name="test_ghash_nested_everything_return2"
c:identifier="regress_test_ghash_nested_everything_return2">
- <doc xml:whitespace="preserve">element-type annotation.</doc>
+ <doc xml:whitespace="preserve">Another way of specifying nested parameterized types: using the
+element-type annotation.</doc>
<return-value transfer-ownership="full">
<type name="GLib.HashTable" c:type="GHashTable*">
<type name="utf8"/>