diff options
| author | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2018-02-10 00:00:00 +0000 |
|---|---|---|
| committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2019-01-10 17:34:28 +0100 |
| commit | f606183a010fbec4382acb728882cc0eddbaf7f7 (patch) | |
| tree | a94577a1c4baff25753e78896d700cd71797437f /tests | |
| parent | 0b6bca5d69cc0f5e5564a2858f220fac8ee4789e (diff) | |
| download | gobject-introspection-f606183a010fbec4382acb728882cc0eddbaf7f7.tar.gz | |
Restore original meaning of disguised attribute.
> Certain types like GIConv and GdkAtom are pointers internally but don't
> look like pointers when referenced. They have the form.
>
> typedef struct _X *X;
>
> Parse these as structures/records but mark them in the gir with a 'disguised'
> attribute so that we know that they need special handling.
Additionally, stop relaying on disguised attribute when deciding whether
to render a page. Check number of fields instead, so as to avoid
introducing large regression in the docs.
Fixes #101.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scanner/Identfilter-1.0-expected.gir | 4 | ||||
| -rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 12 | ||||
| -rw-r--r-- | tests/scanner/Symbolfilter-1.0-expected.gir | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/tests/scanner/Identfilter-1.0-expected.gir b/tests/scanner/Identfilter-1.0-expected.gir index 15cd408a..c36da9f9 100644 --- a/tests/scanner/Identfilter-1.0-expected.gir +++ b/tests/scanner/Identfilter-1.0-expected.gir @@ -11,10 +11,10 @@ and/or use gtk-doc annotations. --> shared-library="" c:identifier-prefixes="Identfilter" c:symbol-prefixes="identfilter"> - <record name="Context" c:type="identfilter_t" disguised="1"> + <record name="Context" c:type="identfilter_t"> <source-position filename="identfilter.h" line="4"/> </record> - <record name="Object" c:type="identfilter_object_t" disguised="1"> + <record name="Object" c:type="identfilter_object_t"> <source-position filename="identfilter.h" line="5"/> <method name="foo_method" c:identifier="identfilter_object_foo_method"> <source-position filename="identfilter.h" line="8"/> diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 3053b907..37ef3109 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1411,7 +1411,6 @@ it says it's pointer but it's actually a string.</doc> </class> <record name="FooBufferClass" c:type="RegressFooBufferClass" - disguised="1" glib:is-gtype-struct-for="FooBuffer"> <source-position filename="foo.h" line="52"/> </record> @@ -2096,7 +2095,6 @@ uses a C sugar return type.</doc> </class> <record name="FooOtherObjectClass" c:type="RegressFooOtherObjectClass" - disguised="1" glib:is-gtype-struct-for="FooOtherObject"> <source-position filename="foo.h" line="54"/> </record> @@ -2221,9 +2219,7 @@ exposed to language bindings.</doc> <type name="gint" c:type="int"/> </field> </record> - <record name="FooStructPrivate" - c:type="RegressFooStructPrivate" - disguised="1"> + <record name="FooStructPrivate" c:type="RegressFooStructPrivate"> <source-position filename="foo.h" line="325"/> </record> <interface name="FooSubInterface" @@ -2487,7 +2483,7 @@ exposed to language bindings.</doc> <source-position filename="regress.h" line="520"/> <type name="gint" c:type="gint"/> </constant> - <record name="Intset" c:type="RegressIntset" disguised="1"> + <record name="Intset" c:type="RegressIntset"> <doc xml:space="preserve" filename="regress.h" line="1337">Like telepathy-glib's TpIntset.</doc> @@ -2818,9 +2814,7 @@ use it should be.</doc> </parameters> </method> </record> - <record name="TestBoxedPrivate" - c:type="RegressTestBoxedPrivate" - disguised="1"> + <record name="TestBoxedPrivate" c:type="RegressTestBoxedPrivate"> <source-position filename="regress.h" line="666"/> </record> <callback name="TestCallback" c:type="RegressTestCallback"> diff --git a/tests/scanner/Symbolfilter-1.0-expected.gir b/tests/scanner/Symbolfilter-1.0-expected.gir index 80fe0d4b..96c2231b 100644 --- a/tests/scanner/Symbolfilter-1.0-expected.gir +++ b/tests/scanner/Symbolfilter-1.0-expected.gir @@ -11,7 +11,7 @@ and/or use gtk-doc annotations. --> shared-library="" c:identifier-prefixes="Symbolfilter" c:symbol-prefixes="symbolfilter"> - <record name="Object" c:type="SymbolfilterObject" disguised="1"> + <record name="Object" c:type="SymbolfilterObject"> <source-position filename="symbolfilter.h" line="4"/> <method name="filterObjectFooMethod" c:identifier="SymbolfilterObjectFooMethod"> |