From f81c4974dbf48ac86997aa4e03af7b39b8428251 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 27 Oct 2016 14:14:03 +0900 Subject: [PATCH] Imported Upstream version 1.40.0 Change-Id: I6e6c80ad2941eec9e65ae63cd727bc0ce60078c6 Signed-off-by: DongHun Kwak --- Makefile-gir.am | 40 +- Makefile-giscanner.am | 9 + Makefile.in | 51 +- build/gi-introspection-msvc.mak | 15 +- build/win32/vs10/gi-install.props | 9 + build/win32/vs9/gi-install.vsprops | 9 + common.mk | 6 +- config.h.win32 | 6 +- configure | 22 +- configure.ac | 4 +- docs/reference/html/index.html | 2 +- docs/reference/version.xml | 2 +- gir/gio-2.0.c | 9 +- gir/glib-2.0.c | 107 +- girepository/giobjectinfo.c | 71 +- girepository/girparser.c | 41 +- girepository/gitypelib.c | 9 +- giscanner/ast.py | 10 +- giscanner/doctemplates/C/callback.tmpl | 4 + giscanner/doctemplates/C/field.tmpl | 1 + giscanner/doctemplates/C/function.tmpl | 17 +- giscanner/doctemplates/C/interface.tmpl | 2 + giscanner/doctemplates/Gjs/callback.tmpl | 27 + giscanner/doctemplates/Gjs/class.tmpl | 22 +- giscanner/doctemplates/Gjs/enum.tmpl | 8 + giscanner/doctemplates/Gjs/field.tmpl | 9 + giscanner/doctemplates/Gjs/function.tmpl | 25 +- giscanner/doctemplates/Gjs/interface.tmpl | 17 + giscanner/doctemplates/Gjs/property.tmpl | 7 +- giscanner/doctemplates/Gjs/signal.tmpl | 19 +- giscanner/doctemplates/Gjs/vfunc.tmpl | 14 +- giscanner/doctemplates/Python/callback.tmpl | 27 + giscanner/doctemplates/Python/class.tmpl | 9 +- giscanner/doctemplates/Python/field.tmpl | 1 + giscanner/doctemplates/Python/function.tmpl | 22 +- giscanner/doctemplates/Python/interface.tmpl | 16 + giscanner/doctemplates/Python/property.tmpl | 5 +- giscanner/doctemplates/Python/signal.tmpl | 13 +- giscanner/doctemplates/Python/vfunc.tmpl | 20 +- giscanner/doctemplates/base.tmpl | 29 +- giscanner/doctemplates/class.tmpl | 27 +- giscanner/doctemplates/namespace.tmpl | 11 +- giscanner/docwriter.py | 437 +++++- giscanner/dumper.py | 21 +- giscanner/girparser.py | 1 + giscanner/maintransformer.py | 48 +- giscanner/scannerlexer.l | 4 + giscanner/shlibs.py | 89 +- giscanner/utils.py | 29 +- gobject-introspection-1.0.pc | 2 +- gobject-introspection-1.0.pc.in | 4 +- gobject-introspection-no-export-1.0.pc | 2 +- gobject-introspection-no-export-1.0.pc.in | 4 +- scannerlexer.c | 1435 ++++++++++---------- tests/Makefile.in | 6 +- tests/offsets/Makefile.in | 6 +- tests/scanner/Makefile.in | 6 +- ...e => Regress.ANNOTATION_CALCULATED_DEFINE.page} | 21 +- .../Regress.ANNOTATION_CALCULATED_LARGE.page | 14 + .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 14 + .../Regress-1.0-C-expected/Regress.ATestError.page | 17 +- .../Regress.AliasedTestBoxed.page | 17 +- .../Regress.AnAnonymousUnion-None.page | 14 + .../Regress.AnAnonymousUnion-x.page | 14 + .../Regress.AnAnonymousUnion.page | 42 +- .../Regress.AnnotationBitfield.page | 21 +- .../Regress.AnnotationCallback.page | 35 +- .../Regress.AnnotationFields-arr.page | 14 + .../Regress.AnnotationFields-field1.page | 14 + .../Regress.AnnotationFields-len.page | 14 + .../Regress.AnnotationFields.page | 42 +- .../Regress.AnnotationForeachFunc.page | 45 +- .../Regress.AnnotationListCallback.page | 35 +- .../Regress.AnnotationNotifyFunc.page | 35 +- .../Regress.AnnotationObject-attribute-signal.page | 22 +- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 16 +- ...Regress.AnnotationObject-function-property.page | 15 +- .../Regress.AnnotationObject-list-signal.page | 20 +- .../Regress.AnnotationObject-parent_instance.page | 14 + .../Regress.AnnotationObject-string-property.page | 16 +- .../Regress.AnnotationObject-string-signal.page | 21 +- .../Regress.AnnotationObject-tab-property.page | 16 +- .../Regress.AnnotationObject.allow_none.page | 20 +- .../Regress.AnnotationObject.calleeowns.page | 22 +- .../Regress.AnnotationObject.calleesowns.page | 24 +- .../Regress.AnnotationObject.compute_sum.page | 20 +- .../Regress.AnnotationObject.compute_sum_n.page | 22 +- .../Regress.AnnotationObject.compute_sum_nz.page | 22 +- .../Regress.AnnotationObject.create_object.page | 20 +- .../Regress.AnnotationObject.do_not_use.page | 20 +- .../Regress.AnnotationObject.extra_annos.page | 16 +- .../Regress.AnnotationObject.foreach.page | 22 +- .../Regress.AnnotationObject.get_hash.page | 22 +- .../Regress.AnnotationObject.get_objects.page | 22 +- .../Regress.AnnotationObject.get_strings.page | 22 +- .../Regress.AnnotationObject.hidden_self.page | 18 +- .../Regress.AnnotationObject.in.page | 22 +- .../Regress.AnnotationObject.inout.page | 22 +- .../Regress.AnnotationObject.inout2.page | 22 +- .../Regress.AnnotationObject.inout3.page | 22 +- .../Regress.AnnotationObject.method.page | 20 +- .../Regress.AnnotationObject.notrans.page | 20 +- .../Regress.AnnotationObject.out.page | 22 +- .../Regress.AnnotationObject.page | 27 +- .../Regress.AnnotationObject.parse_args.page | 22 +- .../Regress.AnnotationObject.set_data.page | 22 +- .../Regress.AnnotationObject.set_data2.page | 22 +- .../Regress.AnnotationObject.set_data3.page | 24 +- .../Regress.AnnotationObject.string_out.page | 22 +- .../Regress.AnnotationObject.use_buffer.page | 18 +- .../Regress.AnnotationObject.watch.page | 42 +- .../Regress.AnnotationObject.watch_full.page | 75 - .../Regress.AnnotationObject.with_voidp.page | 18 +- ...Regress.AnnotationObjectClass-parent_class.page | 14 + .../Regress.AnnotationObjectClass.page | 42 +- .../Regress.AnnotationStruct-objects.page | 14 + .../Regress.AnnotationStruct.page | 42 +- .../Regress.BOOL_CONSTANT.page} | 21 +- .../Regress.DOUBLE_CONSTANT.page} | 21 +- .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 14 + .../Regress.FOO_PIE_IS_TASTY.page | 14 + .../Regress.FOO_SUCCESS_INT.page | 14 + .../Regress-1.0-C-expected/Regress.FooASingle.page | 17 +- .../Regress.FooAddressType.page | 17 +- .../Regress-1.0-C-expected/Regress.FooBRect-x.page | 14 + .../Regress-1.0-C-expected/Regress.FooBRect-y.page | 14 + .../Regress.FooBRect.add.page | 16 +- .../Regress.FooBRect.new.page | 16 +- .../Regress-1.0-C-expected/Regress.FooBRect.page | 42 +- .../Regress.FooBUnion-rect.page | 14 + .../Regress.FooBUnion-type.page | 14 + .../Regress.FooBUnion-v.page | 14 + .../Regress.FooBUnion.get_contained_type.page | 16 +- .../Regress.FooBUnion.new.page | 16 +- .../Regress-1.0-C-expected/Regress.FooBUnion.page | 42 +- .../Regress.FooBoxed.method.page | 16 +- .../Regress.FooBoxed.new.page | 16 +- .../Regress-1.0-C-expected/Regress.FooBoxed.page | 42 +- .../Regress-1.0-C-expected/Regress.FooBuffer.page | 27 +- .../Regress.FooBuffer.some_method.page | 16 +- .../Regress.FooBufferClass.page | 35 + .../Regress.FooCallback.page | 45 +- .../Regress.FooDBusData.method.page | 16 +- .../Regress.FooDBusData.page | 42 +- .../Regress.FooEnumFullname.page | 17 +- .../Regress.FooEnumNoType.page | 17 +- .../Regress.FooEnumType.method.page | 18 +- .../Regress.FooEnumType.page | 17 +- .../Regress.FooEnumType.returnv.page | 18 +- .../Regress-1.0-C-expected/Regress.FooError.page | 17 +- .../Regress.FooError.quark.page | 18 +- .../Regress.FooEvent-any.page | 14 + .../Regress.FooEvent-expose.page | 14 + .../Regress.FooEvent-type.page | 14 + .../Regress-1.0-C-expected/Regress.FooEvent.page | 42 +- .../Regress.FooEventAny-send_event.page | 14 + .../Regress.FooEventAny.page | 42 +- .../Regress.FooEventExpose-count.page | 14 + .../Regress.FooEventExpose-send_event.page | 14 + .../Regress.FooEventExpose.page | 42 +- .../Regress.FooFlagsNoType.page | 21 +- .../Regress.FooFlagsType.page | 21 +- .../Regress.FooForeignStruct-regress_foo.page | 14 + .../Regress.FooForeignStruct.copy.page | 16 +- .../Regress.FooForeignStruct.new.page | 16 +- .../Regress.FooForeignStruct.page | 42 +- .../Regress.FooInterface-do_regress_foo.page | 16 +- .../Regress.FooInterface.do_regress_foo.page | 16 +- .../Regress.FooInterface.page | 41 +- .../Regress.FooInterface.static_method.page | 16 +- .../Regress.FooInterfaceIface-do_regress_foo.page | 14 + .../Regress.FooInterfaceIface-parent_iface.page | 14 + .../Regress.FooInterfaceIface.do_regress_foo.page | 40 +- .../Regress.FooInterfaceIface.page | 42 +- .../Regress.FooObject-hidden.page | 15 +- .../Regress.FooObject-parent_instance.page | 14 + .../Regress.FooObject-read_fn.page | 22 +- .../Regress.FooObject-signal.page | 16 +- .../Regress.FooObject-some_int.page | 14 + .../Regress.FooObject-string.page | 15 +- .../Regress.FooObject-virtual_method.page | 16 +- .../Regress.FooObject.a_global_method.page | 16 +- .../Regress.FooObject.append_new_stack_layer.page | 16 +- .../Regress.FooObject.dup_name.page | 16 +- .../Regress.FooObject.external_type.page | 20 +- .../Regress.FooObject.get_default.page | 20 +- .../Regress.FooObject.get_name.page | 16 +- .../Regress.FooObject.handle_glyph.page | 16 +- .../Regress.FooObject.is_it_time_yet.page | 16 +- .../Regress.FooObject.new.page | 16 +- .../Regress.FooObject.new_as_super.page | 16 +- .../Regress.FooObject.new_cookie.page | 16 +- .../Regress-1.0-C-expected/Regress.FooObject.page | 27 +- .../Regress.FooObject.read.page | 22 +- .../Regress.FooObject.skipped_method.page | 18 +- .../Regress.FooObject.static_meth.page | 16 +- .../Regress.FooObject.take_all.page | 16 +- .../Regress.FooObject.various.page | 16 +- .../Regress.FooObject.virtual_method.page | 16 +- .../Regress.FooObjectClass-_reserved.page | 14 + .../Regress.FooObjectClass-parent_class.page | 14 + .../Regress.FooObjectClass-read_fn.page | 14 + .../Regress.FooObjectClass-virtual_method.page | 14 + .../Regress.FooObjectClass.page | 42 +- .../Regress.FooObjectClass.read_fn.page | 45 +- .../Regress.FooObjectClass.virtual_method.page | 40 +- .../Regress.FooObjectCookie.page | 17 +- .../Regress.FooOtherObject.page | 27 +- .../Regress.FooOtherObjectClass.page | 35 + .../Regress.FooRectangle-height.page | 14 + .../Regress.FooRectangle-width.page | 14 + .../Regress.FooRectangle-x.page | 14 + .../Regress.FooRectangle-y.page | 14 + .../Regress.FooRectangle.add.page | 20 +- .../Regress.FooRectangle.new.page | 18 +- .../Regress.FooRectangle.page | 42 +- .../Regress.FooSkippable.page | 17 +- .../Regress.FooStackLayer.page | 17 +- .../Regress.FooStruct-member.page | 14 + .../Regress.FooStruct-priv.page | 14 + .../Regress-1.0-C-expected/Regress.FooStruct.page | 42 +- .../Regress.FooStructPrivate.page | 35 + .../Regress.FooSubInterface-destroy-event.page | 16 +- .../Regress.FooSubInterface-destroy_event.page | 16 +- .../Regress.FooSubInterface-do_bar.page | 16 +- .../Regress.FooSubInterface-do_baz.page | 16 +- .../Regress.FooSubInterface.do_bar.page | 16 +- .../Regress.FooSubInterface.do_baz.page | 16 +- .../Regress.FooSubInterface.page | 41 +- ...Regress.FooSubInterfaceIface-destroy_event.page | 14 + .../Regress.FooSubInterfaceIface-do_bar.page | 14 + .../Regress.FooSubInterfaceIface-do_baz.page | 14 + .../Regress.FooSubInterfaceIface-parent_iface.page | 14 + ...Regress.FooSubInterfaceIface.destroy_event.page | 35 +- .../Regress.FooSubInterfaceIface.do_bar.page | 35 +- .../Regress.FooSubInterfaceIface.do_baz.page | 45 +- .../Regress.FooSubInterfaceIface.page | 42 +- .../Regress.FooSubobject-parent_instance.page | 14 + .../Regress.FooSubobject.new.page | 16 +- .../Regress.FooSubobject.page | 27 +- .../Regress.FooSubobjectClass-parent_class.page | 14 + .../Regress.FooSubobjectClass.page | 42 +- .../Regress.FooThingWithArray-data.page | 14 + .../Regress.FooThingWithArray-lines.page | 14 + .../Regress.FooThingWithArray-x.page | 14 + .../Regress.FooThingWithArray-y.page | 14 + .../Regress.FooThingWithArray.page | 42 +- .../Regress.FooUnion-regress_foo.page | 14 + .../Regress-1.0-C-expected/Regress.FooUnion.page | 42 +- .../Regress.FooUtilityStruct-bar.page | 14 + .../Regress.FooUtilityStruct.page | 42 +- .../Regress.FooVarargsCallback.page | 40 +- .../Regress-1.0-C-expected/Regress.FooXEvent.page | 17 +- .../Regress.GI_SCANNER_ELSE.page | 14 + .../Regress.GI_SCANNER_IFDEF.page | 14 + .../Regress.GUINT64_CONSTANT.page | 14 + .../Regress.GUINT64_CONSTANTA.page | 14 + .../Regress.G_GINT64_CONSTANT.page | 14 + .../Regress.INT_CONSTANT.page | 14 + .../Regress-1.0-C-expected/Regress.IntSet.page | 17 +- .../Regress-1.0-C-expected/Regress.Intset.page | 35 + .../Regress.LONG_STRING_CONSTANT.page | 14 + ....LikeGnomeKeyringPasswordSchema-attributes.page | 16 + ...gress.LikeGnomeKeyringPasswordSchema-dummy.page | 16 + ...ress.LikeGnomeKeyringPasswordSchema-dummy2.page | 16 + .../Regress.LikeGnomeKeyringPasswordSchema.page | 42 +- .../Regress.LikeXklConfigItem-name.page | 14 + .../Regress.LikeXklConfigItem.page | 42 +- .../Regress.LikeXklConfigItem.set_name.page | 16 +- .../Regress-1.0-C-expected/Regress.MAXUINT64.page | 14 + .../Regress-1.0-C-expected/Regress.MININT64.page | 14 + .../Regress.Mixed_Case_Constant.page | 14 + .../Regress.NEGATIVE_INT_CONSTANT.page | 14 + .../Regress.PtrArrayAlias.page | 17 +- .../Regress.STRING_CONSTANT.page | 14 + .../Regress.SkippedStructure-v.page | 14 + .../Regress.SkippedStructure-x.page | 14 + .../Regress.SkippedStructure.page | 42 +- .../Regress.TestABCError.page | 17 +- .../Regress.TestABCError.quark.page | 18 +- .../Regress.TestBoxed-nested_a.page | 14 + .../Regress.TestBoxed-priv.page | 14 + .../Regress.TestBoxed-some_int8.page | 14 + .../Regress.TestBoxed.copy.page | 16 +- .../Regress.TestBoxed.equals.page | 16 +- .../Regress.TestBoxed.new.page | 16 +- ...ess.TestBoxed.new_alternative_constructor1.page | 16 +- ...ess.TestBoxed.new_alternative_constructor2.page | 16 +- ...ess.TestBoxed.new_alternative_constructor3.page | 16 +- .../Regress-1.0-C-expected/Regress.TestBoxed.page | 42 +- .../Regress.TestBoxedB-some_int8.page | 14 + .../Regress.TestBoxedB-some_long.page | 14 + .../Regress.TestBoxedB.copy.page | 16 +- .../Regress.TestBoxedB.new.page | 16 +- .../Regress-1.0-C-expected/Regress.TestBoxedB.page | 42 +- .../Regress.TestBoxedC-another_thing.page | 14 + .../Regress.TestBoxedC-refcount.page | 14 + .../Regress.TestBoxedC.new.page | 16 +- .../Regress-1.0-C-expected/Regress.TestBoxedC.page | 42 +- .../Regress.TestBoxedD.copy.page | 16 +- .../Regress.TestBoxedD.free.page | 16 +- .../Regress.TestBoxedD.get_magic.page | 16 +- .../Regress.TestBoxedD.new.page | 16 +- .../Regress-1.0-C-expected/Regress.TestBoxedD.page | 42 +- .../Regress.TestBoxedPrivate.page | 35 + .../Regress.TestCallback.page | 31 +- .../Regress.TestCallbackArray.page | 50 +- .../Regress.TestCallbackFull.page | 45 +- .../Regress.TestCallbackGError.page | 35 +- .../Regress.TestCallbackHashtable.page | 35 +- .../Regress.TestCallbackOwnedGError.page | 35 +- .../Regress.TestCallbackUserData.page | 35 +- .../Regress.TestDEFError.page | 17 +- .../Regress-1.0-C-expected/Regress.TestEnum.page | 17 +- .../Regress.TestEnum.param.page | 18 +- .../Regress.TestEnumNoGEnum.page | 17 +- .../Regress.TestEnumUnsigned.page | 17 +- .../Regress-1.0-C-expected/Regress.TestError.page | 17 +- .../Regress.TestError.quark.page | 18 +- .../Regress.TestExternallyDefinedCallback.page | 33 + .../Regress-1.0-C-expected/Regress.TestFlags.page | 21 +- .../Regress.TestFloating-parent_instance.page | 14 + .../Regress.TestFloating.new.page | 18 +- .../Regress.TestFloating.page | 27 +- .../Regress.TestFloatingClass-parent_class.page | 14 + .../Regress.TestFloatingClass.page | 42 +- .../Regress.TestFundamentalObject-copy.page | 28 + .../Regress.TestFundamentalObject-finalize.page | 28 + .../Regress.TestFundamentalObject-flags.page | 14 + .../Regress.TestFundamentalObject-instance.page | 14 + .../Regress.TestFundamentalObject-refcount.page | 14 + .../Regress.TestFundamentalObject.page | 27 +- .../Regress.TestFundamentalObject.ref.page | 18 +- .../Regress.TestFundamentalObject.unref.page | 16 +- .../Regress.TestFundamentalObjectClass-copy.page | 14 + ...egress.TestFundamentalObjectClass-finalize.page | 14 + ...ress.TestFundamentalObjectClass-type_class.page | 14 + .../Regress.TestFundamentalObjectClass.page | 42 +- .../Regress.TestFundamentalObjectCopyFunction.page | 35 +- ...ress.TestFundamentalObjectFinalizeFunction.page | 35 +- .../Regress.TestFundamentalSubObject-data.page | 14 + ...estFundamentalSubObject-fundamental_object.page | 14 + .../Regress.TestFundamentalSubObject.new.page | 16 +- .../Regress.TestFundamentalSubObject.page | 27 +- ...talSubObjectClass-fundamental_object_class.page | 14 + .../Regress.TestFundamentalSubObjectClass.page | 42 +- ...egress.TestInheritDrawable-parent_instance.page | 14 + .../Regress.TestInheritDrawable.do_foo.page | 16 +- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 16 +- .../Regress.TestInheritDrawable.get_origin.page | 16 +- .../Regress.TestInheritDrawable.get_size.page | 16 +- .../Regress.TestInheritDrawable.page | 27 +- ...ress.TestInheritDrawableClass-parent_class.page | 14 + .../Regress.TestInheritDrawableClass.page | 42 +- ....TestInheritPixmapObjectClass-parent_class.page | 14 + .../Regress.TestInheritPixmapObjectClass.page | 42 +- .../Regress.TestInterface.page | 41 +- .../Regress.TestInterfaceIface-base_iface.page | 14 + .../Regress.TestInterfaceIface.page | 42 +- .../Regress.TestObj-all.page | 16 +- .../Regress.TestObj-allow_none_vfunc.page | 18 +- .../Regress.TestObj-bare.page | 15 +- .../Regress.TestObj-boxed.page | 15 +- .../Regress.TestObj-cleanup.page | 16 +- .../Regress.TestObj-complex_vfunc.page | 33 + .../Regress.TestObj-double.page | 15 +- .../Regress.TestObj-first.page | 16 +- .../Regress.TestObj-float.page | 15 +- .../Regress.TestObj-function_ptr.page | 14 + .../Regress.TestObj-gtype.page | 15 +- .../Regress.TestObj-hash-table-old.page | 15 +- .../Regress.TestObj-hash-table.page | 15 +- .../Regress.TestObj-hash_table.page | 14 + .../Regress.TestObj-int.page | 15 +- .../Regress.TestObj-list-old.page | 15 +- .../Regress.TestObj-list.page | 15 +- .../Regress.TestObj-matrix.page | 22 +- .../Regress.TestObj-parent_instance.page | 14 + .../Regress.TestObj-sig-with-array-len-prop.page | 20 +- .../Regress.TestObj-sig-with-array-prop.page | 20 +- .../Regress.TestObj-sig-with-foreign-struct.page | 18 +- .../Regress.TestObj-sig-with-hash-prop.page | 18 +- .../Regress.TestObj-sig-with-int64-prop.page | 20 +- .../Regress.TestObj-sig-with-intarray-ret.page | 18 +- .../Regress.TestObj-sig-with-obj.page | 20 +- .../Regress.TestObj-sig-with-strv.page | 18 +- .../Regress.TestObj-sig-with-uint64-prop.page | 20 +- .../Regress.TestObj-some_double.page | 14 + .../Regress.TestObj-some_float.page | 14 + .../Regress.TestObj-some_int8.page | 14 + .../Regress.TestObj-string.page | 15 +- ...Regress.TestObj-test-with-static-scope-arg.page | 16 +- .../Regress.TestObj-test.page | 16 +- .../Regress.TestObj.constructor.page | 16 +- .../Regress.TestObj.do_matrix.page | 22 +- ...gress.TestObj.emit_sig_with_foreign_struct.page | 16 +- .../Regress.TestObj.emit_sig_with_int64.page | 16 +- .../Regress.TestObj.emit_sig_with_obj.page | 16 +- .../Regress.TestObj.emit_sig_with_uint64.page | 16 +- .../Regress.TestObj.forced_method.page | 18 +- .../Regress.TestObj.function_ptr.page | 24 + .../Regress.TestObj.instance_method.page | 16 +- .../Regress.TestObj.instance_method_callback.page | 16 +- .../Regress.TestObj.new.page | 18 +- .../Regress.TestObj.new_callback.page | 16 +- .../Regress.TestObj.new_from_file.page | 16 +- .../Regress.TestObj.null_out.page | 18 +- .../Regress-1.0-C-expected/Regress.TestObj.page | 27 +- .../Regress.TestObj.set_bare.page | 16 +- .../Regress.TestObj.skip_inout_param.page | 34 +- .../Regress.TestObj.skip_out_param.page | 34 +- .../Regress.TestObj.skip_param.page | 34 +- .../Regress.TestObj.skip_return_val.page | 34 +- .../Regress.TestObj.skip_return_val_no_out.page | 24 +- .../Regress.TestObj.static_method.page | 16 +- .../Regress.TestObj.static_method_callback.page | 16 +- .../Regress.TestObj.torture_signature_0.page | 18 +- .../Regress.TestObj.torture_signature_1.page | 18 +- .../Regress.TestObjClass-_regress_reserved1.page | 14 + .../Regress.TestObjClass-_regress_reserved2.page | 14 + .../Regress.TestObjClass-allow_none_vfunc.page | 14 + .../Regress.TestObjClass-complex_vfunc.page | 14 + .../Regress.TestObjClass-matrix.page | 14 + .../Regress.TestObjClass-parent_class.page | 14 + .../Regress.TestObjClass-test_signal.page | 14 + ...ObjClass-test_signal_with_static_scope_arg.page | 14 + .../Regress.TestObjClass._regress_reserved1.page | 31 +- .../Regress.TestObjClass._regress_reserved2.page | 31 +- .../Regress.TestObjClass.allow_none_vfunc.page | 40 +- .../Regress.TestObjClass.matrix.page | 40 +- .../Regress.TestObjClass.page | 42 +- .../Regress.TestOtherError.page | 17 +- .../Regress.TestOtherError.quark.page | 18 +- .../Regress.TestPrivateEnum.page | 21 +- ...ess.TestPrivateStruct-this_is_public_after.page | 14 + ...ss.TestPrivateStruct-this_is_public_before.page | 14 + .../Regress.TestPrivateStruct.page | 42 +- .../Regress.TestReferenceEnum.page | 17 +- .../Regress.TestSimpleBoxedA-some_double.page | 14 + .../Regress.TestSimpleBoxedA-some_enum.page | 14 + .../Regress.TestSimpleBoxedA-some_int.page | 14 + .../Regress.TestSimpleBoxedA-some_int8.page | 14 + .../Regress.TestSimpleBoxedA.const_return.page | 16 +- .../Regress.TestSimpleBoxedA.copy.page | 16 +- .../Regress.TestSimpleBoxedA.equals.page | 16 +- .../Regress.TestSimpleBoxedA.page | 42 +- .../Regress.TestSimpleBoxedB-nested_a.page | 14 + .../Regress.TestSimpleBoxedB-some_int8.page | 14 + .../Regress.TestSimpleBoxedB.copy.page | 16 +- .../Regress.TestSimpleBoxedB.page | 42 +- .../Regress.TestSimpleCallback.page | 31 +- .../Regress.TestStructA-some_double.page | 14 + .../Regress.TestStructA-some_enum.page | 14 + .../Regress.TestStructA-some_int.page | 14 + .../Regress.TestStructA-some_int8.page | 14 + .../Regress.TestStructA.clone.page | 20 +- .../Regress.TestStructA.page | 42 +- .../Regress.TestStructA.parse.page | 20 +- .../Regress.TestStructB-nested_a.page | 14 + .../Regress.TestStructB-some_int8.page | 14 + .../Regress.TestStructB.clone.page | 20 +- .../Regress.TestStructB.page | 42 +- .../Regress.TestStructC-another_int.page | 14 + .../Regress.TestStructC-obj.page | 14 + .../Regress.TestStructC.page | 42 +- .../Regress.TestStructD-array1.page | 14 + .../Regress.TestStructD-array2.page | 14 + .../Regress.TestStructD-field.page | 14 + .../Regress.TestStructD-garray.page | 14 + .../Regress.TestStructD-list.page | 14 + .../Regress.TestStructD.page | 42 +- .../Regress.TestStructE-some_type.page | 14 + .../Regress.TestStructE-some_union.page | 14 + .../Regress.TestStructE.page | 42 +- ...ss.TestStructE__some_union__union-v_double.page | 16 + ...ess.TestStructE__some_union__union-v_float.page | 16 + ...gress.TestStructE__some_union__union-v_int.page | 16 + ...ess.TestStructE__some_union__union-v_int64.page | 16 + ...ress.TestStructE__some_union__union-v_long.page | 16 + ...s.TestStructE__some_union__union-v_pointer.page | 16 + ...ress.TestStructE__some_union__union-v_uint.page | 16 + ...ss.TestStructE__some_union__union-v_uint64.page | 16 + ...ess.TestStructE__some_union__union-v_ulong.page | 16 + .../Regress.TestStructE__some_union__union.page | 42 +- .../Regress.TestStructF-data1.page | 14 + .../Regress.TestStructF-data2.page | 14 + .../Regress.TestStructF-data3.page | 14 + .../Regress.TestStructF-data4.page | 14 + .../Regress.TestStructF-data5.page | 14 + .../Regress.TestStructF-data6.page | 14 + .../Regress.TestStructF-ref_count.page | 14 + .../Regress.TestStructF.page | 42 +- .../Regress.TestStructFixedArray-array.page | 14 + .../Regress.TestStructFixedArray-just_int.page | 14 + .../Regress.TestStructFixedArray.frob.page | 16 +- .../Regress.TestStructFixedArray.page | 42 +- .../Regress.TestSubObj-parent_instance.page | 14 + .../Regress.TestSubObj.instance_method.page | 16 +- .../Regress.TestSubObj.new.page | 16 +- .../Regress-1.0-C-expected/Regress.TestSubObj.page | 27 +- .../Regress.TestSubObj.unset_bare.page | 16 +- .../Regress.TestSubObjClass-parent_class.page | 14 + .../Regress.TestSubObjClass.page | 42 +- .../Regress.TestTypeGUInt64.page | 17 +- .../Regress.TestWi8021x-parent_instance.page | 14 + .../Regress.TestWi8021x-testbool.page | 15 +- .../Regress.TestWi8021x.get_testbool.page | 16 +- .../Regress.TestWi8021x.new.page | 16 +- .../Regress.TestWi8021x.page | 27 +- .../Regress.TestWi8021x.set_testbool.page | 16 +- .../Regress.TestWi8021x.static_method.page | 16 +- .../Regress.TestWi8021xClass-parent_class.page | 14 + .../Regress.TestWi8021xClass.page | 42 +- .../Regress.UTF8_CONSTANT.page | 14 + .../Regress.VaListAlias.page | 17 +- .../Regress.aliased_caller_alloc.page | 16 +- .../Regress.annotation_attribute_func.page | 22 +- .../Regress.annotation_custom_destroy.page | 20 +- .../Regress.annotation_get_source_file.page | 18 +- .../Regress.annotation_init.page | 20 +- ...ress.annotation_invalid_regress_annotation.page | 18 +- .../Regress.annotation_ptr_array.page | 18 +- .../Regress.annotation_return_array.page | 20 +- .../Regress.annotation_return_filename.page | 18 +- .../Regress.annotation_set_source_file.page | 18 +- ...s.annotation_space_after_comment_bug631690.page | 16 +- .../Regress.annotation_string_array_length.page | 16 +- .../Regress.annotation_string_zero_terminated.page | 18 +- ...ress.annotation_string_zero_terminated_out.page | 16 +- .../Regress.annotation_test_parsing_bug630862.page | 18 +- .../Regress.annotation_transfer_floating.page | 18 +- .../Regress.annotation_versioned.page | 17 +- .../Regress.atest_error_quark.page | 16 +- .../Regress.foo_async_ready_callback.page | 16 +- .../Regress.foo_destroy_notify_callback.page | 16 +- .../Regress-1.0-C-expected/Regress.foo_init.page | 16 +- .../Regress.foo_method_external_references.page | 16 +- .../Regress.foo_not_a_constructor_new.page | 18 +- .../Regress.foo_skip_me.page | 20 +- .../Regress.foo_some_variant.page | 16 +- .../Regress.foo_some_variant_ptr.page | 16 +- .../Regress.foo_test_array.page | 16 +- .../Regress.foo_test_const_char_param.page | 16 +- .../Regress.foo_test_const_char_retval.page | 16 +- .../Regress.foo_test_const_struct_param.page | 16 +- .../Regress.foo_test_const_struct_retval.page | 16 +- .../Regress.foo_test_string_array.page | 16 +- .../Regress.foo_test_string_array_with_g.page | 16 +- .../Regress.foo_test_unsigned_qualifier.page | 16 +- .../Regress.foo_test_unsigned_type.page | 16 +- .../Regress.foo_test_varargs_callback.page | 16 +- .../Regress.foo_test_varargs_callback2.page | 16 +- .../Regress.foo_test_varargs_callback3.page | 16 +- .../Regress.func_obj_null_in.page | 18 +- .../Regress.global_get_flags_out.page | 18 +- .../Regress.has_parameter_named_attrs.page | 22 +- .../Regress.introspectable_via_alias.page | 16 +- .../Regress.not_introspectable_via_alias.page | 16 +- ...ess.random_function_with_skipped_structure.page | 16 +- .../Regress.set_abort_on_error.page | 16 +- .../Regress.test_array_callback.page | 16 +- .../Regress.test_array_fixed_out_objects.page | 18 +- .../Regress.test_array_fixed_size_int_in.page | 20 +- .../Regress.test_array_fixed_size_int_out.page | 18 +- .../Regress.test_array_fixed_size_int_return.page | 18 +- .../Regress.test_array_gint16_in.page | 18 +- .../Regress.test_array_gint32_in.page | 18 +- .../Regress.test_array_gint64_in.page | 18 +- .../Regress.test_array_gint8_in.page | 18 +- .../Regress.test_array_gtype_in.page | 20 +- .../Regress.test_array_int_full_out.page | 20 +- .../Regress.test_array_int_in.page | 18 +- .../Regress.test_array_int_inout.page | 20 +- .../Regress.test_array_int_none_out.page | 20 +- .../Regress.test_array_int_null_in.page | 18 +- .../Regress.test_array_int_null_out.page | 18 +- .../Regress.test_array_int_out.page | 20 +- .../Regress.test_async_ready_callback.page | 16 +- .../Regress.test_boolean.page | 16 +- .../Regress.test_boolean_false.page | 16 +- .../Regress.test_boolean_true.page | 16 +- .../Regress.test_boxeds_not_a_method.page | 38 + .../Regress.test_boxeds_not_a_static.page | 30 + .../Regress.test_cairo_context_full_return.page | 16 +- .../Regress.test_cairo_context_none_in.page | 16 +- .../Regress.test_cairo_surface_full_out.page | 16 +- .../Regress.test_cairo_surface_full_return.page | 16 +- .../Regress.test_cairo_surface_none_in.page | 16 +- .../Regress.test_cairo_surface_none_return.page | 16 +- .../Regress.test_callback.page | 16 +- .../Regress.test_callback_async.page | 16 +- .../Regress.test_callback_destroy_notify.page | 18 +- ....test_callback_destroy_notify_no_user_data.page | 18 +- .../Regress.test_callback_thaw_async.page | 16 +- .../Regress.test_callback_thaw_notifications.page | 20 +- .../Regress.test_callback_user_data.page | 18 +- .../Regress.test_closure.page | 16 +- .../Regress.test_closure_one_arg.page | 16 +- .../Regress.test_closure_variant.page | 22 +- .../Regress.test_date_in_gvalue.page | 16 +- .../Regress.test_def_error_quark.page | 16 +- .../Regress.test_double.page | 16 +- .../Regress.test_filename_return.page | 18 +- .../Regress-1.0-C-expected/Regress.test_float.page | 16 +- .../Regress.test_garray_container_return.page | 16 +- .../Regress.test_garray_full_return.page | 16 +- .../Regress.test_gerror_callback.page | 16 +- .../Regress.test_ghash_container_return.page | 16 +- .../Regress.test_ghash_everything_return.page | 16 +- .../Regress.test_ghash_gvalue_in.page | 18 +- .../Regress.test_ghash_gvalue_return.page | 16 +- ...egress.test_ghash_nested_everything_return.page | 16 +- ...gress.test_ghash_nested_everything_return2.page | 18 +- .../Regress.test_ghash_nothing_in.page | 16 +- .../Regress.test_ghash_nothing_in2.page | 16 +- .../Regress.test_ghash_nothing_return.page | 16 +- .../Regress.test_ghash_nothing_return2.page | 16 +- .../Regress.test_ghash_null_in.page | 16 +- .../Regress.test_ghash_null_out.page | 16 +- .../Regress.test_ghash_null_return.page | 16 +- .../Regress.test_glist_container_return.page | 16 +- .../Regress.test_glist_everything_return.page | 16 +- .../Regress.test_glist_nothing_in.page | 16 +- .../Regress.test_glist_nothing_in2.page | 16 +- .../Regress.test_glist_nothing_return.page | 16 +- .../Regress.test_glist_nothing_return2.page | 16 +- .../Regress.test_glist_null_in.page | 16 +- .../Regress.test_glist_null_out.page | 16 +- .../Regress.test_gslist_container_return.page | 16 +- .../Regress.test_gslist_everything_return.page | 16 +- .../Regress.test_gslist_nothing_in.page | 16 +- .../Regress.test_gslist_nothing_in2.page | 16 +- .../Regress.test_gslist_nothing_return.page | 16 +- .../Regress.test_gslist_nothing_return2.page | 16 +- .../Regress.test_gslist_null_in.page | 16 +- .../Regress.test_gslist_null_out.page | 16 +- .../Regress-1.0-C-expected/Regress.test_gtype.page | 16 +- .../Regress.test_gvariant_as.page | 18 +- .../Regress.test_gvariant_asv.page | 18 +- .../Regress.test_gvariant_i.page | 18 +- .../Regress.test_gvariant_s.page | 18 +- .../Regress.test_gvariant_v.page | 18 +- .../Regress.test_hash_table_callback.page | 18 +- .../Regress-1.0-C-expected/Regress.test_int.page | 16 +- .../Regress-1.0-C-expected/Regress.test_int16.page | 16 +- .../Regress-1.0-C-expected/Regress.test_int32.page | 16 +- .../Regress-1.0-C-expected/Regress.test_int64.page | 16 +- .../Regress-1.0-C-expected/Regress.test_int8.page | 16 +- .../Regress.test_int_out_utf8.page | 16 +- .../Regress.test_int_value_arg.page | 16 +- .../Regress-1.0-C-expected/Regress.test_long.page | 16 +- .../Regress.test_multi_callback.page | 16 +- .../Regress.test_multi_double_args.page | 16 +- .../Regress.test_multiline_doc_comments.page | 16 +- .../Regress.test_nested_parameter.page | 22 +- .../Regress.test_null_gerror_callback.page | 16 +- .../Regress.test_owned_gerror_callback.page | 16 +- .../Regress-1.0-C-expected/Regress.test_short.page | 16 +- .../Regress.test_simple_callback.page | 16 +- .../Regress-1.0-C-expected/Regress.test_size.page | 16 +- .../Regress.test_skip_unannotated_callback.page | 20 +- .../Regress-1.0-C-expected/Regress.test_ssize.page | 16 +- .../Regress.test_strv_in.page | 16 +- .../Regress.test_strv_in_gvalue.page | 16 +- .../Regress.test_strv_out.page | 16 +- .../Regress.test_strv_out_c.page | 16 +- .../Regress.test_strv_out_container.page | 16 +- .../Regress.test_strv_outarg.page | 16 +- .../Regress-1.0-C-expected/Regress.test_timet.page | 16 +- .../Regress.test_torture_signature_0.page | 16 +- .../Regress.test_torture_signature_1.page | 16 +- .../Regress.test_torture_signature_2.page | 16 +- .../Regress-1.0-C-expected/Regress.test_uint.page | 16 +- .../Regress.test_uint16.page | 16 +- .../Regress.test_uint32.page | 16 +- .../Regress.test_uint64.page | 16 +- .../Regress-1.0-C-expected/Regress.test_uint8.page | 16 +- .../Regress-1.0-C-expected/Regress.test_ulong.page | 16 +- .../Regress.test_unichar.page | 16 +- .../Regress.test_unsigned_enum_param.page | 16 +- .../Regress.test_ushort.page | 16 +- .../Regress.test_utf8_const_in.page | 16 +- .../Regress.test_utf8_const_return.page | 18 +- .../Regress.test_utf8_inout.page | 16 +- .../Regress.test_utf8_nonconst_return.page | 18 +- .../Regress.test_utf8_null_in.page | 16 +- .../Regress.test_utf8_null_out.page | 16 +- .../Regress.test_utf8_out.page | 16 +- .../Regress.test_utf8_out_nonconst_return.page | 20 +- .../Regress.test_utf8_out_out.page | 20 +- .../Regress.test_value_get_fundamental_object.page | 16 +- .../Regress.test_value_return.page | 20 +- .../Regress.test_value_set_fundamental_object.page | 16 +- .../Regress.test_versioning.page | 17 +- tests/scanner/Regress-1.0-C-expected/index.page | 18 +- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 14 + .../Regress.ANNOTATION_CALCULATED_LARGE.page | 14 + .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 14 + .../Regress.ATestError.page | 24 +- .../Regress.AliasedTestBoxed.page | 17 +- .../Regress.AnAnonymousUnion-x.page | 18 + .../Regress.AnAnonymousUnion.page | 47 +- .../Regress.AnnotationBitfield.page | 36 +- .../Regress.AnnotationCallback.page | 34 +- .../Regress.AnnotationFields-arr.page | 18 + .../Regress.AnnotationFields-field1.page | 18 + .../Regress.AnnotationFields-len.page | 18 + .../Regress.AnnotationFields.page | 49 +- .../Regress.AnnotationForeachFunc.page | 34 +- .../Regress.AnnotationListCallback.page | 34 +- .../Regress.AnnotationNotifyFunc.page | 26 +- .../Regress.AnnotationObject-attribute-signal.page | 26 +- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 20 +- ...Regress.AnnotationObject-function-property.page | 21 +- .../Regress.AnnotationObject-list-signal.page | 24 +- .../Regress.AnnotationObject-string-property.page | 24 +- .../Regress.AnnotationObject-string-signal.page | 25 +- .../Regress.AnnotationObject-tab-property.page | 24 +- .../Regress.AnnotationObject.allow_none.page | 20 +- .../Regress.AnnotationObject.calleeowns.page | 28 +- .../Regress.AnnotationObject.calleesowns.page | 32 +- .../Regress.AnnotationObject.compute_sum.page | 22 +- .../Regress.AnnotationObject.compute_sum_n.page | 22 +- .../Regress.AnnotationObject.compute_sum_nz.page | 22 +- .../Regress.AnnotationObject.create_object.page | 20 +- .../Regress.AnnotationObject.do_not_use.page | 20 +- .../Regress.AnnotationObject.extra_annos.page | 20 +- .../Regress.AnnotationObject.foreach.page | 20 +- .../Regress.AnnotationObject.get_hash.page | 22 +- .../Regress.AnnotationObject.get_objects.page | 24 +- .../Regress.AnnotationObject.get_strings.page | 24 +- .../Regress.AnnotationObject.hidden_self.page | 20 +- .../Regress.AnnotationObject.in.page | 26 +- .../Regress.AnnotationObject.inout.page | 32 +- .../Regress.AnnotationObject.inout2.page | 32 +- .../Regress.AnnotationObject.inout3.page | 32 +- .../Regress.AnnotationObject.method.page | 22 +- .../Regress.AnnotationObject.notrans.page | 20 +- .../Regress.AnnotationObject.out.page | 28 +- .../Regress.AnnotationObject.page | 27 +- .../Regress.AnnotationObject.parse_args.page | 28 +- .../Regress.AnnotationObject.set_data.page | 22 +- .../Regress.AnnotationObject.set_data2.page | 22 +- .../Regress.AnnotationObject.set_data3.page | 24 +- .../Regress.AnnotationObject.string_out.page | 26 +- .../Regress.AnnotationObject.use_buffer.page | 20 +- ...ll.page => Regress.AnnotationObject.watch.page} | 24 +- .../Regress.AnnotationObject.with_voidp.page | 22 +- .../Regress.AnnotationStruct-objects.page | 18 + .../Regress.AnnotationStruct.page | 47 +- .../Regress.BOOL_CONSTANT.page | 14 + .../Regress.DOUBLE_CONSTANT.page | 14 + .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 14 + .../Regress.FOO_PIE_IS_TASTY.page | 14 + .../Regress.FOO_SUCCESS_INT.page | 14 + .../Regress.FooASingle.page | 24 +- .../Regress.FooAddressType.page | 24 +- .../Regress.FooBRect-x.page | 18 + .../Regress.FooBRect-y.page | 18 + .../Regress.FooBRect.add.page | 18 +- .../Regress.FooBRect.new.page | 22 +- .../Regress-1.0-Gjs-expected/Regress.FooBRect.page | 48 +- .../Regress.FooBUnion.get_contained_type.page | 20 +- .../Regress.FooBUnion.new.page | 18 +- .../Regress.FooBUnion.page | 47 +- .../Regress.FooBoxed.method.page | 20 +- .../Regress.FooBoxed.new.page | 18 +- .../Regress-1.0-Gjs-expected/Regress.FooBoxed.page | 45 +- .../Regress.FooBuffer.page | 27 +- .../Regress.FooBuffer.some_method.page | 20 +- .../Regress.FooCallback.page | 42 +- .../Regress.FooDBusData.method.page | 20 +- .../Regress.FooDBusData.page | 45 +- .../Regress.FooEnumFullname.page | 24 +- .../Regress.FooEnumNoType.page | 24 +- .../Regress.FooEnumType.method.page | 24 +- .../Regress.FooEnumType.page | 24 +- .../Regress.FooEnumType.returnv.page | 24 +- .../Regress-1.0-Gjs-expected/Regress.FooError.page | 24 +- .../Regress.FooError.quark.page | 22 +- .../Regress-1.0-Gjs-expected/Regress.FooEvent.page | 47 +- .../Regress.FooEventAny-send_event.page | 18 + .../Regress.FooEventAny.page | 47 +- .../Regress.FooEventExpose-count.page | 18 + .../Regress.FooEventExpose-send_event.page | 18 + .../Regress.FooEventExpose.page | 48 +- .../Regress.FooFlagsNoType.page | 40 +- .../Regress.FooFlagsType.page | 40 +- .../Regress.FooForeignStruct-regress_foo.page | 18 + .../Regress.FooForeignStruct.copy.page | 18 +- .../Regress.FooForeignStruct.new.page | 18 +- .../Regress.FooForeignStruct.page | 47 +- .../Regress.FooInterface-do_regress_foo.page | 20 +- .../Regress.FooInterface.do_regress_foo.page | 20 +- .../Regress.FooInterface.page | 39 +- .../Regress.FooInterface.static_method.page | 22 +- .../Regress.FooObject-read_fn.page | 24 +- .../Regress.FooObject-signal.page | 20 +- .../Regress.FooObject-string.page | 21 +- .../Regress.FooObject-virtual_method.page | 20 +- .../Regress.FooObject.a_global_method.page | 20 +- .../Regress.FooObject.append_new_stack_layer.page | 20 +- .../Regress.FooObject.dup_name.page | 18 +- .../Regress.FooObject.external_type.page | 20 +- .../Regress.FooObject.get_default.page | 24 +- .../Regress.FooObject.get_name.page | 18 +- .../Regress.FooObject.handle_glyph.page | 18 +- .../Regress.FooObject.is_it_time_yet.page | 20 +- .../Regress.FooObject.new.page | 18 +- .../Regress.FooObject.new_as_super.page | 18 +- .../Regress.FooObject.page | 27 +- .../Regress.FooObject.read.page | 26 +- .../Regress.FooObject.static_meth.page | 22 +- .../Regress.FooObject.various.page | 22 +- .../Regress.FooObject.virtual_method.page | 20 +- .../Regress.FooObjectCookie.page | 17 +- .../Regress.FooOtherObject.page | 27 +- .../Regress.FooRectangle-height.page | 18 + .../Regress.FooRectangle-width.page | 18 + .../Regress.FooRectangle-x.page | 18 + .../Regress.FooRectangle-y.page | 18 + .../Regress.FooRectangle.add.page | 20 +- .../Regress.FooRectangle.page | 50 +- .../Regress.FooStackLayer.page | 24 +- .../Regress.FooStruct-member.page | 18 + .../Regress.FooStruct-priv.page | 18 + .../Regress.FooStruct.page | 47 +- .../Regress.FooSubInterface-destroy-event.page | 20 +- .../Regress.FooSubInterface-destroy_event.page | 20 +- .../Regress.FooSubInterface-do_bar.page | 20 +- .../Regress.FooSubInterface-do_baz.page | 20 +- .../Regress.FooSubInterface.do_bar.page | 20 +- .../Regress.FooSubInterface.do_baz.page | 18 +- .../Regress.FooSubInterface.page | 39 +- .../Regress.FooSubobject.new.page | 18 +- .../Regress.FooSubobject.page | 27 +- .../Regress.FooThingWithArray-data.page | 18 + .../Regress.FooThingWithArray-lines.page | 18 + .../Regress.FooThingWithArray-x.page | 18 + .../Regress.FooThingWithArray-y.page | 18 + .../Regress.FooThingWithArray.page | 50 +- .../Regress-1.0-Gjs-expected/Regress.FooUnion.page | 47 +- .../Regress.FooUtilityStruct-bar.page | 18 + .../Regress.FooUtilityStruct.page | 47 +- .../Regress.FooXEvent.page | 17 +- .../Regress.GI_SCANNER_ELSE.page | 14 + .../Regress.GI_SCANNER_IFDEF.page | 14 + .../Regress.GUINT64_CONSTANT.page | 14 + .../Regress.GUINT64_CONSTANTA.page | 14 + .../Regress.G_GINT64_CONSTANT.page | 14 + .../Regress.INT_CONSTANT.page | 14 + .../Regress.LONG_STRING_CONSTANT.page | 14 + ....LikeGnomeKeyringPasswordSchema-attributes.page | 20 + ...gress.LikeGnomeKeyringPasswordSchema-dummy.page | 20 + ...ress.LikeGnomeKeyringPasswordSchema-dummy2.page | 20 + .../Regress.LikeGnomeKeyringPasswordSchema.page | 49 +- .../Regress.LikeXklConfigItem-name.page | 18 + .../Regress.LikeXklConfigItem.page | 47 +- .../Regress.LikeXklConfigItem.set_name.page | 18 +- .../Regress.MAXUINT64.page | 14 + .../Regress-1.0-Gjs-expected/Regress.MININT64.page | 14 + .../Regress.Mixed_Case_Constant.page | 14 + .../Regress.NEGATIVE_INT_CONSTANT.page | 14 + .../Regress.PtrArrayAlias.page | 17 +- .../Regress.STRING_CONSTANT.page | 14 + .../Regress.TestABCError.page | 24 +- .../Regress.TestABCError.quark.page | 22 +- .../Regress.TestBoxed-nested_a.page | 18 + .../Regress.TestBoxed-priv.page | 18 + .../Regress.TestBoxed-some_int8.page | 18 + .../Regress.TestBoxed.copy.page | 18 +- .../Regress.TestBoxed.equals.page | 18 +- .../Regress.TestBoxed.new.page | 18 +- ...ess.TestBoxed.new_alternative_constructor1.page | 20 +- ...ess.TestBoxed.new_alternative_constructor2.page | 22 +- ...ess.TestBoxed.new_alternative_constructor3.page | 18 +- .../Regress.TestBoxed.page | 48 +- .../Regress.TestBoxedB-some_int8.page | 18 + .../Regress.TestBoxedB-some_long.page | 18 + .../Regress.TestBoxedB.copy.page | 18 +- .../Regress.TestBoxedB.new.page | 22 +- .../Regress.TestBoxedB.page | 48 +- .../Regress.TestBoxedC-another_thing.page | 18 + .../Regress.TestBoxedC-refcount.page | 18 + .../Regress.TestBoxedC.new.page | 18 +- .../Regress.TestBoxedC.page | 48 +- .../Regress.TestBoxedD.copy.page | 18 +- .../Regress.TestBoxedD.free.page | 20 +- .../Regress.TestBoxedD.get_magic.page | 20 +- .../Regress.TestBoxedD.new.page | 20 +- .../Regress.TestBoxedD.page | 45 +- .../Regress.TestCallback.page | 30 +- .../Regress.TestCallbackArray.page | 38 +- .../Regress.TestCallbackFull.page | 42 +- .../Regress.TestCallbackGError.page | 30 +- .../Regress.TestCallbackHashtable.page | 30 +- .../Regress.TestCallbackOwnedGError.page | 30 +- .../Regress.TestCallbackUserData.page | 30 +- .../Regress.TestDEFError.page | 24 +- .../Regress-1.0-Gjs-expected/Regress.TestEnum.page | 28 +- .../Regress.TestEnum.param.page | 22 +- .../Regress.TestEnumNoGEnum.page | 24 +- .../Regress.TestEnumUnsigned.page | 24 +- .../Regress.TestError.page | 24 +- .../Regress.TestError.quark.page | 22 +- .../Regress.TestExternallyDefinedCallback.page | 29 + .../Regress.TestFlags.page | 40 +- .../Regress.TestFloating.new.page | 20 +- .../Regress.TestFloating.page | 27 +- .../Regress.TestFundamentalObject-copy.page | 25 + .../Regress.TestFundamentalObject-finalize.page | 21 + .../Regress.TestFundamentalObject.page | 27 +- .../Regress.TestFundamentalObject.ref.page | 20 +- .../Regress.TestFundamentalObject.unref.page | 20 +- .../Regress.TestFundamentalObjectCopyFunction.page | 34 +- ...ress.TestFundamentalObjectFinalizeFunction.page | 30 +- .../Regress.TestFundamentalSubObject.new.page | 18 +- .../Regress.TestFundamentalSubObject.page | 27 +- .../Regress.TestInheritDrawable.do_foo.page | 20 +- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 20 +- .../Regress.TestInheritDrawable.get_origin.page | 26 +- .../Regress.TestInheritDrawable.get_size.page | 26 +- .../Regress.TestInheritDrawable.page | 27 +- ....TestInheritPixmapObjectClass-parent_class.page | 18 + .../Regress.TestInheritPixmapObjectClass.page | 45 +- .../Regress.TestInterface.page | 39 +- .../Regress.TestObj-all.page | 20 +- .../Regress.TestObj-allow_none_vfunc.page | 22 +- .../Regress.TestObj-bare.page | 21 +- .../Regress.TestObj-boxed.page | 21 +- .../Regress.TestObj-cleanup.page | 20 +- .../Regress.TestObj-complex_vfunc.page | 25 + .../Regress.TestObj-double.page | 21 +- .../Regress.TestObj-first.page | 20 +- .../Regress.TestObj-float.page | 21 +- .../Regress.TestObj-gtype.page | 21 +- .../Regress.TestObj-hash-table-old.page | 21 +- .../Regress.TestObj-hash-table.page | 21 +- .../Regress.TestObj-int.page | 21 +- .../Regress.TestObj-list-old.page | 21 +- .../Regress.TestObj-list.page | 21 +- .../Regress.TestObj-matrix.page | 24 +- .../Regress.TestObj-sig-with-array-len-prop.page | 22 +- .../Regress.TestObj-sig-with-array-prop.page | 24 +- .../Regress.TestObj-sig-with-foreign-struct.page | 22 +- .../Regress.TestObj-sig-with-hash-prop.page | 22 +- .../Regress.TestObj-sig-with-int64-prop.page | 24 +- .../Regress.TestObj-sig-with-intarray-ret.page | 22 +- .../Regress.TestObj-sig-with-obj.page | 24 +- .../Regress.TestObj-sig-with-strv.page | 22 +- .../Regress.TestObj-sig-with-uint64-prop.page | 24 +- .../Regress.TestObj-string.page | 21 +- ...Regress.TestObj-test-with-static-scope-arg.page | 20 +- .../Regress.TestObj-test.page | 20 +- .../Regress.TestObj.constructor.page | 18 +- .../Regress.TestObj.do_matrix.page | 24 +- ...gress.TestObj.emit_sig_with_foreign_struct.page | 20 +- .../Regress.TestObj.emit_sig_with_int64.page | 20 +- .../Regress.TestObj.emit_sig_with_obj.page | 20 +- .../Regress.TestObj.emit_sig_with_uint64.page | 20 +- .../Regress.TestObj.forced_method.page | 20 +- .../Regress.TestObj.function_ptr.page | 19 + .../Regress.TestObj.instance_method.page | 20 +- .../Regress.TestObj.instance_method_callback.page | 18 +- .../Regress.TestObj.new.page | 20 +- .../Regress.TestObj.new_callback.page | 18 +- .../Regress.TestObj.new_from_file.page | 18 +- .../Regress.TestObj.null_out.page | 24 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.page | 38 +- .../Regress.TestObj.set_bare.page | 18 +- .../Regress.TestObj.skip_inout_param.page | 54 +- .../Regress.TestObj.skip_out_param.page | 54 +- .../Regress.TestObj.skip_param.page | 54 +- .../Regress.TestObj.skip_return_val.page | 54 +- .../Regress.TestObj.skip_return_val_no_out.page | 26 +- .../Regress.TestObj.static_method.page | 24 +- .../Regress.TestObj.static_method_callback.page | 20 +- .../Regress.TestObj.torture_signature_0.page | 36 +- .../Regress.TestObj.torture_signature_1.page | 36 +- .../Regress.TestOtherError.page | 24 +- .../Regress.TestOtherError.quark.page | 22 +- .../Regress.TestPrivateEnum.page | 36 +- ...ess.TestPrivateStruct-this_is_public_after.page | 18 + ...ss.TestPrivateStruct-this_is_public_before.page | 18 + .../Regress.TestPrivateStruct.page | 48 +- .../Regress.TestReferenceEnum.page | 24 +- .../Regress.TestSimpleBoxedA-some_double.page | 18 + .../Regress.TestSimpleBoxedA-some_enum.page | 18 + .../Regress.TestSimpleBoxedA-some_int.page | 18 + .../Regress.TestSimpleBoxedA-some_int8.page | 18 + .../Regress.TestSimpleBoxedA.const_return.page | 20 +- .../Regress.TestSimpleBoxedA.copy.page | 18 +- .../Regress.TestSimpleBoxedA.equals.page | 18 +- .../Regress.TestSimpleBoxedA.page | 50 +- .../Regress.TestSimpleBoxedB-nested_a.page | 18 + .../Regress.TestSimpleBoxedB-some_int8.page | 18 + .../Regress.TestSimpleBoxedB.copy.page | 18 +- .../Regress.TestSimpleBoxedB.page | 48 +- .../Regress.TestSimpleCallback.page | 24 +- .../Regress.TestStructA-some_double.page | 18 + .../Regress.TestStructA-some_enum.page | 18 + .../Regress.TestStructA-some_int.page | 18 + .../Regress.TestStructA-some_int8.page | 18 + .../Regress.TestStructA.clone.page | 22 +- .../Regress.TestStructA.page | 50 +- .../Regress.TestStructA.parse.page | 26 +- .../Regress.TestStructB-nested_a.page | 18 + .../Regress.TestStructB-some_int8.page | 18 + .../Regress.TestStructB.clone.page | 22 +- .../Regress.TestStructB.page | 48 +- .../Regress.TestStructC-another_int.page | 18 + .../Regress.TestStructC-obj.page | 18 + .../Regress.TestStructC.page | 47 +- .../Regress.TestStructD-array1.page | 18 + .../Regress.TestStructD-array2.page | 18 + .../Regress.TestStructD-field.page | 18 + .../Regress.TestStructD-garray.page | 18 + .../Regress.TestStructD-list.page | 18 + .../Regress.TestStructD.page | 50 +- .../Regress.TestStructE-some_type.page | 18 + .../Regress.TestStructE-some_union.page | 18 + .../Regress.TestStructE.page | 48 +- .../Regress.TestStructE__some_union__union.page | 47 +- .../Regress.TestStructF-data1.page | 18 + .../Regress.TestStructF-data2.page | 18 + .../Regress.TestStructF-data3.page | 18 + .../Regress.TestStructF-data4.page | 18 + .../Regress.TestStructF-data5.page | 18 + .../Regress.TestStructF-data6.page | 18 + .../Regress.TestStructF-ref_count.page | 18 + .../Regress.TestStructF.page | 53 +- .../Regress.TestStructFixedArray-array.page | 18 + .../Regress.TestStructFixedArray-just_int.page | 18 + .../Regress.TestStructFixedArray.frob.page | 20 +- .../Regress.TestStructFixedArray.page | 48 +- .../Regress.TestSubObj.instance_method.page | 20 +- .../Regress.TestSubObj.new.page | 18 +- .../Regress.TestSubObj.page | 27 +- .../Regress.TestSubObj.unset_bare.page | 20 +- .../Regress.TestTypeGUInt64.page | 17 +- .../Regress.TestWi8021x-testbool.page | 21 +- .../Regress.TestWi8021x.get_testbool.page | 18 +- .../Regress.TestWi8021x.new.page | 18 +- .../Regress.TestWi8021x.page | 28 +- .../Regress.TestWi8021x.set_testbool.page | 18 +- .../Regress.TestWi8021x.static_method.page | 24 +- .../Regress.UTF8_CONSTANT.page | 14 + .../Regress.aliased_caller_alloc.page | 24 +- .../Regress.annotation_attribute_func.page | 28 +- .../Regress.annotation_custom_destroy.page | 24 +- .../Regress.annotation_get_source_file.page | 24 +- .../Regress.annotation_init.page | 30 +- ...ress.annotation_invalid_regress_annotation.page | 24 +- .../Regress.annotation_ptr_array.page | 24 +- .../Regress.annotation_return_array.page | 30 +- .../Regress.annotation_return_filename.page | 24 +- .../Regress.annotation_set_source_file.page | 24 +- ...s.annotation_space_after_comment_bug631690.page | 22 +- .../Regress.annotation_string_array_length.page | 22 +- .../Regress.annotation_string_zero_terminated.page | 24 +- ...ress.annotation_string_zero_terminated_out.page | 28 +- .../Regress.annotation_test_parsing_bug630862.page | 22 +- .../Regress.annotation_transfer_floating.page | 22 +- .../Regress.annotation_versioned.page | 23 +- .../Regress.atest_error_quark.page | 20 +- .../Regress.foo_async_ready_callback.page | 20 +- .../Regress.foo_destroy_notify_callback.page | 20 +- .../Regress-1.0-Gjs-expected/Regress.foo_init.page | 22 +- .../Regress.foo_method_external_references.page | 20 +- .../Regress.foo_not_a_constructor_new.page | 22 +- .../Regress.foo_test_array.page | 22 +- .../Regress.foo_test_const_char_param.page | 20 +- .../Regress.foo_test_const_char_retval.page | 20 +- .../Regress.foo_test_const_struct_param.page | 20 +- .../Regress.foo_test_const_struct_retval.page | 20 +- .../Regress.foo_test_string_array.page | 22 +- .../Regress.foo_test_string_array_with_g.page | 22 +- .../Regress.foo_test_unsigned_qualifier.page | 22 +- .../Regress.foo_test_unsigned_type.page | 22 +- .../Regress.func_obj_null_in.page | 22 +- .../Regress.global_get_flags_out.page | 24 +- .../Regress.has_parameter_named_attrs.page | 30 +- .../Regress.introspectable_via_alias.page | 20 +- .../Regress.set_abort_on_error.page | 20 +- .../Regress.test_array_callback.page | 22 +- .../Regress.test_array_fixed_out_objects.page | 24 +- .../Regress.test_array_fixed_size_int_in.page | 28 +- .../Regress.test_array_fixed_size_int_out.page | 24 +- .../Regress.test_array_fixed_size_int_return.page | 24 +- .../Regress.test_array_gint16_in.page | 26 +- .../Regress.test_array_gint32_in.page | 26 +- .../Regress.test_array_gint64_in.page | 26 +- .../Regress.test_array_gint8_in.page | 26 +- .../Regress.test_array_gtype_in.page | 26 +- .../Regress.test_array_int_full_out.page | 30 +- .../Regress.test_array_int_in.page | 26 +- .../Regress.test_array_int_inout.page | 30 +- .../Regress.test_array_int_none_out.page | 30 +- .../Regress.test_array_int_null_in.page | 22 +- .../Regress.test_array_int_null_out.page | 24 +- .../Regress.test_array_int_out.page | 24 +- .../Regress.test_async_ready_callback.page | 20 +- .../Regress.test_boolean.page | 20 +- .../Regress.test_boolean_false.page | 20 +- .../Regress.test_boolean_true.page | 20 +- .../Regress.test_boxeds_not_a_method.page | 36 + .../Regress.test_boxeds_not_a_static.page | 26 + .../Regress.test_cairo_context_full_return.page | 20 +- .../Regress.test_cairo_context_none_in.page | 20 +- .../Regress.test_cairo_surface_full_out.page | 24 +- .../Regress.test_cairo_surface_full_return.page | 20 +- .../Regress.test_cairo_surface_none_in.page | 20 +- .../Regress.test_cairo_surface_none_return.page | 20 +- .../Regress.test_callback.page | 22 +- .../Regress.test_callback_async.page | 20 +- .../Regress.test_callback_destroy_notify.page | 24 +- ....test_callback_destroy_notify_no_user_data.page | 24 +- .../Regress.test_callback_thaw_async.page | 22 +- .../Regress.test_callback_thaw_notifications.page | 26 +- .../Regress.test_callback_user_data.page | 24 +- .../Regress.test_closure.page | 24 +- .../Regress.test_closure_one_arg.page | 26 +- .../Regress.test_closure_variant.page | 28 +- .../Regress.test_date_in_gvalue.page | 22 +- .../Regress.test_def_error_quark.page | 20 +- .../Regress.test_double.page | 24 +- .../Regress.test_filename_return.page | 24 +- .../Regress.test_float.page | 24 +- .../Regress.test_garray_container_return.page | 22 +- .../Regress.test_garray_full_return.page | 22 +- .../Regress.test_gerror_callback.page | 20 +- .../Regress.test_ghash_container_return.page | 20 +- .../Regress.test_ghash_everything_return.page | 20 +- .../Regress.test_ghash_gvalue_in.page | 24 +- .../Regress.test_ghash_gvalue_return.page | 22 +- ...egress.test_ghash_nested_everything_return.page | 20 +- ...gress.test_ghash_nested_everything_return2.page | 22 +- .../Regress.test_ghash_nothing_in.page | 20 +- .../Regress.test_ghash_nothing_in2.page | 20 +- .../Regress.test_ghash_nothing_return.page | 20 +- .../Regress.test_ghash_nothing_return2.page | 20 +- .../Regress.test_ghash_null_in.page | 20 +- .../Regress.test_ghash_null_out.page | 24 +- .../Regress.test_ghash_null_return.page | 20 +- .../Regress.test_glist_container_return.page | 22 +- .../Regress.test_glist_everything_return.page | 22 +- .../Regress.test_glist_nothing_in.page | 22 +- .../Regress.test_glist_nothing_in2.page | 22 +- .../Regress.test_glist_nothing_return.page | 22 +- .../Regress.test_glist_nothing_return2.page | 22 +- .../Regress.test_glist_null_in.page | 22 +- .../Regress.test_glist_null_out.page | 24 +- .../Regress.test_gslist_container_return.page | 22 +- .../Regress.test_gslist_everything_return.page | 22 +- .../Regress.test_gslist_nothing_in.page | 22 +- .../Regress.test_gslist_nothing_in2.page | 22 +- .../Regress.test_gslist_nothing_return.page | 22 +- .../Regress.test_gslist_nothing_return2.page | 22 +- .../Regress.test_gslist_null_in.page | 22 +- .../Regress.test_gslist_null_out.page | 24 +- .../Regress.test_gtype.page | 24 +- .../Regress.test_gvariant_as.page | 22 +- .../Regress.test_gvariant_asv.page | 22 +- .../Regress.test_gvariant_i.page | 22 +- .../Regress.test_gvariant_s.page | 22 +- .../Regress.test_gvariant_v.page | 22 +- .../Regress.test_hash_table_callback.page | 24 +- .../Regress-1.0-Gjs-expected/Regress.test_int.page | 24 +- .../Regress.test_int16.page | 24 +- .../Regress.test_int32.page | 24 +- .../Regress.test_int64.page | 24 +- .../Regress.test_int8.page | 24 +- .../Regress.test_int_out_utf8.page | 24 +- .../Regress.test_int_value_arg.page | 24 +- .../Regress.test_long.page | 24 +- .../Regress.test_multi_callback.page | 22 +- .../Regress.test_multi_double_args.page | 30 +- .../Regress.test_multiline_doc_comments.page | 22 +- .../Regress.test_nested_parameter.page | 28 +- .../Regress.test_null_gerror_callback.page | 20 +- .../Regress.test_owned_gerror_callback.page | 20 +- .../Regress.test_short.page | 24 +- .../Regress.test_simple_callback.page | 20 +- .../Regress.test_size.page | 24 +- .../Regress.test_ssize.page | 24 +- .../Regress.test_strv_in.page | 22 +- .../Regress.test_strv_in_gvalue.page | 22 +- .../Regress.test_strv_out.page | 22 +- .../Regress.test_strv_out_c.page | 22 +- .../Regress.test_strv_out_container.page | 22 +- .../Regress.test_strv_outarg.page | 24 +- .../Regress.test_timet.page | 24 +- .../Regress.test_torture_signature_0.page | 38 +- .../Regress.test_torture_signature_1.page | 38 +- .../Regress.test_torture_signature_2.page | 36 +- .../Regress.test_uint.page | 24 +- .../Regress.test_uint16.page | 24 +- .../Regress.test_uint32.page | 24 +- .../Regress.test_uint64.page | 24 +- .../Regress.test_uint8.page | 24 +- .../Regress.test_ulong.page | 24 +- .../Regress.test_unichar.page | 20 +- .../Regress.test_unsigned_enum_param.page | 20 +- .../Regress.test_ushort.page | 20 +- .../Regress.test_utf8_const_in.page | 20 +- .../Regress.test_utf8_const_return.page | 22 +- .../Regress.test_utf8_inout.page | 26 +- .../Regress.test_utf8_nonconst_return.page | 22 +- .../Regress.test_utf8_null_in.page | 20 +- .../Regress.test_utf8_null_out.page | 24 +- .../Regress.test_utf8_out.page | 24 +- .../Regress.test_utf8_out_nonconst_return.page | 28 +- .../Regress.test_utf8_out_out.page | 28 +- .../Regress.test_value_return.page | 28 +- .../Regress.test_versioning.page | 23 +- tests/scanner/Regress-1.0-Gjs-expected/index.page | 18 +- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 14 + .../Regress.ANNOTATION_CALCULATED_LARGE.page | 14 + .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 14 + .../Regress.ATestError.page | 16 +- .../Regress.AliasedTestBoxed.page | 17 +- .../Regress.AnAnonymousUnion-None.page | 14 + .../Regress.AnAnonymousUnion-x.page | 14 + .../Regress.AnAnonymousUnion.page | 45 +- .../Regress.AnnotationBitfield.page | 30 +- .../Regress.AnnotationCallback.page | 35 +- .../Regress.AnnotationFields-arr.page | 14 + .../Regress.AnnotationFields-field1.page | 14 + .../Regress.AnnotationFields-len.page | 14 + .../Regress.AnnotationFields.page | 45 +- .../Regress.AnnotationForeachFunc.page | 39 +- .../Regress.AnnotationListCallback.page | 35 +- .../Regress.AnnotationNotifyFunc.page | 31 +- .../Regress.AnnotationObject-attribute-signal.page | 22 +- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 16 +- ...Regress.AnnotationObject-function-property.page | 17 +- .../Regress.AnnotationObject-list-signal.page | 20 +- .../Regress.AnnotationObject-parent_instance.page | 14 + .../Regress.AnnotationObject-string-property.page | 20 +- .../Regress.AnnotationObject-string-signal.page | 21 +- .../Regress.AnnotationObject-tab-property.page | 20 +- .../Regress.AnnotationObject.allow_none.page | 18 +- .../Regress.AnnotationObject.calleeowns.page | 20 +- .../Regress.AnnotationObject.calleesowns.page | 22 +- .../Regress.AnnotationObject.compute_sum.page | 20 +- .../Regress.AnnotationObject.compute_sum_n.page | 22 +- .../Regress.AnnotationObject.compute_sum_nz.page | 22 +- .../Regress.AnnotationObject.create_object.page | 18 +- .../Regress.AnnotationObject.do_not_use.page | 18 +- .../Regress.AnnotationObject.extra_annos.page | 16 +- .../Regress.AnnotationObject.foreach.page | 22 +- .../Regress.AnnotationObject.get_hash.page | 20 +- .../Regress.AnnotationObject.get_objects.page | 20 +- .../Regress.AnnotationObject.get_strings.page | 20 +- .../Regress.AnnotationObject.hidden_self.page | 18 +- .../Regress.AnnotationObject.in.page | 20 +- .../Regress.AnnotationObject.inout.page | 20 +- .../Regress.AnnotationObject.inout2.page | 20 +- .../Regress.AnnotationObject.inout3.page | 20 +- .../Regress.AnnotationObject.method.page | 18 +- .../Regress.AnnotationObject.notrans.page | 18 +- .../Regress.AnnotationObject.out.page | 20 +- .../Regress.AnnotationObject.page | 28 +- .../Regress.AnnotationObject.parse_args.page | 22 +- .../Regress.AnnotationObject.set_data.page | 22 +- .../Regress.AnnotationObject.set_data2.page | 22 +- .../Regress.AnnotationObject.set_data3.page | 24 +- .../Regress.AnnotationObject.string_out.page | 20 +- .../Regress.AnnotationObject.use_buffer.page | 18 +- ...ll.page => Regress.AnnotationObject.watch.page} | 26 +- .../Regress.AnnotationObject.with_voidp.page | 18 +- .../Regress.AnnotationStruct-objects.page | 14 + .../Regress.AnnotationStruct.page | 45 +- .../Regress.BOOL_CONSTANT.page | 14 + .../Regress.DOUBLE_CONSTANT.page | 14 + .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 14 + .../Regress.FOO_PIE_IS_TASTY.page | 14 + .../Regress.FOO_SUCCESS_INT.page | 14 + .../Regress.FooASingle.page | 16 +- .../Regress.FooAddressType.page | 16 +- .../Regress.FooBRect-x.page | 14 + .../Regress.FooBRect-y.page | 14 + .../Regress.FooBRect.add.page | 16 +- .../Regress.FooBRect.page | 45 +- .../Regress.FooBUnion-rect.page | 14 + .../Regress.FooBUnion-type.page | 14 + .../Regress.FooBUnion-v.page | 14 + .../Regress.FooBUnion.get_contained_type.page | 16 +- .../Regress.FooBUnion.page | 47 +- .../Regress.FooBoxed.method.page | 16 +- .../Regress.FooBoxed.page | 45 +- .../Regress.FooBuffer.page | 28 +- .../Regress.FooBuffer.some_method.page | 16 +- .../Regress.FooCallback.page | 43 +- .../Regress.FooDBusData.method.page | 16 +- .../Regress.FooDBusData.page | 45 +- .../Regress.FooEnumFullname.page | 16 +- .../Regress.FooEnumNoType.page | 16 +- .../Regress.FooEnumType.method.page | 20 +- .../Regress.FooEnumType.page | 16 +- .../Regress.FooEnumType.returnv.page | 20 +- .../Regress.FooError.page | 16 +- .../Regress.FooError.quark.page | 20 +- .../Regress.FooEvent-any.page | 14 + .../Regress.FooEvent-expose.page | 14 + .../Regress.FooEvent-type.page | 14 + .../Regress.FooEvent.page | 47 +- .../Regress.FooEventAny-send_event.page | 14 + .../Regress.FooEventAny.page | 45 +- .../Regress.FooEventExpose-count.page | 14 + .../Regress.FooEventExpose-send_event.page | 14 + .../Regress.FooEventExpose.page | 45 +- .../Regress.FooFlagsNoType.page | 34 +- .../Regress.FooFlagsType.page | 34 +- .../Regress.FooForeignStruct-regress_foo.page | 14 + .../Regress.FooForeignStruct.copy.page | 16 +- .../Regress.FooForeignStruct.page | 45 +- .../Regress.FooInterface-do_regress_foo.page | 18 +- .../Regress.FooInterface.do_regress_foo.page | 16 +- .../Regress.FooInterface.page | 39 +- .../Regress.FooInterface.static_method.page | 16 +- .../Regress.FooObject-parent_instance.page | 14 + .../Regress.FooObject-read_fn.page | 24 +- .../Regress.FooObject-signal.page | 16 +- .../Regress.FooObject-some_int.page | 14 + .../Regress.FooObject-string.page | 17 +- .../Regress.FooObject-virtual_method.page | 18 +- .../Regress.FooObject.a_global_method.page | 16 +- .../Regress.FooObject.append_new_stack_layer.page | 16 +- .../Regress.FooObject.dup_name.page | 16 +- .../Regress.FooObject.external_type.page | 18 +- .../Regress.FooObject.get_default.page | 18 +- .../Regress.FooObject.get_name.page | 16 +- .../Regress.FooObject.handle_glyph.page | 16 +- .../Regress.FooObject.is_it_time_yet.page | 16 +- .../Regress.FooObject.page | 28 +- .../Regress.FooObject.read.page | 22 +- .../Regress.FooObject.static_meth.page | 16 +- .../Regress.FooObject.various.page | 16 +- .../Regress.FooObject.virtual_method.page | 16 +- .../Regress.FooObjectCookie.page | 17 +- .../Regress.FooOtherObject.page | 28 +- .../Regress.FooRectangle-height.page | 14 + .../Regress.FooRectangle-width.page | 14 + .../Regress.FooRectangle-x.page | 14 + .../Regress.FooRectangle-y.page | 14 + .../Regress.FooRectangle.add.page | 20 +- .../Regress.FooRectangle.page | 45 +- .../Regress.FooStackLayer.page | 16 +- .../Regress.FooStruct-member.page | 14 + .../Regress.FooStruct-priv.page | 14 + .../Regress.FooStruct.page | 45 +- .../Regress.FooStructPrivate.page | 40 + .../Regress.FooSubInterface-destroy-event.page | 16 +- .../Regress.FooSubInterface-destroy_event.page | 18 +- .../Regress.FooSubInterface-do_bar.page | 18 +- .../Regress.FooSubInterface-do_baz.page | 18 +- .../Regress.FooSubInterface.do_bar.page | 16 +- .../Regress.FooSubInterface.do_baz.page | 16 +- .../Regress.FooSubInterface.page | 39 +- .../Regress.FooSubobject-parent_instance.page | 14 + .../Regress.FooSubobject.page | 28 +- .../Regress.FooThingWithArray-data.page | 14 + .../Regress.FooThingWithArray-lines.page | 14 + .../Regress.FooThingWithArray-x.page | 14 + .../Regress.FooThingWithArray-y.page | 14 + .../Regress.FooThingWithArray.page | 45 +- .../Regress.FooUnion-regress_foo.page | 14 + .../Regress.FooUnion.page | 47 +- .../Regress.FooUtilityStruct-bar.page | 14 + .../Regress.FooUtilityStruct.page | 45 +- .../Regress.FooXEvent.page | 17 +- .../Regress.GI_SCANNER_ELSE.page | 14 + .../Regress.GI_SCANNER_IFDEF.page | 14 + .../Regress.GUINT64_CONSTANT.page | 14 + .../Regress.GUINT64_CONSTANTA.page | 14 + .../Regress.G_GINT64_CONSTANT.page | 14 + .../Regress.INT_CONSTANT.page | 14 + .../Regress.Intset.page | 40 + .../Regress.LONG_STRING_CONSTANT.page | 14 + ....LikeGnomeKeyringPasswordSchema-attributes.page | 16 + ...gress.LikeGnomeKeyringPasswordSchema-dummy.page | 16 + ...ress.LikeGnomeKeyringPasswordSchema-dummy2.page | 16 + .../Regress.LikeGnomeKeyringPasswordSchema.page | 45 +- .../Regress.LikeXklConfigItem-name.page | 14 + .../Regress.LikeXklConfigItem.page | 45 +- .../Regress.LikeXklConfigItem.set_name.page | 16 +- .../Regress.MAXUINT64.page | 14 + .../Regress.MININT64.page | 14 + .../Regress.Mixed_Case_Constant.page | 14 + .../Regress.NEGATIVE_INT_CONSTANT.page | 14 + .../Regress.PtrArrayAlias.page | 17 +- .../Regress.STRING_CONSTANT.page | 14 + .../Regress.TestABCError.page | 16 +- .../Regress.TestABCError.quark.page | 20 +- .../Regress.TestBoxed-nested_a.page | 14 + .../Regress.TestBoxed-priv.page | 14 + .../Regress.TestBoxed-some_int8.page | 14 + .../Regress.TestBoxed.copy.page | 16 +- .../Regress.TestBoxed.equals.page | 16 +- .../Regress.TestBoxed.page | 45 +- .../Regress.TestBoxedB-some_int8.page | 14 + .../Regress.TestBoxedB-some_long.page | 14 + .../Regress.TestBoxedB.copy.page | 16 +- .../Regress.TestBoxedB.page | 45 +- .../Regress.TestBoxedC-another_thing.page | 14 + .../Regress.TestBoxedC-refcount.page | 14 + .../Regress.TestBoxedC.page | 45 +- .../Regress.TestBoxedD.copy.page | 16 +- .../Regress.TestBoxedD.free.page | 16 +- .../Regress.TestBoxedD.get_magic.page | 16 +- .../Regress.TestBoxedD.page | 45 +- .../Regress.TestBoxedPrivate.page | 40 + .../Regress.TestCallback.page | 30 +- .../Regress.TestCallbackArray.page | 47 +- .../Regress.TestCallbackFull.page | 43 +- .../Regress.TestCallbackGError.page | 31 +- .../Regress.TestCallbackHashtable.page | 31 +- .../Regress.TestCallbackOwnedGError.page | 31 +- .../Regress.TestCallbackUserData.page | 35 +- .../Regress.TestDEFError.page | 16 +- .../Regress.TestEnum.page | 20 +- .../Regress.TestEnum.param.page | 20 +- .../Regress.TestEnumNoGEnum.page | 16 +- .../Regress.TestEnumUnsigned.page | 16 +- .../Regress.TestError.page | 16 +- .../Regress.TestError.quark.page | 20 +- .../Regress.TestExternallyDefinedCallback.page | 30 + .../Regress.TestFlags.page | 34 +- .../Regress.TestFloating-parent_instance.page | 14 + .../Regress.TestFloating.page | 28 +- .../Regress.TestFundamentalObject-copy.page | 30 + .../Regress.TestFundamentalObject-finalize.page | 26 + .../Regress.TestFundamentalObject-flags.page | 14 + .../Regress.TestFundamentalObject-instance.page | 14 + .../Regress.TestFundamentalObject-refcount.page | 14 + .../Regress.TestFundamentalObject.page | 28 +- .../Regress.TestFundamentalObject.ref.page | 16 +- .../Regress.TestFundamentalObject.unref.page | 16 +- .../Regress.TestFundamentalObjectCopyFunction.page | 35 +- ...ress.TestFundamentalObjectFinalizeFunction.page | 31 +- .../Regress.TestFundamentalSubObject-data.page | 14 + ...estFundamentalSubObject-fundamental_object.page | 14 + .../Regress.TestFundamentalSubObject.page | 28 +- ...egress.TestInheritDrawable-parent_instance.page | 14 + .../Regress.TestInheritDrawable.do_foo.page | 16 +- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 16 +- .../Regress.TestInheritDrawable.get_origin.page | 16 +- .../Regress.TestInheritDrawable.get_size.page | 16 +- .../Regress.TestInheritDrawable.page | 28 +- ....TestInheritPixmapObjectClass-parent_class.page | 14 + .../Regress.TestInheritPixmapObjectClass.page | 45 +- .../Regress.TestInterface.page | 39 +- .../Regress.TestObj-all.page | 16 +- .../Regress.TestObj-allow_none_vfunc.page | 20 +- .../Regress.TestObj-bare.page | 17 +- .../Regress.TestObj-boxed.page | 17 +- .../Regress.TestObj-cleanup.page | 16 +- .../Regress.TestObj-complex_vfunc.page | 30 + .../Regress.TestObj-double.page | 17 +- .../Regress.TestObj-first.page | 16 +- .../Regress.TestObj-float.page | 17 +- .../Regress.TestObj-function_ptr.page | 14 + .../Regress.TestObj-gtype.page | 17 +- .../Regress.TestObj-hash-table-old.page | 17 +- .../Regress.TestObj-hash-table.page | 17 +- .../Regress.TestObj-hash_table.page | 14 + .../Regress.TestObj-int.page | 17 +- .../Regress.TestObj-list-old.page | 17 +- .../Regress.TestObj-list.page | 17 +- .../Regress.TestObj-matrix.page | 24 +- .../Regress.TestObj-parent_instance.page | 14 + .../Regress.TestObj-sig-with-array-len-prop.page | 20 +- .../Regress.TestObj-sig-with-array-prop.page | 20 +- .../Regress.TestObj-sig-with-foreign-struct.page | 18 +- .../Regress.TestObj-sig-with-hash-prop.page | 18 +- .../Regress.TestObj-sig-with-int64-prop.page | 20 +- .../Regress.TestObj-sig-with-intarray-ret.page | 18 +- .../Regress.TestObj-sig-with-obj.page | 20 +- .../Regress.TestObj-sig-with-strv.page | 18 +- .../Regress.TestObj-sig-with-uint64-prop.page | 20 +- .../Regress.TestObj-some_double.page | 14 + .../Regress.TestObj-some_float.page | 14 + .../Regress.TestObj-some_int8.page | 14 + .../Regress.TestObj-string.page | 17 +- ...Regress.TestObj-test-with-static-scope-arg.page | 16 +- .../Regress.TestObj-test.page | 16 +- .../Regress.TestObj.do_matrix.page | 22 +- ...gress.TestObj.emit_sig_with_foreign_struct.page | 16 +- .../Regress.TestObj.emit_sig_with_int64.page | 16 +- .../Regress.TestObj.emit_sig_with_obj.page | 16 +- .../Regress.TestObj.emit_sig_with_uint64.page | 16 +- .../Regress.TestObj.forced_method.page | 18 +- .../Regress.TestObj.function_ptr.page | 21 + .../Regress.TestObj.instance_method.page | 16 +- .../Regress.TestObj.instance_method_callback.page | 16 +- .../Regress.TestObj.null_out.page | 18 +- .../Regress.TestObj.page | 28 +- .../Regress.TestObj.set_bare.page | 16 +- .../Regress.TestObj.skip_inout_param.page | 32 +- .../Regress.TestObj.skip_out_param.page | 32 +- .../Regress.TestObj.skip_param.page | 32 +- .../Regress.TestObj.skip_return_val.page | 32 +- .../Regress.TestObj.skip_return_val_no_out.page | 22 +- .../Regress.TestObj.static_method.page | 16 +- .../Regress.TestObj.static_method_callback.page | 16 +- .../Regress.TestObj.torture_signature_0.page | 18 +- .../Regress.TestObj.torture_signature_1.page | 18 +- .../Regress.TestOtherError.page | 16 +- .../Regress.TestOtherError.quark.page | 20 +- .../Regress.TestPrivateEnum.page | 30 +- ...ess.TestPrivateStruct-this_is_public_after.page | 14 + ...ss.TestPrivateStruct-this_is_public_before.page | 14 + .../Regress.TestPrivateStruct.page | 45 +- .../Regress.TestReferenceEnum.page | 16 +- .../Regress.TestSimpleBoxedA-some_double.page | 14 + .../Regress.TestSimpleBoxedA-some_enum.page | 14 + .../Regress.TestSimpleBoxedA-some_int.page | 14 + .../Regress.TestSimpleBoxedA-some_int8.page | 14 + .../Regress.TestSimpleBoxedA.const_return.page | 16 +- .../Regress.TestSimpleBoxedA.copy.page | 16 +- .../Regress.TestSimpleBoxedA.equals.page | 16 +- .../Regress.TestSimpleBoxedA.page | 45 +- .../Regress.TestSimpleBoxedB-nested_a.page | 14 + .../Regress.TestSimpleBoxedB-some_int8.page | 14 + .../Regress.TestSimpleBoxedB.copy.page | 16 +- .../Regress.TestSimpleBoxedB.page | 45 +- .../Regress.TestSimpleCallback.page | 26 +- .../Regress.TestStructA-some_double.page | 14 + .../Regress.TestStructA-some_enum.page | 14 + .../Regress.TestStructA-some_int.page | 14 + .../Regress.TestStructA-some_int8.page | 14 + .../Regress.TestStructA.clone.page | 20 +- .../Regress.TestStructA.page | 45 +- .../Regress.TestStructA.parse.page | 20 +- .../Regress.TestStructB-nested_a.page | 14 + .../Regress.TestStructB-some_int8.page | 14 + .../Regress.TestStructB.clone.page | 20 +- .../Regress.TestStructB.page | 45 +- .../Regress.TestStructC-another_int.page | 14 + .../Regress.TestStructC-obj.page | 14 + .../Regress.TestStructC.page | 45 +- .../Regress.TestStructD-array1.page | 14 + .../Regress.TestStructD-array2.page | 14 + .../Regress.TestStructD-field.page | 14 + .../Regress.TestStructD-garray.page | 14 + .../Regress.TestStructD-list.page | 14 + .../Regress.TestStructD.page | 45 +- .../Regress.TestStructE-some_type.page | 14 + .../Regress.TestStructE-some_union.page | 14 + .../Regress.TestStructE.page | 45 +- ...ss.TestStructE__some_union__union-v_double.page | 16 + ...ess.TestStructE__some_union__union-v_float.page | 16 + ...gress.TestStructE__some_union__union-v_int.page | 16 + ...ess.TestStructE__some_union__union-v_int64.page | 16 + ...ress.TestStructE__some_union__union-v_long.page | 16 + ...s.TestStructE__some_union__union-v_pointer.page | 16 + ...ress.TestStructE__some_union__union-v_uint.page | 16 + ...ss.TestStructE__some_union__union-v_uint64.page | 16 + ...ess.TestStructE__some_union__union-v_ulong.page | 16 + .../Regress.TestStructE__some_union__union.page | 47 +- .../Regress.TestStructF-data1.page | 14 + .../Regress.TestStructF-data2.page | 14 + .../Regress.TestStructF-data3.page | 14 + .../Regress.TestStructF-data4.page | 14 + .../Regress.TestStructF-data5.page | 14 + .../Regress.TestStructF-data6.page | 14 + .../Regress.TestStructF-ref_count.page | 14 + .../Regress.TestStructF.page | 45 +- .../Regress.TestStructFixedArray-array.page | 14 + .../Regress.TestStructFixedArray-just_int.page | 14 + .../Regress.TestStructFixedArray.frob.page | 16 +- .../Regress.TestStructFixedArray.page | 45 +- .../Regress.TestSubObj-parent_instance.page | 14 + .../Regress.TestSubObj.instance_method.page | 16 +- .../Regress.TestSubObj.page | 28 +- .../Regress.TestSubObj.unset_bare.page | 16 +- .../Regress.TestTypeGUInt64.page | 17 +- .../Regress.TestWi8021x-parent_instance.page | 14 + .../Regress.TestWi8021x-testbool.page | 17 +- .../Regress.TestWi8021x.get_testbool.page | 16 +- .../Regress.TestWi8021x.page | 28 +- .../Regress.TestWi8021x.set_testbool.page | 16 +- .../Regress.TestWi8021x.static_method.page | 16 +- .../Regress.UTF8_CONSTANT.page | 14 + .../Regress.aliased_caller_alloc.page | 18 +- .../Regress.annotation_attribute_func.page | 22 +- .../Regress.annotation_custom_destroy.page | 22 +- .../Regress.annotation_get_source_file.page | 18 +- .../Regress.annotation_init.page | 22 +- ...ress.annotation_invalid_regress_annotation.page | 20 +- .../Regress.annotation_ptr_array.page | 20 +- .../Regress.annotation_return_array.page | 20 +- .../Regress.annotation_return_filename.page | 18 +- .../Regress.annotation_set_source_file.page | 20 +- ...s.annotation_space_after_comment_bug631690.page | 18 +- .../Regress.annotation_string_array_length.page | 18 +- .../Regress.annotation_string_zero_terminated.page | 18 +- ...ress.annotation_string_zero_terminated_out.page | 18 +- .../Regress.annotation_test_parsing_bug630862.page | 18 +- .../Regress.annotation_transfer_floating.page | 18 +- .../Regress.annotation_versioned.page | 19 +- .../Regress.atest_error_quark.page | 18 +- .../Regress.foo_async_ready_callback.page | 18 +- .../Regress.foo_destroy_notify_callback.page | 18 +- .../Regress.foo_init.page | 18 +- .../Regress.foo_method_external_references.page | 18 +- .../Regress.foo_not_a_constructor_new.page | 20 +- .../Regress.foo_test_array.page | 18 +- .../Regress.foo_test_const_char_param.page | 18 +- .../Regress.foo_test_const_char_retval.page | 18 +- .../Regress.foo_test_const_struct_param.page | 18 +- .../Regress.foo_test_const_struct_retval.page | 18 +- .../Regress.foo_test_string_array.page | 18 +- .../Regress.foo_test_string_array_with_g.page | 18 +- .../Regress.foo_test_unsigned_qualifier.page | 18 +- .../Regress.foo_test_unsigned_type.page | 18 +- .../Regress.func_obj_null_in.page | 20 +- .../Regress.global_get_flags_out.page | 20 +- .../Regress.has_parameter_named_attrs.page | 24 +- .../Regress.introspectable_via_alias.page | 18 +- .../Regress.set_abort_on_error.page | 18 +- .../Regress.test_array_callback.page | 18 +- .../Regress.test_array_fixed_out_objects.page | 20 +- .../Regress.test_array_fixed_size_int_in.page | 20 +- .../Regress.test_array_fixed_size_int_out.page | 20 +- .../Regress.test_array_fixed_size_int_return.page | 18 +- .../Regress.test_array_gint16_in.page | 20 +- .../Regress.test_array_gint32_in.page | 20 +- .../Regress.test_array_gint64_in.page | 20 +- .../Regress.test_array_gint8_in.page | 20 +- .../Regress.test_array_gtype_in.page | 20 +- .../Regress.test_array_int_full_out.page | 20 +- .../Regress.test_array_int_in.page | 20 +- .../Regress.test_array_int_inout.page | 22 +- .../Regress.test_array_int_none_out.page | 20 +- .../Regress.test_array_int_null_in.page | 20 +- .../Regress.test_array_int_null_out.page | 20 +- .../Regress.test_array_int_out.page | 22 +- .../Regress.test_async_ready_callback.page | 18 +- .../Regress.test_boolean.page | 18 +- .../Regress.test_boolean_false.page | 18 +- .../Regress.test_boolean_true.page | 18 +- .../Regress.test_boxeds_not_a_method.page | 37 + .../Regress.test_boxeds_not_a_static.page | 28 + .../Regress.test_cairo_context_full_return.page | 18 +- .../Regress.test_cairo_context_none_in.page | 18 +- .../Regress.test_cairo_surface_full_out.page | 18 +- .../Regress.test_cairo_surface_full_return.page | 18 +- .../Regress.test_cairo_surface_none_in.page | 18 +- .../Regress.test_cairo_surface_none_return.page | 18 +- .../Regress.test_callback.page | 18 +- .../Regress.test_callback_async.page | 18 +- .../Regress.test_callback_destroy_notify.page | 20 +- ....test_callback_destroy_notify_no_user_data.page | 20 +- .../Regress.test_callback_thaw_async.page | 18 +- .../Regress.test_callback_thaw_notifications.page | 20 +- .../Regress.test_callback_user_data.page | 20 +- .../Regress.test_closure.page | 18 +- .../Regress.test_closure_one_arg.page | 18 +- .../Regress.test_closure_variant.page | 22 +- .../Regress.test_date_in_gvalue.page | 18 +- .../Regress.test_def_error_quark.page | 18 +- .../Regress.test_double.page | 18 +- .../Regress.test_filename_return.page | 18 +- .../Regress.test_float.page | 18 +- .../Regress.test_garray_container_return.page | 18 +- .../Regress.test_garray_full_return.page | 18 +- .../Regress.test_gerror_callback.page | 18 +- .../Regress.test_ghash_container_return.page | 18 +- .../Regress.test_ghash_everything_return.page | 18 +- .../Regress.test_ghash_gvalue_in.page | 20 +- .../Regress.test_ghash_gvalue_return.page | 18 +- ...egress.test_ghash_nested_everything_return.page | 18 +- ...gress.test_ghash_nested_everything_return2.page | 20 +- .../Regress.test_ghash_nothing_in.page | 18 +- .../Regress.test_ghash_nothing_in2.page | 18 +- .../Regress.test_ghash_nothing_return.page | 18 +- .../Regress.test_ghash_nothing_return2.page | 18 +- .../Regress.test_ghash_null_in.page | 18 +- .../Regress.test_ghash_null_out.page | 18 +- .../Regress.test_ghash_null_return.page | 18 +- .../Regress.test_glist_container_return.page | 18 +- .../Regress.test_glist_everything_return.page | 18 +- .../Regress.test_glist_nothing_in.page | 18 +- .../Regress.test_glist_nothing_in2.page | 18 +- .../Regress.test_glist_nothing_return.page | 18 +- .../Regress.test_glist_nothing_return2.page | 18 +- .../Regress.test_glist_null_in.page | 18 +- .../Regress.test_glist_null_out.page | 18 +- .../Regress.test_gslist_container_return.page | 18 +- .../Regress.test_gslist_everything_return.page | 18 +- .../Regress.test_gslist_nothing_in.page | 18 +- .../Regress.test_gslist_nothing_in2.page | 18 +- .../Regress.test_gslist_nothing_return.page | 18 +- .../Regress.test_gslist_nothing_return2.page | 18 +- .../Regress.test_gslist_null_in.page | 18 +- .../Regress.test_gslist_null_out.page | 18 +- .../Regress.test_gtype.page | 18 +- .../Regress.test_gvariant_as.page | 18 +- .../Regress.test_gvariant_asv.page | 18 +- .../Regress.test_gvariant_i.page | 18 +- .../Regress.test_gvariant_s.page | 18 +- .../Regress.test_gvariant_v.page | 18 +- .../Regress.test_hash_table_callback.page | 20 +- .../Regress.test_int.page | 18 +- .../Regress.test_int16.page | 18 +- .../Regress.test_int32.page | 18 +- .../Regress.test_int64.page | 18 +- .../Regress.test_int8.page | 18 +- .../Regress.test_int_out_utf8.page | 18 +- .../Regress.test_int_value_arg.page | 18 +- .../Regress.test_long.page | 18 +- .../Regress.test_multi_callback.page | 18 +- .../Regress.test_multi_double_args.page | 18 +- .../Regress.test_multiline_doc_comments.page | 18 +- .../Regress.test_nested_parameter.page | 24 +- .../Regress.test_null_gerror_callback.page | 18 +- .../Regress.test_owned_gerror_callback.page | 18 +- .../Regress.test_short.page | 18 +- .../Regress.test_simple_callback.page | 18 +- .../Regress.test_size.page | 18 +- .../Regress.test_ssize.page | 18 +- .../Regress.test_strv_in.page | 18 +- .../Regress.test_strv_in_gvalue.page | 18 +- .../Regress.test_strv_out.page | 18 +- .../Regress.test_strv_out_c.page | 18 +- .../Regress.test_strv_out_container.page | 18 +- .../Regress.test_strv_outarg.page | 18 +- .../Regress.test_timet.page | 18 +- .../Regress.test_torture_signature_0.page | 18 +- .../Regress.test_torture_signature_1.page | 18 +- .../Regress.test_torture_signature_2.page | 18 +- .../Regress.test_uint.page | 18 +- .../Regress.test_uint16.page | 18 +- .../Regress.test_uint32.page | 18 +- .../Regress.test_uint64.page | 18 +- .../Regress.test_uint8.page | 18 +- .../Regress.test_ulong.page | 18 +- .../Regress.test_unichar.page | 18 +- .../Regress.test_unsigned_enum_param.page | 18 +- .../Regress.test_ushort.page | 18 +- .../Regress.test_utf8_const_in.page | 18 +- .../Regress.test_utf8_const_return.page | 18 +- .../Regress.test_utf8_inout.page | 18 +- .../Regress.test_utf8_nonconst_return.page | 18 +- .../Regress.test_utf8_null_in.page | 18 +- .../Regress.test_utf8_null_out.page | 18 +- .../Regress.test_utf8_out.page | 18 +- .../Regress.test_utf8_out_nonconst_return.page | 20 +- .../Regress.test_utf8_out_out.page | 22 +- .../Regress.test_value_return.page | 20 +- .../Regress.test_versioning.page | 19 +- .../scanner/Regress-1.0-Python-expected/index.page | 18 +- tests/scanner/Regress-1.0-expected.gir | 90 ++ tests/scanner/Regress-1.0-sections-expected.txt | 2 + tests/scanner/annotationparser/Makefile.in | 6 +- tests/scanner/regress.c | 10 + tests/scanner/regress.h | 10 + tests/warn/Makefile.in | 6 +- 1760 files changed, 18727 insertions(+), 20523 deletions(-) create mode 100644 giscanner/doctemplates/C/callback.tmpl create mode 100644 giscanner/doctemplates/C/field.tmpl create mode 100644 giscanner/doctemplates/C/interface.tmpl create mode 100644 giscanner/doctemplates/Gjs/callback.tmpl create mode 100644 giscanner/doctemplates/Gjs/field.tmpl create mode 100644 giscanner/doctemplates/Gjs/interface.tmpl create mode 100644 giscanner/doctemplates/Python/callback.tmpl create mode 100644 giscanner/doctemplates/Python/field.tmpl create mode 100644 giscanner/doctemplates/Python/interface.tmpl rename tests/scanner/Regress-1.0-C-expected/{Regress.AnAnonymousUnion.None.page => Regress.ANNOTATION_CALCULATED_DEFINE.page} (56%) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page rename tests/scanner/{Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page => Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page} (56%) rename tests/scanner/{Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page => Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page} (56%) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.Intset.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page rename tests/scanner/Regress-1.0-Gjs-expected/{Regress.AnnotationObject.watch_full.page => Regress.AnnotationObject.watch.page} (68%) create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page rename tests/scanner/Regress-1.0-Python-expected/{Regress.AnnotationObject.watch_full.page => Regress.AnnotationObject.watch.page} (82%) create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.BOOL_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-y.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-rect.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-v.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-expose.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny-send_event.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-count.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-send_event.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct-regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page diff --git a/Makefile-gir.am b/Makefile-gir.am index d1d15d8..52f7ee3 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -27,18 +27,18 @@ CLEANFILES += gir/cairo-1.0.gir EXTRA_DIST += gir/cairo-1.0.gir.in # Doesn't seem to work to do gir/%.typelib =( -gir/cairo-1.0.typelib: g-ir-compiler -gir/DBus-1.0.typelib: g-ir-compiler -gir/DBusGLib-1.0.typelib: g-ir-compiler -gir/fontconfig-2.0.typelib: g-ir-compiler -gir/freetype2-2.0.typelib: g-ir-compiler -gir/GL-1.0.typelib: g-ir-compiler -gir/libxml2-2.0.typelib: g-ir-compiler -gir/xft-2.0.typelib: g-ir-compiler -gir/xlib-2.0.typelib: g-ir-compiler -gir/xfixes-4.0.typelib: g-ir-compiler -gir/xrandr-1.3.typelib: g-ir-compiler -gir/win32-1.0.typelib: g-ir-compiler +gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT) +gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT) +gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT) # glib with source (to enable documentation) if WITH_GLIBSRC @@ -58,11 +58,7 @@ endif GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0 GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0) -if OS_WIN32 -GLIB_LIBRARY=libglib-2.0-0 -else GLIB_LIBRARY=glib-2.0 -endif GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY) GLib_2_0_gir_SCANNERFLAGS = \ @@ -99,11 +95,7 @@ gir/DBusGLib-1.0.typelib: GObject-2.0.gir GOBJECT_INCLUDEDIR=$(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0 GOBJECT_LIBDIR=$(shell pkg-config --variable=libdir gobject-2.0) -if OS_WIN32 -GOBJECT_LIBRARY=libgobject-2.0-0 -else GOBJECT_LIBRARY=gobject-2.0 -endif GObject-2.0.gir: GLib-2.0.gir GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY) @@ -131,11 +123,7 @@ BUILT_GIRSOURCES += GObject-2.0.gir GMODULE_INCLUDEDIR=$(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0 GMODULE_LIBDIR=$(shell pkg-config --variable=libdir gmodule-2.0) -if OS_WIN32 -GMODULE_LIBRARY=libgmodule-2.0-0 -else GMODULE_LIBRARY=gmodule-2.0 -endif GModule-2.0.gir: GLib-2.0.gir @@ -161,11 +149,7 @@ BUILT_GIRSOURCES += GModule-2.0.gir GIO_INCLUDEDIR=$(shell pkg-config --variable=includedir gio-2.0)/glib-2.0 GIO_LIBDIR=$(shell pkg-config --variable=libdir gio-2.0) -if OS_WIN32 -GIO_LIBRARY=libgio-2.0-0 -else GIO_LIBRARY=gio-2.0 -endif if HAVE_GIO_UNIX GIO_UNIX_HDRS=$(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index e3a934a..bccd815 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -62,33 +62,42 @@ nobase_dist_template_DATA = \ giscanner/doctemplates/base.tmpl \ giscanner/doctemplates/class.tmpl \ giscanner/doctemplates/namespace.tmpl \ + giscanner/doctemplates/C/callback.tmpl \ giscanner/doctemplates/C/class.tmpl \ giscanner/doctemplates/C/constructor.tmpl \ giscanner/doctemplates/C/default.tmpl \ giscanner/doctemplates/C/enum.tmpl \ giscanner/doctemplates/C/function.tmpl \ + giscanner/doctemplates/C/field.tmpl \ + giscanner/doctemplates/C/interface.tmpl \ giscanner/doctemplates/C/method.tmpl \ giscanner/doctemplates/C/namespace.tmpl \ giscanner/doctemplates/C/property.tmpl \ giscanner/doctemplates/C/record.tmpl \ giscanner/doctemplates/C/signal.tmpl \ giscanner/doctemplates/C/vfunc.tmpl \ + giscanner/doctemplates/Python/callback.tmpl \ giscanner/doctemplates/Python/class.tmpl \ giscanner/doctemplates/Python/constructor.tmpl \ giscanner/doctemplates/Python/default.tmpl \ giscanner/doctemplates/Python/enum.tmpl \ giscanner/doctemplates/Python/function.tmpl \ + giscanner/doctemplates/Python/field.tmpl \ + giscanner/doctemplates/Python/interface.tmpl \ giscanner/doctemplates/Python/method.tmpl \ giscanner/doctemplates/Python/namespace.tmpl \ giscanner/doctemplates/Python/property.tmpl \ giscanner/doctemplates/Python/record.tmpl \ giscanner/doctemplates/Python/signal.tmpl \ giscanner/doctemplates/Python/vfunc.tmpl \ + giscanner/doctemplates/Gjs/callback.tmpl \ giscanner/doctemplates/Gjs/class.tmpl \ giscanner/doctemplates/Gjs/constructor.tmpl \ giscanner/doctemplates/Gjs/default.tmpl \ giscanner/doctemplates/Gjs/enum.tmpl \ giscanner/doctemplates/Gjs/function.tmpl \ + giscanner/doctemplates/Gjs/field.tmpl \ + giscanner/doctemplates/Gjs/interface.tmpl \ giscanner/doctemplates/Gjs/method.tmpl \ giscanner/doctemplates/Gjs/namespace.tmpl \ giscanner/doctemplates/Gjs/property.tmpl \ diff --git a/Makefile.in b/Makefile.in index 35e79a8..b56ebfa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -906,7 +906,7 @@ check_LTLIBRARIES = bin_SCRIPTS = g-ir-scanner g-ir-annotation-tool $(am__append_5) EXTRA_LTLIBRARIES = libcmph.la INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -923,7 +923,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -933,7 +933,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ @@ -1180,33 +1180,42 @@ nobase_dist_template_DATA = \ giscanner/doctemplates/base.tmpl \ giscanner/doctemplates/class.tmpl \ giscanner/doctemplates/namespace.tmpl \ + giscanner/doctemplates/C/callback.tmpl \ giscanner/doctemplates/C/class.tmpl \ giscanner/doctemplates/C/constructor.tmpl \ giscanner/doctemplates/C/default.tmpl \ giscanner/doctemplates/C/enum.tmpl \ giscanner/doctemplates/C/function.tmpl \ + giscanner/doctemplates/C/field.tmpl \ + giscanner/doctemplates/C/interface.tmpl \ giscanner/doctemplates/C/method.tmpl \ giscanner/doctemplates/C/namespace.tmpl \ giscanner/doctemplates/C/property.tmpl \ giscanner/doctemplates/C/record.tmpl \ giscanner/doctemplates/C/signal.tmpl \ giscanner/doctemplates/C/vfunc.tmpl \ + giscanner/doctemplates/Python/callback.tmpl \ giscanner/doctemplates/Python/class.tmpl \ giscanner/doctemplates/Python/constructor.tmpl \ giscanner/doctemplates/Python/default.tmpl \ giscanner/doctemplates/Python/enum.tmpl \ giscanner/doctemplates/Python/function.tmpl \ + giscanner/doctemplates/Python/field.tmpl \ + giscanner/doctemplates/Python/interface.tmpl \ giscanner/doctemplates/Python/method.tmpl \ giscanner/doctemplates/Python/namespace.tmpl \ giscanner/doctemplates/Python/property.tmpl \ giscanner/doctemplates/Python/record.tmpl \ giscanner/doctemplates/Python/signal.tmpl \ giscanner/doctemplates/Python/vfunc.tmpl \ + giscanner/doctemplates/Gjs/callback.tmpl \ giscanner/doctemplates/Gjs/class.tmpl \ giscanner/doctemplates/Gjs/constructor.tmpl \ giscanner/doctemplates/Gjs/default.tmpl \ giscanner/doctemplates/Gjs/enum.tmpl \ giscanner/doctemplates/Gjs/function.tmpl \ + giscanner/doctemplates/Gjs/field.tmpl \ + giscanner/doctemplates/Gjs/interface.tmpl \ giscanner/doctemplates/Gjs/method.tmpl \ giscanner/doctemplates/Gjs/namespace.tmpl \ giscanner/doctemplates/Gjs/property.tmpl \ @@ -1256,8 +1265,7 @@ STATIC_GIRSOURCES = \ # glib GLIB_INCLUDEDIR = $(shell pkg-config --variable=includedir glib-2.0)/glib-2.0 GLIB_LIBDIR = $(shell pkg-config --variable=libdir glib-2.0) -@OS_WIN32_FALSE@GLIB_LIBRARY = glib-2.0 -@OS_WIN32_TRUE@GLIB_LIBRARY = libglib-2.0-0 +GLIB_LIBRARY = glib-2.0 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY) GLib_2_0_gir_SCANNERFLAGS = \ --external-library \ @@ -1284,8 +1292,7 @@ GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ # gobject GOBJECT_INCLUDEDIR = $(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0 GOBJECT_LIBDIR = $(shell pkg-config --variable=libdir gobject-2.0) -@OS_WIN32_FALSE@GOBJECT_LIBRARY = gobject-2.0 -@OS_WIN32_TRUE@GOBJECT_LIBRARY = libgobject-2.0-0 +GOBJECT_LIBRARY = gobject-2.0 GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY) GObject_2_0_gir_SCANNERFLAGS = \ --external-library \ @@ -1310,8 +1317,7 @@ GObject_2_0_gir_FILES = \ # gmodule GMODULE_INCLUDEDIR = $(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0 GMODULE_LIBDIR = $(shell pkg-config --variable=libdir gmodule-2.0) -@OS_WIN32_FALSE@GMODULE_LIBRARY = gmodule-2.0 -@OS_WIN32_TRUE@GMODULE_LIBRARY = libgmodule-2.0-0 +GMODULE_LIBRARY = gmodule-2.0 GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY) GModule_2_0_gir_SCANNERFLAGS = \ --external-library \ @@ -1333,8 +1339,7 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ # gio GIO_INCLUDEDIR = $(shell pkg-config --variable=includedir gio-2.0)/glib-2.0 GIO_LIBDIR = $(shell pkg-config --variable=libdir gio-2.0) -@OS_WIN32_FALSE@GIO_LIBRARY = gio-2.0 -@OS_WIN32_TRUE@GIO_LIBRARY = libgio-2.0-0 +GIO_LIBRARY = gio-2.0 @HAVE_GIO_UNIX_FALSE@GIO_UNIX_HDRS = @HAVE_GIO_UNIX_TRUE@GIO_UNIX_HDRS = $(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h @HAVE_GIO_UNIX_FALSE@GIO_UNIX_PACKAGES = @@ -3404,18 +3409,18 @@ gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile < $< > $@.tmp && mv $@.tmp $@ # Doesn't seem to work to do gir/%.typelib =( -gir/cairo-1.0.typelib: g-ir-compiler -gir/DBus-1.0.typelib: g-ir-compiler -gir/DBusGLib-1.0.typelib: g-ir-compiler -gir/fontconfig-2.0.typelib: g-ir-compiler -gir/freetype2-2.0.typelib: g-ir-compiler -gir/GL-1.0.typelib: g-ir-compiler -gir/libxml2-2.0.typelib: g-ir-compiler -gir/xft-2.0.typelib: g-ir-compiler -gir/xlib-2.0.typelib: g-ir-compiler -gir/xfixes-4.0.typelib: g-ir-compiler -gir/xrandr-1.3.typelib: g-ir-compiler -gir/win32-1.0.typelib: g-ir-compiler +gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT) +gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT) +gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT) +gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT) +gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT) GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) diff --git a/build/gi-introspection-msvc.mak b/build/gi-introspection-msvc.mak index 5b345fa..36d63a4 100644 --- a/build/gi-introspection-msvc.mak +++ b/build/gi-introspection-msvc.mak @@ -2,11 +2,6 @@ # Change or pass in as a variable/env var if needed # The main DLLs that are used to build introspection files that are "installed" -GI_DLLNAME = girepository-1-vs$(VSVER) -GLIB_DLLNAME = glib-2-vs$(VSVER) -GMODULE_DLLNAME = gmodule-2-vs$(VSVER) -GOBJECT_DLLNAME = gobject-2-vs$(VSVER) -GIO_DLLNAME = gio-2-vs$(VSVER) CAIROGOBJECT_DLLNAME= cairo-gobject-vs$(VSVER) # Please do not change anything after this line @@ -119,7 +114,7 @@ GLib-$(GLIB_APIVERSION).gir: glib_list @-echo Generating $@... $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \ --add-include-path=..\gir --add-include-path=. --namespace=GLib --nsversion=$(GLIB_APIVERSION) \ - --no-libtool --pkg=glib-$(GLIB_APIVERSION) --include=win32-$(GI_APIVERSION) --library=$(GLIB_DLLNAME) --library=$(GOBJECT_DLLNAME) \ + --no-libtool --pkg=glib-$(GLIB_APIVERSION) --include=win32-$(GI_APIVERSION) --library=glib-2.0 --library=gobject-2.0 \ --external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g \ --symbol-prefix=glib --c-include="glib.h" -I$(BASEDIR)\include\glib-$(GLIB_APIVERSION) \ -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include -DGETTEXT_PACKAGE=Dummy \ @@ -129,7 +124,7 @@ GModule-$(GLIB_APIVERSION).gir: GLib-$(GLIB_APIVERSION).gir @-echo Generating $@... $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \ --add-include-path=..\gir --add-include-path=. --namespace=GModule --nsversion=2.0 \ - --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gmodule-$(GLIB_APIVERSION) --library=$(GMODULE_DLLNAME) \ + --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gmodule-$(GLIB_APIVERSION) --library=gmodule-2.0 \ --external-library --reparse-validate --identifier-prefix=G --c-include="gmodule.h" \ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include \ $(BASEDIR)\include\glib-2.0\gmodule.h ..\gir\gmodule-2.0.c -o $@ @@ -138,7 +133,7 @@ GObject-$(GLIB_APIVERSION).gir: gobject_list GModule-$(GLIB_APIVERSION).gir @-echo Generating $@... $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \ --add-include-path=..\gir --add-include-path=. --namespace=GObject --nsversion=$(GLIB_APIVERSION) \ - --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=$(GOBJECT_DLLNAME) \ + --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=gobject-2.0 \ --external-library --reparse-validate --identifier-prefix=G --c-include="glib-gobject.h" \ -I$(BASEDIR)/include/glib-2.0 -I$(BASEDIR)/lib/glib-2.0/include -I$(BASEDIR)/include \ -DGOBJECT_COMPILATION --filelist=gobject_list -o $@ @@ -148,7 +143,7 @@ Gio-$(GLIB_APIVERSION).gir: gio_list GObject-$(GLIB_APIVERSION).gir $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose -I.. --add-include-path=.. \ --add-include-path=..\gir --add-include-path=. --namespace=Gio --nsversion=$(GLIB_APIVERSION) \ --no-libtool --pkg=gio-$(GLIB_APIVERSION) --pkg=gio-windows-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION) \ - --library=$(GIO_DLLNAME) --external-library --reparse-validate --warn-all \ + --library=gio-2.0 --external-library --reparse-validate --warn-all \ --identifier-prefix=G --include=GLib-$(GLIB_APIVERSION) --c-include="gio/gio.h" -DGIO_COMPILATION \ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ -I$(BASEDIR)\include --filelist=gio_list -o $@ @@ -159,7 +154,7 @@ GIRepository-$(GLIB_APIVERSION).gir: gi_list GObject-$(GLIB_APIVERSION).gir win3 --add-include-path=..\gir --add-include-path=. --namespace=GIRepository --nsversion=$(GLIB_APIVERSION) \ --identifier-prefix=GI --symbol-prefix=g --c-include="girepository.h" --add-include-path=. \ --no-libtool --pkg=gobject-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION) \ - --library=$(GI_DLLNAME) -I..\girepository -I.. -I%BASEDIR%\include \ + --library=girepository-1.0 -I..\girepository -I.. -I%BASEDIR%\include \ -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include --filelist=gi_list \ -DGI_COMPILATION -o $@ diff --git a/build/win32/vs10/gi-install.props b/build/win32/vs10/gi-install.props index 7ee51f1..34ca6d3 100644 --- a/build/win32/vs10/gi-install.props +++ b/build/win32/vs10/gi-install.props @@ -69,33 +69,42 @@ copy ..\..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-intros copy ..\..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates copy ..\..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates copy ..\..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +copy ..\..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs diff --git a/build/win32/vs9/gi-install.vsprops b/build/win32/vs9/gi-install.vsprops index 618aad8..8621731 100644 --- a/build/win32/vs9/gi-install.vsprops +++ b/build/win32/vs9/gi-install.vsprops @@ -73,33 +73,42 @@ copy ..\..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-intros copy ..\..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates copy ..\..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates copy ..\..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates +copy ..\..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C copy ..\..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C +copy ..\..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python copy ..\..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python +copy ..\..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs +copy ..\..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs copy ..\..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs diff --git a/common.mk b/common.mk index 28b73c7..303622f 100644 --- a/common.mk +++ b/common.mk @@ -7,7 +7,7 @@ # INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -24,7 +24,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -34,7 +34,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ diff --git a/config.h.win32 b/config.h.win32 index 2056753..950bda6 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -96,7 +96,7 @@ #define PACKAGE_NAME "gobject-introspection" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gojbect-introspection 1.39.90" +#define PACKAGE_STRING "gojbect-introspection 1.40.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gobject-introspection" @@ -105,7 +105,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.39.90" +#define PACKAGE_VERSION "1.40.0" /* Define to the platform's shared library suffix */ #define SHLIB_SUFFIX ".dll" @@ -126,7 +126,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.39.90" +#define VERSION "1.40.0" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/configure b/configure index 67af2b1..a4f5f95 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gobject-introspection 1.39.90. +# Generated by GNU Autoconf 2.69 for gobject-introspection 1.40.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.39.90' -PACKAGE_STRING='gobject-introspection 1.39.90' +PACKAGE_VERSION='1.40.0' +PACKAGE_STRING='gobject-introspection 1.40.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection' PACKAGE_URL='' @@ -1426,7 +1426,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gobject-introspection 1.39.90 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.40.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1497,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.39.90:";; + short | recursive ) echo "Configuration of gobject-introspection 1.40.0:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.39.90 +gobject-introspection configure 1.40.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2203,7 +2203,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gobject-introspection $as_me 1.39.90, which was +It was created by gobject-introspection $as_me 1.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3071,7 +3071,7 @@ fi # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.39.90' + VERSION='1.40.0' cat >>confdefs.h <<_ACEOF @@ -3303,7 +3303,7 @@ AM_BACKSLASH='\' # Used in docs/reference/version.xml -GI_VERSION=1.39.90 +GI_VERSION=1.40.0 # Check for Win32 @@ -15410,7 +15410,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gobject-introspection $as_me 1.39.90, which was +This file was extended by gobject-introspection $as_me 1.40.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15476,7 +15476,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gobject-introspection config.status 1.39.90 +gobject-introspection config.status 1.40.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e893ef..96da585 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 39) -m4_define(gi_micro_version, 90) +m4_define(gi_minor_version, 40) +m4_define(gi_micro_version, 0) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index 9cd3870..855da74 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,7 +15,7 @@

- This document is for GObject Introspection version 1.39.90 + This document is for GObject Introspection version 1.40.0 . The latest version of this documentation can be found on-line at http://developer.gnome.org/gi/unstable/. diff --git a/docs/reference/version.xml b/docs/reference/version.xml index d3781d7..32b7211 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -1.39.90 +1.40.0 diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0cc13e8..f4c5ba2 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -11040,7 +11040,8 @@ /** * g_application_add_main_option_entries: * @application: a #GApplication - * @entries: a %NULL-terminated list of #GOptionEntrys + * @entries: (array zero-terminated=1) (element-type GOptionEntry): a + * %NULL-terminated list of #GOptionEntrys * * Adds main option entries to be handled by @application. * @@ -32361,7 +32362,7 @@ * @cancellable: (allow-none): a %GCancellable or %NULL * * Creates a %GSource that can be attached to a %GMainContext to monitor - * for the availibility of the specified @condition on the socket. + * for the availability of the specified @condition on the socket. * * The callback on the source is of the #GSocketSourceFunc type. * @@ -33886,8 +33887,8 @@ * g_subprocess_get_identifier: * @subprocess: a #GSubprocess * - * On UNIX, returns the process ID as a decimal string. On Windows, - * returns the result of GetProcessId() also as a string. + * On UNIX, returns the process ID as a decimal string. + * On Windows, returns the result of GetProcessId() also as a string. */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 31029d8..9326bbf 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -2584,7 +2584,7 @@ /** - * GVariantDict: (skip) + * GVariantDict: * * #GVariantDict is a mutable interface to #GVariant dictionaries. * @@ -11631,6 +11631,9 @@ * character until it knows that the next character is not a mark that * could combine with the base character.) * + * Using extensions such as "//TRANSLIT" may not work (or may not work + * well) on many platforms. Consider using g_str_to_ascii() instead. + * * Returns: If the conversion was successful, a newly allocated * nul-terminated string, which must be freed with * g_free(). Otherwise %NULL and @error will be set. @@ -14787,22 +14790,16 @@ /** * g_get_monotonic_time: * - * Queries the system monotonic time, if available. - * - * On POSIX systems with clock_gettime() and `CLOCK_MONOTONIC` this call - * is a very shallow wrapper for that. Otherwise, we make a best effort - * that probably involves returning the wall clock time (with at least - * microsecond accuracy, subject to the limitations of the OS kernel). + * Queries the system monotonic time. * - * It's important to note that POSIX `CLOCK_MONOTONIC` does - * not count time spent while the machine is suspended. + * The monotonic clock will always increase and doesn't suffer + * discontinuities when the user (or NTP) changes the system time. It + * may or may not continue to tick during times where the machine is + * suspended. * - * On Windows, "limitations of the OS kernel" is a rather substantial - * statement. Depending on the configuration of the system, the wall - * clock time is updated as infrequently as 64 times a second (which - * is approximately every 16ms). Also, on XP (but not on Vista or later) - * the monotonic clock is locally monotonic, but may differ in exact - * value between processes due to timer wrap handling. + * We try to use the clock that corresponds as closely as possible to + * the passage of time as measured by system calls such as poll() but it + * may not always be possible to do this. * * Returns: the monotonic time, in microseconds * Since: 2.28 @@ -15367,6 +15364,15 @@ * otherwise you have to make sure that any dynamically allocated * values are freed yourself. * + * It is safe to continue iterating the #GHashTable afterward: + * |[ + * while (g_hash_table_iter_next (&iter, &key, &value)) + * { + * if (condition) + * g_hash_table_iter_remove (&iter); + * } + * ]| + * * Since: 2.16 */ @@ -18627,6 +18633,9 @@ * * Passes the results of polling back to the main loop. * + * You must have successfully acquired the context with + * g_main_context_acquire() before you may call this function. + * * Returns: %TRUE if some sources are ready to be dispatched. */ @@ -18648,6 +18657,9 @@ * @context: a #GMainContext * * Dispatches all pending sources. + * + * You must have successfully acquired the context with + * g_main_context_acquire() before you may call this function. */ @@ -18849,6 +18861,9 @@ * Prepares to poll sources within a main loop. The resulting information * for polling is determined by calling g_main_context_query (). * + * You must have successfully acquired the context with + * g_main_context_acquire() before you may call this function. + * * Returns: %TRUE if some source is ready to be dispatched * prior to polling. */ @@ -18901,6 +18916,9 @@ * * Determines information necessary to poll this main loop. * + * You must have successfully acquired the context with + * g_main_context_acquire() before you may call this function. + * * Returns: the number of records actually stored in @fds, * or, if more than @n_fds records need to be stored, the number * of records that need to be stored. @@ -25646,6 +25664,9 @@ * @source will hold a reference on @child_source while @child_source * is attached to it. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * Since: 2.28 */ @@ -25662,6 +25683,9 @@ * the @revents field in the #GPollFD struct and return %TRUE if events need * to be processed. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * Using this API forces the linear scanning of event sources on each * main loop iteration. Newly-written event sources should try to use * g_source_add_unix_fd() instead of this API. @@ -25683,6 +25707,9 @@ * It is not necessary to remove the fd before destroying the source; it * will be cleaned up automatically. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * As the name suggests, this function is not available on Windows. * * Returns: an opaque tag @@ -25906,6 +25933,9 @@ * If you want to remove a fd, don't set its event mask to zero. * Instead, call g_source_remove_unix_fd(). * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * As the name suggests, this function is not available on Windows. * * Since: 2.36 @@ -25942,6 +25972,9 @@ * The return value of this function is only defined when the function * is called from the check or dispatch functions for @source. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * As the name suggests, this function is not available on Windows. * * Returns: the conditions reported on the fd @@ -26013,6 +26046,9 @@ * * Detaches @child_source from @source and destroys it. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * Since: 2.28 */ @@ -26024,6 +26060,9 @@ * * Removes a file descriptor from the set of file descriptors polled for * this source. + * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. */ @@ -26038,6 +26077,9 @@ * watched while keeping the same source around. In the normal case you * will just want to destroy the source. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * As the name suggests, this function is not available on Windows. * * Since: 2.36 @@ -26147,6 +26189,10 @@ * source will be dispatched if it is ready to be dispatched and no * sources at a higher (numerically smaller) priority are ready to be * dispatched. + * + * A child source always has the same priority as its parent. It is not + * permitted to change the priority of a source once it has been added + * as a child of another source. */ @@ -26173,6 +26219,9 @@ * for both sources is reached during the same main context iteration * then the order of dispatch is undefined. * + * This API is only intended to be used by implementations of #GSource. + * Do not call this API on a #GSource that you did not create. + * * Since: 2.36 */ @@ -26732,6 +26781,34 @@ /** + * g_str_to_ascii: + * @str: a string, in UTF-8 + * @from_locale: (allow-none): the source locale, if known + * + * Transliterate @str to plain ASCII. + * + * For best results, @str should be in composed normalised form. + * + * This function performs a reasonably good set of character + * replacements. The particular set of replacements that is done may + * change by version or even by runtime environment. + * + * If the source language of @str is known, it can used to improve the + * accuracy of the translation by passing it as @from_locale. It should + * be a valid POSIX locale string (of the form + * "language[_territory][.codeset][@modifier]"). + * + * If @from_locale is %NULL then the current locale is used. + * + * If you want to do translation for no specific locale, and you want it + * to be done independently of the currently locale, specify "C" for + * @from_locale. + * + * Returns: a string in plain ASCII + */ + + +/** * g_str_tokenize_and_fold: * @string: a string * @translit_locale: (allow-none): the language code (like 'de' or diff --git a/girepository/giobjectinfo.c b/girepository/giobjectinfo.c index 3e3b312..d92a861 100644 --- a/girepository/giobjectinfo.c +++ b/girepository/giobjectinfo.c @@ -48,6 +48,40 @@ */ /** + * g_object_info_get_field_offset: + * @info: a #GIObjectInfo + * @n: index of queried field + * + * Obtain the offset of the specified field. + * + * Returns: field offset in bytes + */ +static gint32 +g_object_info_get_field_offset (GIObjectInfo *info, + gint n) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + Header *header = (Header *)rinfo->typelib->data; + ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; + guint32 offset; + gint i; + FieldBlob *field_blob; + + offset = rinfo->offset + header->object_blob_size + + (blob->n_interfaces + blob->n_interfaces % 2) * 2; + + for (i = 0; i < n; i++) + { + field_blob = (FieldBlob *)&rinfo->typelib->data[offset]; + offset += header->field_blob_size; + if (field_blob->has_embedded_type) + offset += header->callback_blob_size; + } + + return offset; +} + +/** * g_object_info_get_parent: * @info: a #GIObjectInfo * @@ -251,18 +285,11 @@ g_object_info_get_field (GIObjectInfo *info, { gint offset; GIRealInfo *rinfo = (GIRealInfo *)info; - Header *header; - ObjectBlob *blob; g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL); - header = (Header *)rinfo->typelib->data; - blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + n * header->field_blob_size; + offset = g_object_info_get_field_offset(info, n); return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset); } @@ -313,9 +340,7 @@ g_object_info_get_property (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + n * header->property_blob_size; return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, @@ -370,9 +395,7 @@ g_object_info_get_method (GIObjectInfo *info, blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size + n * header->function_blob_size; @@ -406,9 +429,7 @@ g_object_info_find_method (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size; return _g_base_info_find_method ((GIBaseInfo*)info, offset, blob->n_methods, name); @@ -518,9 +539,7 @@ g_object_info_get_signal (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size + blob->n_methods * header->function_blob_size + n * header->signal_blob_size; @@ -609,9 +628,7 @@ g_object_info_get_vfunc (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size + blob->n_methods * header->function_blob_size + blob->n_signals * header->signal_blob_size @@ -652,9 +669,7 @@ g_object_info_find_vfunc (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size + blob->n_methods * header->function_blob_size + blob->n_signals * header->signal_blob_size; @@ -769,9 +784,7 @@ g_object_info_get_constant (GIObjectInfo *info, header = (Header *)rinfo->typelib->data; blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset]; - offset = rinfo->offset + header->object_blob_size - + (blob->n_interfaces + blob->n_interfaces % 2) * 2 - + blob->n_fields * header->field_blob_size + offset = g_object_info_get_field_offset(info, blob->n_fields) + blob->n_properties * header->property_blob_size + blob->n_methods * header->function_blob_size + blob->n_signals * header->signal_blob_size diff --git a/girepository/girparser.c b/girepository/girparser.c index 82005fc..c7feb6a 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -62,37 +62,38 @@ struct _GIrParser typedef enum { + STATE_NONE = 0, STATE_START, STATE_END, STATE_REPOSITORY, STATE_INCLUDE, - STATE_C_INCLUDE, - STATE_PACKAGE, /* 5 */ + STATE_C_INCLUDE, /* 5 */ + STATE_PACKAGE, STATE_NAMESPACE, STATE_ENUM, STATE_BITFIELD, - STATE_FUNCTION, - STATE_FUNCTION_RETURN, /* 10 */ + STATE_FUNCTION, /* 10 */ + STATE_FUNCTION_RETURN, STATE_FUNCTION_PARAMETERS, STATE_FUNCTION_PARAMETER, STATE_CLASS, - STATE_CLASS_FIELD, - STATE_CLASS_PROPERTY, /* 15 */ + STATE_CLASS_FIELD, /* 15 */ + STATE_CLASS_PROPERTY, STATE_INTERFACE, STATE_INTERFACE_PROPERTY, STATE_INTERFACE_FIELD, - STATE_IMPLEMENTS, - STATE_PREREQUISITE, /* 20 */ + STATE_IMPLEMENTS, /* 20 */ + STATE_PREREQUISITE, STATE_BOXED, STATE_BOXED_FIELD, STATE_STRUCT, - STATE_STRUCT_FIELD, - STATE_UNION, /* 25 */ + STATE_STRUCT_FIELD, /* 25 */ + STATE_UNION, STATE_UNION_FIELD, STATE_NAMESPACE_CONSTANT, STATE_CLASS_CONSTANT, - STATE_INTERFACE_CONSTANT, - STATE_ALIAS, /* 30 */ + STATE_INTERFACE_CONSTANT, /* 30 */ + STATE_ALIAS, STATE_TYPE, STATE_ATTRIBUTE, STATE_PASSTHROUGH @@ -123,7 +124,7 @@ struct _ParseContext GList *type_stack; GList *type_parameters; int type_depth; - gboolean in_embedded_type; + ParseState in_embedded_state; }; #define CURRENT_NODE(ctx) ((GIrNode *)((ctx)->node_stack->data)) @@ -807,7 +808,7 @@ start_function (GMarkupParseContext *context, const gchar *throws; GIrNodeFunction *function; gboolean found = FALSE; - gboolean in_embedded_type; + ParseState in_embedded_state = STATE_NONE; switch (ctx->state) { @@ -830,8 +831,10 @@ start_function (GMarkupParseContext *context, case STATE_ENUM: found = strcmp (element_name, "function") == 0; break; + case STATE_CLASS_FIELD: case STATE_STRUCT_FIELD: found = (found || strcmp (element_name, "callback") == 0); + in_embedded_state = ctx->state; break; default: break; @@ -840,12 +843,10 @@ start_function (GMarkupParseContext *context, if (!found) return FALSE; - in_embedded_type = ctx->state == STATE_STRUCT_FIELD; - if (!introspectable_prelude (context, attribute_names, attribute_values, ctx, STATE_FUNCTION)) return TRUE; - ctx->in_embedded_type = in_embedded_type; + ctx->in_embedded_state = in_embedded_state; name = find_attribute ("name", attribute_names, attribute_values); shadows = find_attribute ("shadows", attribute_names, attribute_values); @@ -3210,10 +3211,10 @@ end_element_handler (GMarkupParseContext *context, else { g_debug("case STATE_FUNCTION %d", CURRENT_NODE (ctx)->type); - if (ctx->in_embedded_type) + if (ctx->in_embedded_state != STATE_NONE) { - ctx->in_embedded_type = FALSE; - state_switch (ctx, STATE_STRUCT_FIELD); + state_switch (ctx, ctx->in_embedded_state); + ctx->in_embedded_state = STATE_NONE; } else if (CURRENT_NODE (ctx)->type == G_IR_NODE_INTERFACE) state_switch (ctx, STATE_INTERFACE); diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 8883496..41b54fd 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -1773,10 +1773,17 @@ validate_object_blob (ValidateContext *ctx, push_context (ctx, get_string_nofail (typelib, blob->name)); - for (i = 0; i < blob->n_fields; i++, offset2 += sizeof (FieldBlob)) + for (i = 0; i < blob->n_fields; i++) { + FieldBlob *blob = (FieldBlob*) &typelib->data[offset2]; + if (!validate_field_blob (ctx, offset2, error)) return FALSE; + + offset2 += sizeof (FieldBlob); + /* Special case fields which are callbacks. */ + if (blob->has_embedded_type) + offset2 += sizeof (CallbackBlob); } for (i = 0; i < blob->n_properties; i++, offset2 += sizeof (PropertyBlob)) diff --git a/giscanner/ast.py b/giscanner/ast.py index b5b2ad7..130f50c 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -409,12 +409,15 @@ but adds it to things like ctypes, symbols, and type_names. self.type_names[node.gtype_name] = node elif isinstance(node, Function): self.symbols[node.symbol] = node - if isinstance(node, (Compound, Class, Interface)): + if isinstance(node, (Compound, Class, Interface, Boxed)): for fn in chain(node.methods, node.static_methods, node.constructors): if not isinstance(fn, Function): continue fn.namespace = self self.symbols[fn.symbol] = fn + if isinstance(node, (Compound, Class, Interface)): + for f in node.fields: + f.namespace = self if isinstance(node, (Class, Interface)): for m in chain(node.signals, node.properties): m.namespace = self @@ -678,8 +681,8 @@ class VFunction(Callable): self.invoker = None @classmethod - def from_callback(cls, cb): - obj = cls(cb.name, cb.retval, cb.parameters[1:], + def from_callback(cls, name, cb): + obj = cls(name, cb.retval, cb.parameters[1:], cb.throws) return obj @@ -916,6 +919,7 @@ class Field(Annotated): self.bits = bits self.anonymous_node = anonymous_node self.private = False + self.namespace = None self.parent = None # a compound def __cmp__(self, other): diff --git a/giscanner/doctemplates/C/callback.tmpl b/giscanner/doctemplates/C/callback.tmpl new file mode 100644 index 0000000..f285ff6 --- /dev/null +++ b/giscanner/doctemplates/C/callback.tmpl @@ -0,0 +1,4 @@ +<%inherit file="./function.tmpl"/> +<%block name="info"> + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} + diff --git a/giscanner/doctemplates/C/field.tmpl b/giscanner/doctemplates/C/field.tmpl new file mode 100644 index 0000000..b66ae92 --- /dev/null +++ b/giscanner/doctemplates/C/field.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index 8d66943..3f9e627 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -6,7 +6,7 @@ ${formatter.format_type(node.retval.type) | x} ${formatter.format_function_name(node)} -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): % if arg.type.ctype == '': % else: @@ -19,12 +19,12 @@ <%block name="synopsis"> - + ${node.retval.type.ctype} ${formatter.format_function_name(node)} (\ -% if not formatter.get_parameters(node): +% if not formatter.get_in_parameters(node): void\ % else: -% for ix, arg in enumerate(formatter.get_parameters(node)): +% for ix, arg in enumerate(formatter.get_in_parameters(node)): % if ix != 0: ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\ % endif @@ -33,18 +33,17 @@ ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_fun % else: ${formatter.format_type(arg.type) | x} ${arg.argname}\ % endif -% if ix != len(formatter.get_parameters(node)) - 1: +% if ix != len(formatter.get_in_parameters(node)) - 1: , % endif % endfor % endif ); - - + <%block name="details"> -% if formatter.get_parameters(node) or node.retval: +% if formatter.get_in_parameters(node) or node.retval: -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} diff --git a/giscanner/doctemplates/C/interface.tmpl b/giscanner/doctemplates/C/interface.tmpl new file mode 100644 index 0000000..3f18b02 --- /dev/null +++ b/giscanner/doctemplates/C/interface.tmpl @@ -0,0 +1,2 @@ +<%! page_type="guide" %>\ +<%inherit file="/class.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/callback.tmpl b/giscanner/doctemplates/Gjs/callback.tmpl new file mode 100644 index 0000000..d7b9779 --- /dev/null +++ b/giscanner/doctemplates/Gjs/callback.tmpl @@ -0,0 +1,27 @@ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + +function on${node.name}(\ +${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\ +): ${formatter.format_out_parameters(node)} { +} + +<%block name="details"> +% if formatter.has_any_parameters(node): + +% for arg in formatter.get_in_parameters(node): + +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + +% endfor +% for arg in formatter.get_out_parameters(node): + +<code>${(arg.argname + ' (out)') if arg.direction == 'inout' else arg.argname}</code> +${formatter.format(node, arg.doc)} + +% endfor + +% endif + + diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl index 887c646..7694d72 100644 --- a/giscanner/doctemplates/Gjs/class.tmpl +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -1,18 +1,30 @@ <%inherit file="/class.tmpl"/> <%block name="synopsis"> - + \ +% if node.namespace is not None: + const ${namespace.name} = imports.gi.${namespace.name}; -let ${formatter.to_underscores(node.name).lower()} = new ${namespace.name}.${node.name}(\ +let ${formatter.to_lower_camel_case(node.name)} = new ${namespace.name}.${node.name}(\ +% if isinstance(node, (ast.Class, ast.Interface)): % if len(node.properties) > 0: { % for ix, property_ in enumerate(node.properties): -% if property_.construct or property_.construct_only or property_.writable: +% if (property_.construct or property_.construct_only) and property_.writable: ${property_.name.replace('-', '_')}: value, % endif % endfor }\ % endif +% else: +${formatter.format_gboxed_constructor(node)}\ +% endif ); - - + \ +% else: +

+ This structure is inside ${node.parent.namespace.name}.${node.parent.name} + and can only be used as a field of that. +

+% endif + diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/Gjs/enum.tmpl index 35cdd43..e239de1 100644 --- a/giscanner/doctemplates/Gjs/enum.tmpl +++ b/giscanner/doctemplates/Gjs/enum.tmpl @@ -1,3 +1,4 @@ +<%! page_type="guide" %> <%inherit file="/base.tmpl"/> <%block name="details"> % if node.members: @@ -11,3 +12,10 @@ ${formatter.format(node, member.doc)} % endif +<%block name="links">\ + + Functions + \ + \ No newline at end of file diff --git a/giscanner/doctemplates/Gjs/field.tmpl b/giscanner/doctemplates/Gjs/field.tmpl new file mode 100644 index 0000000..dda8246 --- /dev/null +++ b/giscanner/doctemplates/Gjs/field.tmpl @@ -0,0 +1,9 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} + ${node.name} + +<%block name="synopsis"> + +${node.parent.name}.${formatter.to_underscores(node)}: ${formatter.format_type(node.type, True)} (${formatter.format_property_flags(node)}) + diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index e0fd961..8e9d741 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -6,7 +6,7 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): % if arg.type.ctype == '': % else: @@ -19,30 +19,29 @@ <%block name="synopsis"> - + function \ -${node.name}(\ -${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\ -):${formatter.format_type(node.retval.type)} { +${node.name if node.shadows is None else node.shadows}(\ +${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\ +): ${formatter.format_out_parameters(node)} { // Gjs wrapper for ${node.symbol}() } - - + <%block name="details"> -% if formatter.get_parameters(node) or node.retval: +% if formatter.has_any_parameters(node): -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} % endfor -% if node.retval and node.retval.type.ctype != 'void': +% for arg in formatter.get_out_parameters(node): -<code>Returns</code> -${formatter.format(node, node.retval.doc)} +<code>${(arg.argname + ' (out)') if arg.direction == 'inout' else arg.argname}</code> +${formatter.format(node, arg.doc)} -% endif +% endfor % endif diff --git a/giscanner/doctemplates/Gjs/interface.tmpl b/giscanner/doctemplates/Gjs/interface.tmpl new file mode 100644 index 0000000..2f01f20 --- /dev/null +++ b/giscanner/doctemplates/Gjs/interface.tmpl @@ -0,0 +1,17 @@ +<%inherit file="/class.tmpl"/> +<%block name="synopsis"> + +const ${namespace.name} = imports.gi.${namespace.name}; + +let ${formatter.to_underscores(node).lower()} = new ${namespace.name}.${node.name}(\ +% if len(node.properties) > 0: +{ +% for ix, property_ in enumerate(node.properties): +% if (property_.construct or property_.construct_only) and property_.writable: + ${property_.name.replace('-', '_')}: value, +% endif +% endfor +}\ +% endif +); + diff --git a/giscanner/doctemplates/Gjs/property.tmpl b/giscanner/doctemplates/Gjs/property.tmpl index 3316a00..dda8246 100644 --- a/giscanner/doctemplates/Gjs/property.tmpl +++ b/giscanner/doctemplates/Gjs/property.tmpl @@ -4,7 +4,6 @@ ${node.name} <%block name="synopsis"> - -"${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} - - + +${node.parent.name}.${formatter.to_underscores(node)}: ${formatter.format_type(node.type, True)} (${formatter.format_property_flags(node)}) + diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 084d974..7c50816 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -4,21 +4,22 @@ ${node.name} <%block name="synopsis"> - -function callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg in formatter.get_parameters(node): -${arg.argname}:${formatter.format_type(arg.type)}, \ + +connect('${node.name}', function (${formatter.to_lower_camel_case(node.parent.name)}, \ +% for arg in formatter.get_in_parameters(node): +% if arg.type.target_fundamental != 'none': +${arg.argname}: ${formatter.format_type(arg.type, True)}, \ +% endif % endfor -):${formatter.format_type(node.retval.type)}; - - +): ${formatter.format_type(node.retval.type, True)}); + <%block name="details"> -<code>${formatter.to_underscores(node.parent.name).lower()}</code> +<code>${formatter.to_lower_camel_case(node.parent.name)}</code>

instance of ${formatter.format_xref(node.parent)} that is emitting the signal

 -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl index 1cbe511..2bd1127 100644 --- a/giscanner/doctemplates/Gjs/vfunc.tmpl +++ b/giscanner/doctemplates/Gjs/vfunc.tmpl @@ -1,16 +1,15 @@ <%inherit file="/base.tmpl"/> <%block name="synopsis"> - + function vfunc_${node.name}(\ -${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\ -):${formatter.format_type(node.retval.type)} { +${', '.join('%s: %s' % (arg.argname, formatter.format_type(arg.type, True)) for arg in formatter.get_in_parameters(node))}\ +): ${formatter.format_out_parameters(node)} { } - - + <%block name="details"> -% if formatter.get_parameters(node) or node.retval: +% if formatter.get_in_parameters(node) or node.retval: -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} @@ -25,3 +24,4 @@ ${formatter.format(node, node.retval.doc)} % endif + diff --git a/giscanner/doctemplates/Python/callback.tmpl b/giscanner/doctemplates/Python/callback.tmpl new file mode 100644 index 0000000..4fcbfe3 --- /dev/null +++ b/giscanner/doctemplates/Python/callback.tmpl @@ -0,0 +1,27 @@ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + +% if formatter.get_in_parameters(node): +@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))}) +% endif +@returns(${formatter.format_type(node.retval.type) | x}) +def on_${node.name}(${', '.join((arg.argname for arg in formatter.get_in_parameters(node)))}): + +<%block name="details"> +% if formatter.get_in_parameters(node) or node.retval: + +% for arg in formatter.get_in_parameters(node): + +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + +% endfor +% if node.retval and node.retval.type.ctype != 'void': + +<code>Returns</code> +${formatter.format(node, node.retval.doc)} + +% endif + +% endif + diff --git a/giscanner/doctemplates/Python/class.tmpl b/giscanner/doctemplates/Python/class.tmpl index 435b31a..51d25a9 100644 --- a/giscanner/doctemplates/Python/class.tmpl +++ b/giscanner/doctemplates/Python/class.tmpl @@ -3,7 +3,8 @@ from gi.repository import ${namespace.name} -${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +${formatter.to_underscores(node).lower()} = ${namespace.name}.${node.name}(\ +% if isinstance(node, (ast.Class, ast.Interface)): % for ix, property_ in enumerate(node.properties): % if property_.construct or property_.construct_only or property_.writable: ${property_.name.replace('-', '_')}=value\ @@ -12,6 +13,6 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( % endif % endif % endfor -)\ - - +% endif +) + diff --git a/giscanner/doctemplates/Python/field.tmpl b/giscanner/doctemplates/Python/field.tmpl new file mode 100644 index 0000000..b66ae92 --- /dev/null +++ b/giscanner/doctemplates/Python/field.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index 072a118..7ad1ac0 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -6,7 +6,7 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): % if arg.type.ctype == '': % else: @@ -19,24 +19,18 @@ <%block name="synopsis"> - -% if formatter.get_parameters(node): -@accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\ -) + +% if formatter.get_in_parameters(node): +@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))}) % endif @returns(${formatter.format_type(node.retval.type) | x}) -def \ -${node.name}(\ -${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get_parameters(node)))}\ -): +def ${node.name}(${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get_in_parameters(node)))}): # Python wrapper for ${node.symbol}() - - + <%block name="details"> -% if formatter.get_parameters(node) or node.retval: +% if formatter.get_in_parameters(node) or node.retval: -% for ix, arg in enumerate(formatter.get_parameters(node)): +% for ix, arg in enumerate(formatter.get_in_parameters(node)): <code>${formatter.format_parameter_name(node, arg)}</code> ${formatter.format(node, arg.doc)} diff --git a/giscanner/doctemplates/Python/interface.tmpl b/giscanner/doctemplates/Python/interface.tmpl new file mode 100644 index 0000000..b3596a8 --- /dev/null +++ b/giscanner/doctemplates/Python/interface.tmpl @@ -0,0 +1,16 @@ +<%inherit file="/class.tmpl"/> +<%block name="synopsis"> + +from gi.repository import ${namespace.name} + +${formatter.to_underscores(node).lower()} = ${namespace.name}.${node.name}(\ +% for ix, property_ in enumerate(node.properties): +% if property_.construct or property_.construct_only or property_.writable: +${property_.name.replace('-', '_')}=value\ +% if ix != len(node.properties) - 1: +, \ +% endif +% endif +% endfor +)\ + diff --git a/giscanner/doctemplates/Python/property.tmpl b/giscanner/doctemplates/Python/property.tmpl index 3316a00..c93d59b 100644 --- a/giscanner/doctemplates/Python/property.tmpl +++ b/giscanner/doctemplates/Python/property.tmpl @@ -4,7 +4,6 @@ ${node.name} <%block name="synopsis"> - + "${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} - - + diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index dc93110..c61b722 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -4,21 +4,20 @@ ${node.name} <%block name="synopsis"> - -def callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg in formatter.get_parameters(node): + +def callback(${formatter.to_underscores(node.parent).lower()}, \ +% for arg in formatter.get_in_parameters(node): ${arg.argname}, \ % endfor user_param1, ...) - - + <%block name="details"> -<code>${formatter.to_underscores(node.parent.name).lower()}</code> +<code>${formatter.to_underscores(node.parent).lower()}</code>

instance of ${formatter.format_xref(node.parent)} that is emitting the signal

 -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl index 98a3093..2c532e7 100644 --- a/giscanner/doctemplates/Python/vfunc.tmpl +++ b/giscanner/doctemplates/Python/vfunc.tmpl @@ -1,22 +1,16 @@ <%inherit file="/base.tmpl"/> <%block name="synopsis"> - -% if formatter.get_parameters(node): -@accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\ -) + +% if formatter.get_in_parameters(node): +@accepts(${', '.join((formatter.format_type(arg.type) for arg in formatter.get_in_parameters(node)))}) % endif @returns(${formatter.format_type(node.retval.type) | x}) -def \ -do_${node.name}(\ -${', '.join((arg.argname for arg in formatter.get_parameters(node)))}\ -): - - +def do_${node.name}(${', '.join((arg.argname for arg in formatter.get_in_parameters(node)))}): + <%block name="details"> -% if formatter.get_parameters(node) or node.retval: +% if formatter.get_in_parameters(node) or node.retval: -% for arg in formatter.get_parameters(node): +% for arg in formatter.get_in_parameters(node): <code>${arg.argname}</code> ${formatter.format(node, arg.doc)} diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl index 7898077..7a1d8db 100644 --- a/giscanner/doctemplates/base.tmpl +++ b/giscanner/doctemplates/base.tmpl @@ -6,24 +6,15 @@ xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - <%block name="info"> - ${formatter.format_xref(node.parent, type="guide", group=page_kind)} - + <%block name="info"> + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} +\ - <%block name="title">${formatter.format_page_name(node)}</%block> - <%block name="synopsis"> - - <%block name="doc"> - ${formatter.format(node, node.doc)} - - <%block name="since_version"> - % if node.version: -

Since ${node.version}

- % endif - - <%block name="details"> - - <%block name="links"> - + <%block name="title">${formatter.format_page_name(node)}</%block><%block name="synopsis"><%block name="doc"> +${formatter.format(node, node.doc)} +<%block name="since_version">\ +% if node.version: +

Since ${node.version}

\ +% endif +<%block name="details"><%block name="links"> diff --git a/giscanner/doctemplates/class.tmpl b/giscanner/doctemplates/class.tmpl index 7f8b686..8633386 100644 --- a/giscanner/doctemplates/class.tmpl +++ b/giscanner/doctemplates/class.tmpl @@ -1,6 +1,7 @@ <%! page_type="guide" %>\ <%inherit file="/base.tmpl"/> <%block name="details"> +% if isinstance(node, ast.Class): Hierarchy @@ -13,8 +14,23 @@ % endfor +% elif isinstance(node, ast.Interface): + + Prerequisites +

${node.name} requires ${formatter.format_prerequisites(node)}

+ + + Known Implementations +

${formatter.format_known_implementations(node)}

+ +% endif -<%block name="links"> +<%block name="links">\ + + Constructors + @@ -23,8 +39,9 @@ - Functions + Static Functions +% if isinstance(node, (ast.Class, ast.Interface)): Properties @@ -34,7 +51,11 @@ Virtual functions +% endif + + Fields + Other - + \ diff --git a/giscanner/doctemplates/namespace.tmpl b/giscanner/doctemplates/namespace.tmpl index bb58bb1..d4edcec 100644 --- a/giscanner/doctemplates/namespace.tmpl +++ b/giscanner/doctemplates/namespace.tmpl @@ -1,11 +1,9 @@ <%! page_type="guide" %>\ <%inherit file="/base.tmpl"/> -<%block name="doc"> - -<%block name="info"> - +<%block name="doc"> +<%block name="info"> <%block name="links"> - + Classes @@ -15,5 +13,4 @@ Other -<%block name="since_version"> - +<%block name="since_version"> diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index a4c817e..d888c81 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -42,13 +42,18 @@ def make_page_id(node, recursive=False): if hasattr(node, '_chain') and node._chain: parent = node._chain[-1] else: - parent = None + parent = getattr(node, 'parent', None) if parent is None: - return '%s.%s' % (node.namespace.name, node.name) + if isinstance(node, ast.Function) and node.shadows: + return '%s.%s' % (node.namespace.name, node.shadows) + else: + return '%s.%s' % (node.namespace.name, node.name) - if isinstance(node, (ast.Property, ast.Signal, ast.VFunction)): + if isinstance(node, (ast.Property, ast.Signal, ast.VFunction, ast.Field)): return '%s-%s' % (make_page_id(parent, recursive=True), node.name) + elif isinstance(node, ast.Function) and node.shadows: + return '%s.%s' % (make_page_id(parent, recursive=True), node.shadows) else: return '%s.%s' % (make_page_id(parent, recursive=True), node.name) @@ -56,8 +61,10 @@ def make_page_id(node, recursive=False): def get_node_kind(node): if isinstance(node, ast.Namespace): node_kind = 'namespace' - elif isinstance(node, (ast.Class, ast.Interface)): + elif isinstance(node, (ast.Class, ast.Boxed, ast.Compound)): node_kind = 'class' + elif isinstance(node, ast.Interface): + node_kind = 'interface' elif isinstance(node, ast.Record): node_kind = 'record' elif isinstance(node, ast.Function): @@ -67,7 +74,7 @@ def get_node_kind(node): node_kind = 'constructor' else: node_kind = 'function' - elif isinstance(node, ast.Enum): + elif isinstance(node, (ast.Enum, ast.Bitfield)): node_kind = 'enum' elif isinstance(node, ast.Property) and node.parent is not None: node_kind = 'property' @@ -75,6 +82,10 @@ def get_node_kind(node): node_kind = 'signal' elif isinstance(node, ast.VFunction) and node.parent is not None: node_kind = 'vfunc' + elif isinstance(node, ast.Callable): + node_kind = 'callback' + elif isinstance(node, ast.Field): + node_kind = 'field' else: node_kind = 'default' @@ -170,11 +181,16 @@ class DocFormatter(object): return saxutils.escape(text) def should_render_node(self, node): - if isinstance(node, ast.Constant): - return False - if getattr(node, "private", False): return False + # Nodes without namespace are AST bugs really + # They are used for structs and unions declared + # inline inside other structs, but they are not + # even picked up by g-ir-compiler, because they + # don't create a element. + # So just ignore them. + if isinstance(node, ast.Node) and node.namespace is None: + return False return True @@ -184,7 +200,7 @@ class DocFormatter(object): result = '' for para in doc.split('\n\n'): - result += '

' + result += '

' result += self.format_inline(node, para) result += '

' return result @@ -295,7 +311,7 @@ class DocFormatter(object): return dispatch[kind](node, match, props) - def get_parameters(self, node): + def get_in_parameters(self, node): raise NotImplementedError def format_inline(self, node, para): @@ -312,12 +328,12 @@ class DocFormatter(object): def format_function_name(self, func): raise NotImplementedError - def format_type(self, type_): + def format_type(self, type_, link=False): raise NotImplementedError def format_page_name(self, node): if isinstance(node, ast.Namespace): - return 'Index' + return node.name elif isinstance(node, ast.Function): return self.format_function_name(node) elif isinstance(node, ast.Property) and node.parent is not None: @@ -326,39 +342,74 @@ class DocFormatter(object): return '%s::%s' % (self.format_page_name(node.parent), node.name) elif isinstance(node, ast.VFunction) and node.parent is not None: return '%s::%s' % (self.format_page_name(node.parent), node.name) + elif isinstance(node, ast.Field) and node.parent is not None: + return '%s->%s' % (self.format_page_name(node.parent), node.name) else: return make_page_id(node) def format_xref(self, node, **attrdict): - if node is None: + if node is None or not hasattr(node, 'namespace'): attrs = [('xref', 'index')] + attrdict.items() return xmlwriter.build_xml_tag('link', attrs) elif isinstance(node, ast.Member): # Enum/BitField members are linked to the main enum page. return self.format_xref(node.parent, **attrdict) + '.' + node.name + elif node.namespace is self._transformer.namespace: + return self.format_internal_xref(node, attrdict) else: - attrs = [('xref', make_page_id(node))] + attrdict.items() - return xmlwriter.build_xml_tag('link', attrs) + return self.format_external_xref(node, attrdict) + + def format_internal_xref(self, node, attrdict): + attrs = [('xref', make_page_id(node))] + attrdict.items() + return xmlwriter.build_xml_tag('link', attrs) + + def format_external_xref(self, node, attrdict): + ns = node.namespace + attrs = [('href', '../%s-%s/%s.html' % (ns.name, str(ns.version), + make_page_id(node)))] + attrs += attrdict.items() + return xmlwriter.build_xml_tag('link', attrs, self.format_page_name(node)) + + def field_is_writable(self, field): + return True def format_property_flags(self, property_, construct_only=False): flags = [] + if property_.readable and not construct_only: flags.append("Read") - if property_.writable and not construct_only: + if property_.writable and not construct_only and \ + self.field_is_writable(property_): flags.append("Write") - if property_.construct: - flags.append("Construct") - if property_.construct_only: - flags.append("Construct Only") + if isinstance(property_, ast.Property): + if property_.construct: + flags.append("Construct") + if property_.construct_only: + flags.append("Construct Only") return " / ".join(flags) - def to_underscores(self, string): - return to_underscores(string) + def to_underscores(self, node): + if isinstance(node, ast.Property): + return node.name.replace('-', '_') + elif node.name: + return to_underscores(node.name) + elif isinstance(node, ast.Callback): + return 'callback' + elif isinstance(node, ast.Union): + return 'anonymous_union' + elif isinstance(node, ast.Field): + return 'anonymous field' + else: + raise Exception('invalid node') + + def to_lower_camel_case(self, string): + return string[0].lower() + string[1:] def get_class_hierarchy(self, node): - parent_chain = [node] + assert isinstance(node, ast.Class) + parent_chain = [node] while node.parent_type: node = self._transformer.lookup_typenode(node.parent_type) parent_chain.append(node) @@ -366,6 +417,42 @@ class DocFormatter(object): parent_chain.reverse() return parent_chain + def format_prerequisites(self, node): + assert isinstance(node, ast.Interface) + + if len(node.prerequisites) > 0: + if len(node.prerequisites) > 1: + return ', '.join(node.prerequisites[:-1]) + \ + ' and ' + node.prerequisites[-1] + else: + return node.prerequisites[0] + else: + return 'GObject.Object' + + def format_known_implementations(self, node): + assert isinstance(node, ast.Interface) + + node_name = node.namespace.name + '.' + node.name + impl = [] + + for c in node.namespace.itervalues(): + if not isinstance(c, ast.Class): + continue + for implemented in c.interfaces: + if implemented.target_giname == node_name: + impl.append(c) + break + + if len(impl) == 0: + return 'None' + else: + out = '%s is implemented by ' % (node.name,) + if len(impl) == 1: + return out + impl[0].name + else: + return out + ', '.join(i.name for i in impl[:-1]) + \ + ' and ' + impl[-1].name + class DocFormatterC(DocFormatter): language = "C" @@ -377,7 +464,7 @@ class DocFormatterC(DocFormatter): "NULL": "NULL", } - def format_type(self, type_): + def format_type(self, type_, link=False): if isinstance(type_, ast.Array): return self.format_type(type_.element_type) + '*' elif type_.ctype is not None: @@ -394,7 +481,7 @@ class DocFormatterC(DocFormatter): else: return func.name - def get_parameters(self, node): + def get_in_parameters(self, node): return node.all_parameters @@ -406,6 +493,9 @@ class DocFormatterIntrospectableBase(DocFormatter): if not getattr(node, "introspectable", True): return False + if isinstance(node, ast.Function) and node.shadowed_by is not None: + return False + return super(DocFormatterIntrospectableBase, self).should_render_node(node) @@ -466,7 +556,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): return fundamental_types.get(name, name) - def format_type(self, type_): + def format_type(self, type_, link=False): if isinstance(type_, (ast.List, ast.Array)): return '[' + self.format_type(type_.element_type) + ']' elif isinstance(type_, ast.Map): @@ -483,7 +573,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): else: return func.name - def get_parameters(self, node): + def get_in_parameters(self, node): return node.all_parameters @@ -506,68 +596,282 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): return False + def resolve_gboxed_constructor(self, node): + zero_args_constructor = None + default_constructor = None + + introspectable_constructors = \ + filter(lambda c: getattr(c, 'introspectable', True), + node.constructors) + for c in introspectable_constructors: + if zero_args_constructor is None and \ + len(c.parameters) == 0: + zero_args_constructor = c + if default_constructor is None and \ + c.name == 'new': + default_constructor = c + if default_constructor is None: + default_constructor = zero_args_constructor + if default_constructor is None and \ + len(introspectable_constructors) > 0: + default_constructor = introspectable_constructors[0] + + node.gjs_default_constructor = default_constructor + node.gjs_zero_args_constructor = zero_args_constructor + + def should_render_node(self, node): + if isinstance(node, (ast.Compound, ast.Boxed)): + self.resolve_gboxed_constructor(node) + + if isinstance(node, ast.Compound) and node.disguised and \ + len(node.methods) == len(node.static_methods) == len(node.constructors) == 0: + return False + + if isinstance(node, ast.ErrorQuarkFunction): + return False + if isinstance(node, ast.Field): + if node.type is None: + return False + if isinstance(node.parent, (ast.Class, ast.Union)): + return False + if isinstance(node, ast.Union) and node.name is None: + return False + if isinstance(node, ast.Class): + is_gparam_subclass = False + if node.parent_type: + parent = self._transformer.lookup_typenode(node.parent_type) + while parent: + if parent.namespace.name == 'GObject' and \ + parent.name == 'ParamSpec': + is_gparam_subclass = True + break + if parent.parent_type is None: + break + parent = self._transformer.lookup_typenode(parent.parent_type) + if is_gparam_subclass: + return False + + return super(DocFormatterGjs, self).should_render_node(node) + def format_fundamental_type(self, name): fundamental_types = { + "none": "void", + "gpointer": "void", + "gboolean": "Boolean", + "gint8": "Number(gint8)", + "guint8": "Number(guint8)", + "gint16": "Number(gint16)", + "guint16": "Number(guint16)", + "gint32": "Number(gint32)", + "guint32": "Number(guint32)", + "gchar": "Number(gchar)", + "guchar": "Number(guchar)", + "gshort": "Number(gshort)", + "gint": "Number(gint)", + "guint": "Number(guint)", + "gfloat": "Number(gfloat)", + "gdouble": "Number(gdouble)", "utf8": "String", "gunichar": "String", - "gchar": "String", - "guchar": "String", - "gboolean": "Boolean", - "gint": "Number", - "guint": "Number", - "glong": "Number", - "gulong": "Number", - "gint64": "Number", - "guint64": "Number", - "gfloat": "Number", - "gdouble": "Number", - "gchararray": "String", - "GParam": "GLib.Param", - "PyObject": "Object", - "GStrv": "[String]", - "GVariant": "GLib.Variant"} + "filename": "String", + "GType": "GObject.Type", + "GVariant": "GLib.Variant", + # These cannot be fully represented in gjs + "gsize": "Number(gsize)", + "gssize": "Number(gssize)", + "gintptr": "Number(gintptr)", + "guintptr": "Number(guintptr)", + "glong": "Number(glong)", + "gulong": "Number(gulong)", + "gint64": "Number(gint64)", + "guint64": "Number(guint64)", + "long double": "Number(long double)", + "long long": "Number(long long)", + "unsigned long long": "Number(unsigned long long)"} return fundamental_types.get(name, name) - def format_type(self, type_): - if isinstance(type_, (ast.List, ast.Array)): - return '[' + self.format_type(type_.element_type) + ']' + def format_type(self, type_, link=False): + if isinstance(type_, ast.Array) and \ + type_.element_type.target_fundamental in ('gint8', 'guint8'): + return 'ByteArray' + elif isinstance(type_, (ast.List, ast.Array)): + return 'Array(' + self.format_type(type_.element_type, link) + ')' elif isinstance(type_, ast.Map): - return '{%s: %s}' % (self.format_type(type_.key_type), - self.format_type(type_.value_type)) - elif type_.target_fundamental == "none": + return '{%s: %s}' % (self.format_type(type_.key_type, link), + self.format_type(type_.value_type, link)) + elif not type_ or type_.target_fundamental == "none": return "void" elif type_.target_giname is not None: - return type_.target_giname + giname = type_.target_giname + if giname in ('GLib.ByteArray', 'GLib.Bytes'): + return 'ByteArray' + if giname == 'GObject.Value': + return 'Any' + if giname == 'GObject.Closure': + return 'Function' + if link: + nsname = self._transformer.namespace.name + if giname.startswith(nsname + '.'): + return '%s' % (giname, giname) + else: + resolved = self._transformer.lookup_typenode(type_) + if resolved: + return self.format_xref(resolved) + return giname else: return self.format_fundamental_type(type_.target_fundamental) def format_function_name(self, func): + name = func.name + if func.shadows: + name = func.shadows + if func.is_method: - return "%s.prototype.%s" % (self.format_page_name(func.parent), func.name) - elif func.is_constructor: - return "%s.%s" % (self.format_page_name(func.parent), func.name) + return "%s.prototype.%s" % (self.format_page_name(func.parent), name) + elif func.parent is not None: + return "%s.%s" % (self.format_page_name(func.parent), name) else: - return func.name + return name + + def format_page_name(self, node): + if isinstance(node, (ast.Field, ast.Property)): + return '%s.%s' % (self.format_page_name(node.parent), self.to_underscores(node)) + else: + return DocFormatterIntrospectableBase.format_page_name(self, node) - def get_parameters(self, node): - skip = [] + def has_any_parameters(self, node): + return len(node.parameters) > 0 or \ + node.retval.type.target_fundamental != 'none' + + def get_in_parameters(self, node): + skip = set() for param in node.parameters: if param.direction == ast.PARAM_DIRECTION_OUT: - skip.append(param) + skip.add(param) + if param.closure_name is not None: + skip.add(node.get_parameter(param.closure_name)) + if param.destroy_name is not None: + skip.add(node.get_parameter(param.destroy_name)) + if isinstance(param.type, ast.Array) and param.type.length_param_name is not None: + skip.add(node.get_parameter(param.type.length_param_name)) + + params = [] + for param in node.parameters: + if param not in skip: + params.append(param) + return params + + def get_out_parameters(self, node): + skip = set() + for param in node.parameters: + if param.direction == ast.PARAM_DIRECTION_IN: + skip.add(param) if param.closure_name is not None: - skip.append(node.get_parameter(param.closure_name)) + skip.add(node.get_parameter(param.closure_name)) if param.destroy_name is not None: - skip.append(node.get_parameter(param.destroy_name)) + skip.add(node.get_parameter(param.destroy_name)) if isinstance(param.type, ast.Array) and param.type.length_param_name is not None: - skip.append(node.get_parameter(param.type.length_param_name)) + skip.add(node.get_parameter(param.type.length_param_name)) params = [] + if node.retval.type.target_fundamental != 'none': + name = 'return_value' + if node.retval.type.target_fundamental == 'gboolean': + name = 'ok' + + ret_param = ast.Parameter(name, node.retval.type, + ast.PARAM_DIRECTION_OUT) + ret_param.doc = node.retval.doc + params.append(ret_param) for param in node.parameters: if param not in skip: params.append(param) + + if len(params) == 1: + params[0].argname = 'Returns' + return params + def format_in_parameters(self, node): + in_params = self.get_in_parameters(node) + return ', '.join(('%s: %s' % (p.argname, self.format_type(p.type, True))) + for p in in_params) + + def format_out_parameters(self, node): + out_params = self.get_out_parameters(node) + + if len(out_params) == 0: + return 'void' + elif len(out_params) == 1: + return self.format_type(out_params[0].type, True) + else: + return '[' + ', '.join(('%s: %s' % (p.argname, self.format_type(p.type, True))) + for p in out_params) + ']' + + def field_is_writable(self, node): + if isinstance(node, ast.Field): + if node.type is None: + return False + if node.private: + return False + if isinstance(node.parent, ast.Union): + return False + if node.type.target_fundamental not in \ + (None, 'none', 'gpointer', 'utf8', 'filename', 'va_list'): + return True + + resolved = self._transformer.lookup_typenode(node.type) + if resolved: + if isinstance(resolved, ast.Compound) and node.type.ctype[-1] != '*': + return self._struct_is_simple(resolved) + elif isinstance(resolved, (ast.Enum, ast.Bitfield)): + return True + return False + else: + return True + + def _struct_is_simple(self, node): + if node.disguised or len(node.fields) == 0: + return False + + for f in node.fields: + if not self.field_is_writable(f): + return False + return True + + def format_gboxed_constructor(self, node): + if node.namespace.name == 'GLib' and node.name == 'Variant': + return 'signature: String, value: Any' + + zero_args_constructor = node.gjs_zero_args_constructor + default_constructor = node.gjs_default_constructor + + can_allocate = zero_args_constructor is not None + if not can_allocate and isinstance(node, ast.Record): + can_allocate = self._struct_is_simple(node) + + # Small lie: if can_allocate is False, and + # default_constructor is None, then you cannot + # construct the boxed in any way. But let's + # pretend you can with the regular constructor + if can_allocate or default_constructor is None: + if isinstance(node, ast.Compound): + fields = filter(self.field_is_writable, node.fields) + out = '' + if len(fields) > 0: + out += "{\n" + for f in fields: + out += " %s: value\n" % \ + (node.namespace.name, node.name, f.name, f.name) + out += "}" + return out + else: + return '' + else: + construct_params = self.get_in_parameters(default_constructor) + return ', '.join(('%s: %s' % (p.argname, self.format_type(p.type))) + for p in construct_params) LANGUAGES = { "c": DocFormatterC, @@ -616,10 +920,16 @@ class DocWriter(object): def _walk_node(self, output, node, chain): if isinstance(node, ast.Function) and node.moved_to is not None: return False - if getattr(node, 'disguised', False): - return False if self._formatter.should_render_node(node): self._render_node(node, chain, output) + + # hack: fields are not Nodes in the ast, so we don't + # see them in the visit. Handle them manually here + if isinstance(node, (ast.Compound, ast.Class)): + chain.append(node) + for f in node.fields: + self._walk_node(output, f, chain) + chain.pop() return True return False @@ -638,7 +948,8 @@ class DocWriter(object): node=node, page_id=page_id, page_kind=page_kind, - formatter=self._formatter) + formatter=self._formatter, + ast=ast) output_file_name = os.path.join(os.path.abspath(output), page_id + '.page') diff --git a/giscanner/dumper.py b/giscanner/dumper.py index b415dd1..ce11961 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -103,6 +103,7 @@ class DumpCompiler(object): # We have to use the current directory to work around Unix # sysadmins who mount /tmp noexec tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) + os.mkdir(os.path.join(tmpdir, '.libs')) tpl_args = {} if self._uninst_srcdir is not None: @@ -159,7 +160,7 @@ class DumpCompiler(object): o_path = self._generate_tempfile(tmpdir, '.o') if os.name == 'nt': - ext = 'exe' + ext = '.exe' else: ext = '' @@ -262,7 +263,7 @@ class DumpCompiler(object): args.extend(['-o', output]) if libtool: if os.name == 'nt': - args.append('-export-all-symbols') + args.append('-Wl,--export-all-symbols') else: args.append('-export-dynamic') @@ -295,10 +296,26 @@ class DumpCompiler(object): print "g-ir-scanner: link: %s" % ( subprocess.list2cmdline(args), ) sys.stdout.flush() + msys = os.environ.get('MSYSTEM', None) + if msys: + shell = os.environ.get('SHELL', 'sh.exe') + # Create a temporary script file that + # runs the command we want + tf, tf_name = tempfile.mkstemp() + f = os.fdopen(tf, 'wb') + shellcontents = ' '.join([x.replace('\\', '/') for x in args]) + fcontents = '#!/bin/sh\nunset PWD\n{}\n'.format(shellcontents) + f.write(fcontents) + f.close() + shell = utils.which(shell) + args = [shell, tf_name.replace('\\', '/')] try: subprocess.check_call(args) except subprocess.CalledProcessError as e: raise LinkerError(e) + finally: + if msys: + os.remove(tf_name) def _add_link_internal_args(self, args, libtool): # An "internal" link is where the library to be introspected diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 25e9035..cac166d 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -585,5 +585,6 @@ class GIRParser(object): members.append(member) for func_node in self._find_children(node, _corens('function')): func = self._parse_function_common(func_node, ast.Function) + func.parent = obj obj.static_methods.append(func) self._namespace.append(obj) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index c107bee..d9811cf 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -1023,15 +1023,35 @@ method or constructor of some type.""" uscored_prefix = self._get_uscored_prefix(func, subsymbol) target = self._transformer.lookup_typenode(func.parameters[0].type) - func.instance_parameter = func.parameters.pop(0) - self._namespace.float(func) - - if not func.is_method: + if not func.is_method and not subsymbol.startswith(uscored_prefix + '_'): + # Uh oh! This function starts with uscored_prefix, but not + # uscored_prefix + '_', so if we split, we're splitting on something + # which is not _ + # Examples of this are g_resources_register() (splits as + # g_resource + _register) and gdk_events_get_angle() (splits as + # gdk_event + _get_angle). + # As the C name suggests, these are not methods, but for backward + # compatibility reasons we need to create a method with the old + # name, and a moved-to annotation pointing to the new variant. + + newfunc = func.clone() + newfunc.moved_to = func.name + newfunc.instance_parameter = newfunc.parameters.pop(0) subsym_idx = func.symbol.find(subsymbol) - func.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):] - func.is_method = True + newfunc.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):] + newfunc.is_method = True + + target.methods.append(newfunc) + else: + func.instance_parameter = func.parameters.pop(0) + self._namespace.float(func) - target.methods.append(func) + if not func.is_method: + subsym_idx = func.symbol.find(subsymbol) + func.name = func.symbol[(subsym_idx + len(uscored_prefix) + 1):] + func.is_method = True + + target.methods.append(func) def _get_uscored_prefix(self, func, subsymbol): # Here we check both the c_symbol_prefix and (if that fails), @@ -1225,16 +1245,24 @@ method or constructor of some type.""" field.writable = False for field in class_struct.fields: - if not isinstance(field.anonymous_node, ast.Callback): + callback = None + + if isinstance(field.anonymous_node, ast.Callback): + callback = field.anonymous_node + elif field.type is not None: + callback = self._transformer.lookup_typenode(field.type) + if not isinstance(callback, ast.Callback): + continue + else: continue - callback = field.anonymous_node + # Check the first parameter is the object if len(callback.parameters) == 0: continue firstparam_type = callback.parameters[0].type if firstparam_type != node_type: continue - vfunc = ast.VFunction.from_callback(callback) + vfunc = ast.VFunction.from_callback(field.name, callback) vfunc.instance_parameter = callback.parameters[0] vfunc.inherit_file_positions(callback) diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l index 42f85ea..941154d 100644 --- a/giscanner/scannerlexer.l +++ b/giscanner/scannerlexer.l @@ -31,6 +31,7 @@ %{ #include #include +#include #ifndef _WIN32 #include #endif @@ -152,6 +153,7 @@ stringtext ([^\\\"])|(\\.) "__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } "__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } +"__asm__"[\t\f\v\r ]+"__volatile__" { if (!parse_ignored_macro()) REJECT; } "__asm" { if (!parse_ignored_macro()) REJECT; } "__asm__" { if (!parse_ignored_macro()) REJECT; } "__attribute__" { if (!parse_ignored_macro()) REJECT; } @@ -161,8 +163,10 @@ stringtext ([^\\\"])|(\\.) "__inline__" { return INLINE; } "__inline" { return INLINE; } "__nonnull" { if (!parse_ignored_macro()) REJECT; } +"_Noreturn" { /* Ignore */ } "__signed__" { return SIGNED; } "__restrict" { return RESTRICT; } +"__restrict__" { return RESTRICT; } "__typeof" { if (!parse_ignored_macro()) REJECT; } "__volatile" { return VOLATILE; } "__volatile__" { return VOLATILE; } diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 21fcafd..ec974fa 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -24,7 +24,7 @@ import platform import re import subprocess -from .utils import get_libtool_command, extract_libtool_shlib +from .utils import get_libtool_command, extract_libtool_shlib, which # For .la files, the situation is easy. @@ -89,10 +89,93 @@ def _resolve_non_libtool(options, binary, libraries): binary.args[0] = old_argdir if os.name == 'nt': + args = [] + compiler_cmd = os.environ.get('CC', 'cc') + libsearch = [] + + # When we are using Visual C++... + if 'cl.exe' in compiler_cmd or 'cl' in compiler_cmd: + # The search path of the .lib's on Visual C++ + # is dependent on the LIB environmental variable, + # so just query for that + is_msvc = True + libpath = os.environ.get('LIB') + libsearch = libpath.split(';') + + # Use the dumpbin utility that's included in + # every Visual C++ installation to find out which + # DLL the library gets linked to + args.append('dumpbin.exe') + args.append('-symbols') + + # When we are not using Visual C++ (i.e. we are using GCC)... + else: + is_msvc = False + libtool = get_libtool_command(options) + if libtool: + args.append(which(os.environ.get('SHELL', 'sh.exe'))) + args.extend(libtool) + args.append('--mode=execute') + # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe) + args.extend(['dlltool.exe', '--identify']) + proc = subprocess.Popen([compiler_cmd, '-print-search-dirs'], + stdout=subprocess.PIPE) + o, e = proc.communicate() + for line in o.splitlines(): + if line.startswith('libraries: '): + libsearch = line[len('libraries: '):].split(';') + shlibs = [] + not_resolved = [] + for lib in libraries: + found = False + candidates = [ + 'lib%s.dll.a' % lib, + 'lib%s.a' % lib, + '%s.dll.a' % lib, + '%s.a' % lib, + '%s.lib' % lib, + ] + for l in libsearch: + if found: + break + if l.startswith('='): + l = l[1:] + for c in candidates: + if found: + break + implib = os.path.join(l, c) + if os.path.exists(implib): + proc = subprocess.Popen(args + [implib], + stdout=subprocess.PIPE) + o, e = proc.communicate() + for line in o.splitlines(): + if is_msvc: + # On Visual Studio, dumpbin -symbols something.lib gives the + # filename of DLL without the '.dll' extension that something.lib + # links to, in the line that contains + # __IMPORT_DESCRIPTOR_ + + if '__IMPORT_DESCRIPTOR_' in line: + line_tokens = line.split() + for item in line_tokens: + if item.startswith('__IMPORT_DESCRIPTOR_'): + shlibs.append(item[20:] + '.dll') + found = True + break + if found: + break + else: + shlibs.append(line) + found = True + break + if not found: + not_resolved.append(lib) + if len(not_resolved) > 0: + raise SystemExit( + "ERROR: can't resolve libraries to shared libraries: " + + ", ".join(not_resolved)) - for library in libraries: - shlibs.append(library + '.dll') else: args = [] libtool = get_libtool_command(options) diff --git a/giscanner/utils.py b/giscanner/utils.py index abd1a26..537109c 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -132,7 +132,7 @@ def extract_libtool(la_file): # FIXME: This hackish, but I'm not sure how to do this # in a way which is compatible with both libtool 2.2 # and pre-2.2. Johan 2008-10-21 - libname = libname.replace('.libs/.libs', '.libs') + libname = libname.replace('.libs/.libs', '.libs').replace('.libs\\.libs', '.libs') return libname @@ -182,3 +182,30 @@ def cflag_real_include_path(cflag): return cflag return "-I" + os.path.realpath(cflag[2:]) + + +def which(program): + def is_exe(fpath): + return os.path.isfile(fpath) and os.access(fpath, os.X_OK) + + def is_nt_exe(fpath): + return not fpath.lower().endswith('.exe') and \ + os.path.isfile(fpath + '.exe') and \ + os.access(fpath + '.exe', os.X_OK) + + fpath, fname = os.path.split(program) + if fpath: + if is_exe(program): + return program + if os.name == 'nt' and is_nt_exe(program): + return program + '.exe' + else: + for path in os.environ["PATH"].split(os.pathsep): + path = path.strip('"') + exe_file = os.path.join(path, program) + if is_exe(exe_file): + return exe_file + if os.name == 'nt' and is_nt_exe(exe_file): + return exe_file + '.exe' + + return None diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc index f355c61..a765e61 100644 --- a/gobject-introspection-1.0.pc +++ b/gobject-introspection-1.0.pc @@ -21,4 +21,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.39.90 +Version: 1.40.0 diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in index 9613fec..a08b5d2 100644 --- a/gobject-introspection-1.0.pc.in +++ b/gobject-introspection-1.0.pc.in @@ -7,8 +7,8 @@ datadir=@datadir@ includedir=@includedir@ g_ir_scanner=${bindir}/g-ir-scanner -g_ir_compiler=${bindir}/g-ir-compiler -g_ir_generate=${bindir}/g-ir-generate +g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ +g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ gidatadir=${datadir}/gobject-introspection-1.0 girdir=${datadir}/gir-1.0 typelibdir=${libdir}/girepository-1.0 diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc index 77fa506..baf31b2 100644 --- a/gobject-introspection-no-export-1.0.pc +++ b/gobject-introspection-no-export-1.0.pc @@ -20,4 +20,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.39.90 +Version: 1.40.0 diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in index a6d6cc6..d214d22 100644 --- a/gobject-introspection-no-export-1.0.pc.in +++ b/gobject-introspection-no-export-1.0.pc.in @@ -7,8 +7,8 @@ datadir=@datadir@ includedir=@includedir@ g_ir_scanner=${bindir}/g-ir-scanner -g_ir_compiler=${bindir}/g-ir-compiler -g_ir_generate=${bindir}/g-ir-generate +g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ +g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ girdir=${datadir}/gir-1.0 typelibdir=${libdir}/girepository-1.0 diff --git a/scannerlexer.c b/scannerlexer.c index 19e11cd..1b2b041 100644 --- a/scannerlexer.c +++ b/scannerlexer.c @@ -360,8 +360,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 144 -#define YY_END_OF_BUFFER 145 +#define YY_NUM_RULES 147 +#define YY_END_OF_BUFFER 148 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -369,110 +369,112 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[894] = +static yyconst flex_int16_t yy_acclist[917] = { 0, - 145, 143, 144, 3, 143, 144, 1, 144, 44, 143, - 144, 143, 144, 19, 143, 144, 39, 143, 144, 41, - 143, 144, 143, 144, 28, 143, 144, 29, 143, 144, - 37, 143, 144, 35, 143, 144, 68, 143, 144, 36, - 143, 144, 34, 143, 144, 38, 143, 144, 136, 143, - 144, 136, 143, 144, 31, 143, 144, 30, 143, 144, - 46, 143, 144, 45, 143, 144, 47, 143, 144, 33, - 143, 144, 93, 133, 143, 144, 93, 133, 143, 144, - 93, 133, 143, 144, 93, 133, 143, 144, 93, 133, - 143, 144, 24, 143, 144, 143, 144, 26, 143, 144, - - 40, 143, 144, 93, 133, 143, 144, 93, 133, 143, - 144, 93, 133, 143, 144, 93, 133, 143, 144, 93, - 133, 143, 144, 93, 133, 143, 144, 93, 133, 143, - 144, 93, 133, 143, 144, 93, 133, 143, 144, 93, - 133, 143, 144, 93, 133, 143, 144, 93, 133, 143, - 144, 93, 133, 143, 144, 93, 133, 143, 144, 93, - 133, 143, 144, 93, 133, 143, 144, 20, 143, 144, - 42, 143, 144, 22, 143, 144, 43, 143, 144, 3, - 1, 61, 141, 52, 23, 64, 54, 139, 50, 66, - 48, 67, 49, 69, 137, 4, 6, 51, 137, 135, - - 136, 136, 136, 136, 27, 21, 25, 56, 62, 60, - 63, 57, 93, 133, 93, 133, 93, 133, 93, 133, - 2, 53, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 102, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 110, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 55, 65, 32, 137, 6, 135, - 136, 135, 136, 138, 136, 136, 136, 134, 58, 59, - - 93, 133, 93, 133, 142, 140, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 94, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 108, 133, - 93, 133, 93, 133, 93, 112, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - - 133, 137, 135, 136, 135, 136, 135, 136, 138, 136, - 134, 134, 93, 133, 93, 133, 93, 133, 89, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 95, 133, 93, 133, - 93, 97, 133, 93, 98, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 104, 133, 93, 105, 133, - 93, 133, 93, 133, 93, 133, 93, 109, 133, 93, - 133, 93, 117, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - - 93, 133, 91, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 130, 133, 93, 133, 93, 133, 18, 13, - 135, 136, 134, 134, 134, 90, 93, 133, 93, 133, - 93, 133, 86, 93, 133, 72, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 96, 133, 93, 99, 133, 93, 133, 93, 133, - 93, 133, 93, 133, 92, 93, 133, 93, 107, 133, - 93, 133, 93, 133, 93, 133, 93, 133, 93, 121, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - - 133, 93, 133, 93, 128, 133, 93, 133, 93, 133, - 93, 132, 133, 15, 134, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 103, 133, - 93, 106, 133, 93, 111, 133, 93, 133, 93, 133, - 93, 120, 133, 93, 122, 133, 93, 123, 133, 93, - 124, 133, 93, 125, 133, 93, 126, 133, 93, 133, - 93, 133, 93, 133, 14, 16, 5, 93, 133, 93, - 133, 73, 93, 133, 93, 133, 76, 93, 133, 93, - - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 101, 133, 93, 133, 93, 133, 93, 127, 133, 93, - 133, 93, 133, 12, 93, 133, 93, 133, 93, 133, - 93, 133, 79, 93, 133, 93, 116, 133, 93, 133, - 93, 133, 93, 133, 83, 93, 133, 93, 133, 93, - 133, 93, 100, 133, 93, 118, 133, 93, 119, 133, - 93, 129, 133, 93, 131, 133, 8, 11, 17, 93, - 133, 93, 133, 93, 133, 93, 133, 93, 133, 93, - 133, 80, 93, 133, 93, 133, 93, 133, 93, 115, - - 133, 93, 133, 7, 8, 93, 133, 93, 133, 93, - 133, 93, 133, 78, 93, 133, 93, 114, 133, 82, - 93, 133, 81, 93, 133, 93, 133, 84, 93, 133, - 93, 133, 93, 133, 75, 93, 133, 93, 133, 93, - 113, 133, 93, 133, 93, 133, 93, 133, 93, 133, - 93, 133, 85, 93, 133, 93, 133, 93, 133, 74, - 93, 133, 77, 93, 133, 93, 133, 93, 133, 70, - 93, 133, 93, 133, 93, 133, 93, 133, 71, 87, - 93, 133, 93, 133, 88, 93, 133, 9, 9, 12, - 10, 10, 11 - + 148, 146, 147, 3, 146, 147, 1, 147, 44, 146, + 147, 146, 147, 19, 146, 147, 39, 146, 147, 41, + 146, 147, 146, 147, 28, 146, 147, 29, 146, 147, + 37, 146, 147, 35, 146, 147, 68, 146, 147, 36, + 146, 147, 34, 146, 147, 38, 146, 147, 139, 146, + 147, 139, 146, 147, 31, 146, 147, 30, 146, 147, + 46, 146, 147, 45, 146, 147, 47, 146, 147, 33, + 146, 147, 96, 136, 146, 147, 96, 136, 146, 147, + 96, 136, 146, 147, 96, 136, 146, 147, 96, 136, + 146, 147, 24, 146, 147, 146, 147, 26, 146, 147, + + 40, 146, 147, 96, 136, 146, 147, 96, 136, 146, + 147, 96, 136, 146, 147, 96, 136, 146, 147, 96, + 136, 146, 147, 96, 136, 146, 147, 96, 136, 146, + 147, 96, 136, 146, 147, 96, 136, 146, 147, 96, + 136, 146, 147, 96, 136, 146, 147, 96, 136, 146, + 147, 96, 136, 146, 147, 96, 136, 146, 147, 96, + 136, 146, 147, 96, 136, 146, 147, 20, 146, 147, + 42, 146, 147, 22, 146, 147, 43, 146, 147, 3, + 1, 61, 144, 52, 23, 64, 54, 142, 50, 66, + 48, 67, 49, 69, 140, 4, 6, 51, 140, 138, + + 139, 139, 139, 139, 27, 21, 25, 56, 62, 60, + 63, 57, 96, 136, 96, 136, 96, 136, 96, 136, + 2, 53, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 105, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 113, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 55, 65, 32, 140, + 6, 138, 139, 138, 139, 141, 139, 139, 139, 137, + + 58, 59, 96, 136, 96, 136, 145, 143, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 97, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 111, 136, 96, 136, 96, 136, 96, 115, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + + 136, 96, 136, 96, 136, 140, 138, 139, 138, 139, + 138, 139, 141, 139, 137, 137, 96, 136, 96, 136, + 96, 136, 92, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 98, 136, 96, 136, 96, 100, 136, 96, + 101, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 107, 136, 96, 108, 136, 96, 136, 96, 136, + 96, 136, 96, 112, 136, 96, 136, 96, 120, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + + 96, 136, 96, 136, 96, 136, 96, 136, 94, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 133, 136, + 96, 136, 96, 136, 18, 13, 138, 139, 137, 137, + 137, 93, 96, 136, 96, 136, 96, 136, 89, 96, + 136, 96, 136, 73, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 136, 96, 99, + 136, 96, 102, 136, 96, 136, 96, 136, 96, 136, + 96, 136, 95, 96, 136, 96, 110, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 96, 124, 136, 96, + + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 131, 136, 96, 136, 96, 136, 96, 135, + 136, 15, 137, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 106, 136, + 96, 109, 136, 96, 114, 136, 96, 136, 96, 136, + 96, 123, 136, 96, 125, 136, 96, 126, 136, 96, + 127, 136, 96, 128, 136, 96, 129, 136, 96, 136, + 96, 136, 96, 136, 14, 16, 5, 96, 136, 96, + + 136, 96, 136, 74, 96, 136, 96, 136, 77, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 96, 104, 136, 96, 136, 96, 136, 96, 130, + 136, 96, 136, 96, 136, 12, 96, 136, 96, 136, + 96, 136, 96, 136, 96, 136, 80, 96, 136, 96, + 119, 136, 96, 136, 96, 136, 96, 136, 86, 96, + 136, 96, 136, 96, 136, 96, 103, 136, 96, 121, + 136, 96, 122, 136, 96, 132, 136, 96, 134, 136, + 8, 11, 17, 96, 136, 96, 136, 82, 96, 136, + + 96, 136, 96, 136, 96, 136, 96, 136, 81, 96, + 136, 96, 136, 96, 136, 96, 118, 136, 96, 136, + 7, 8, 96, 136, 96, 136, 96, 136, 96, 136, + 79, 96, 136, 96, 117, 136, 84, 96, 136, 83, + 96, 136, 96, 136, 87, 96, 136, 96, 136, 96, + 136, 76, 96, 136, 96, 136, 96, 136, 96, 116, + 136, 96, 136, 96, 136, 96, 136, 96, 136, 96, + 136, 85, 96, 136, 88, 96, 136, 96, 136, 96, + 136, 75, 96, 136, 78, 96, 136, 96, 136, 96, + 136, 70, 96, 136, 96, 136, 96, 136, 96, 136, + + 71, 90, 96, 136, 96, 136, 91, 96, 136, 72, + 9, 9, 12, 10, 10, 11 } ; -static yyconst flex_int16_t yy_accept[577] = +static yyconst flex_int16_t yy_accept[599] = { 0, 1, 1, 1, 2, 4, 7, 9, 12, 14, 17, 20, 23, 25, 28, 31, 34, 37, 40, 43, 46, @@ -486,57 +488,60 @@ static yyconst flex_int16_t yy_accept[577] = 203, 204, 205, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 217, 219, 219, 219, 221, 222, 223, - 225, 227, 229, 231, 233, 235, 237, 239, 241, 244, - 246, 248, 250, 252, 254, 256, 258, 261, 263, 265, + 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, + 246, 248, 250, 252, 254, 256, 258, 260, 263, 265, 267, 269, 271, 273, 275, 277, 279, 281, 283, 285, - 286, 287, 287, 287, 287, 287, 287, 287, 288, 288, - 289, 289, 289, 290, 292, 294, 294, 295, 296, 297, - 298, 299, 300, 301, 303, 305, 305, 306, 306, 306, - 307, 307, 309, 311, 313, 315, 317, 319, 321, 323, - 325, 327, 329, 331, 334, 336, 338, 340, 342, 344, - 346, 348, 350, 352, 354, 356, 358, 361, 363, 365, - - 368, 370, 372, 374, 376, 378, 380, 382, 384, 386, - 388, 390, 392, 394, 396, 398, 400, 402, 402, 402, - 402, 402, 402, 402, 402, 402, 402, 402, 403, 403, - 405, 407, 409, 410, 411, 412, 413, 415, 417, 419, - 422, 424, 426, 428, 430, 432, 434, 436, 438, 440, - 442, 444, 446, 449, 451, 454, 457, 459, 461, 463, - 465, 468, 471, 473, 475, 477, 480, 482, 485, 487, - 489, 491, 493, 495, 497, 499, 501, 503, 506, 508, - 510, 512, 515, 517, 519, 519, 520, 520, 520, 520, - 520, 520, 521, 521, 521, 521, 521, 523, 524, 525, - - 526, 529, 531, 533, 536, 539, 541, 543, 545, 547, - 549, 551, 553, 555, 557, 559, 561, 564, 567, 569, - 571, 573, 575, 578, 581, 583, 585, 587, 589, 592, - 594, 596, 598, 600, 602, 604, 607, 609, 611, 614, - 614, 614, 614, 615, 615, 615, 615, 615, 615, 615, - 616, 618, 620, 620, 622, 624, 626, 628, 630, 632, - 634, 636, 638, 640, 642, 644, 646, 648, 651, 654, - 657, 659, 661, 664, 667, 670, 673, 676, 679, 681, - 683, 685, 685, 685, 686, 686, 687, 687, 687, 687, - 687, 688, 690, 692, 692, 695, 697, 700, 702, 704, - - 706, 708, 710, 712, 714, 716, 718, 720, 723, 725, - 727, 730, 732, 734, 734, 734, 734, 734, 735, 735, - 735, 735, 735, 737, 739, 739, 739, 741, 743, 746, - 749, 751, 753, 755, 758, 760, 762, 765, 768, 771, - 774, 777, 778, 778, 778, 778, 778, 778, 779, 779, - 779, 780, 782, 784, 784, 784, 786, 788, 790, 792, - 795, 797, 799, 802, 804, 805, 806, 806, 806, 806, - 806, 808, 810, 810, 810, 812, 814, 817, 820, 823, - 826, 828, 831, 831, 831, 831, 831, 833, 835, 835, - 835, 838, 840, 843, 845, 845, 845, 845, 845, 847, - - 849, 849, 849, 851, 853, 856, 856, 856, 856, 856, - 858, 860, 860, 860, 863, 866, 866, 866, 866, 866, - 868, 870, 871, 871, 871, 871, 871, 871, 873, 875, - 875, 875, 875, 875, 875, 877, 879, 880, 880, 880, - 880, 880, 883, 885, 885, 885, 885, 885, 888, 888, - 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - 888, 888, 888, 889, 889, 889, 891, 891, 891, 891, - 891, 892, 892, 892, 894, 894 + 287, 288, 289, 289, 289, 289, 289, 289, 289, 290, + 290, 291, 291, 291, 292, 294, 296, 296, 297, 298, + 299, 300, 301, 302, 303, 305, 307, 307, 308, 308, + 308, 309, 309, 311, 313, 315, 317, 319, 321, 323, + 325, 327, 329, 331, 333, 335, 338, 340, 342, 344, + 346, 348, 350, 352, 354, 356, 358, 360, 362, 365, + + 367, 369, 372, 374, 376, 378, 380, 382, 384, 386, + 388, 390, 392, 394, 396, 398, 400, 402, 404, 406, + 406, 406, 406, 406, 406, 406, 406, 406, 406, 406, + 407, 407, 409, 411, 413, 414, 415, 416, 417, 419, + 421, 423, 426, 428, 430, 432, 434, 436, 438, 440, + 442, 444, 446, 448, 450, 452, 455, 457, 460, 463, + 465, 467, 469, 471, 474, 477, 479, 481, 483, 486, + 488, 491, 493, 495, 497, 499, 501, 503, 505, 507, + 509, 512, 514, 516, 518, 521, 523, 525, 525, 526, + 526, 526, 526, 526, 526, 527, 527, 527, 527, 527, + + 529, 530, 531, 532, 535, 537, 539, 542, 544, 547, + 549, 551, 553, 555, 557, 559, 561, 563, 565, 567, + 569, 572, 575, 577, 579, 581, 583, 586, 589, 591, + 593, 595, 597, 600, 602, 604, 606, 608, 610, 612, + 615, 617, 619, 622, 622, 622, 622, 623, 623, 623, + 623, 623, 623, 623, 624, 626, 628, 630, 630, 632, + 634, 636, 638, 640, 642, 644, 646, 648, 650, 652, + 654, 656, 658, 661, 664, 667, 669, 671, 674, 677, + 680, 683, 686, 689, 691, 693, 695, 695, 695, 696, + 696, 697, 697, 697, 697, 697, 698, 700, 702, 704, + + 704, 707, 709, 712, 714, 716, 718, 720, 722, 724, + 726, 728, 730, 732, 735, 737, 739, 742, 744, 746, + 746, 746, 746, 746, 747, 747, 747, 747, 747, 749, + 751, 753, 753, 753, 755, 757, 760, 763, 765, 767, + 769, 772, 774, 776, 779, 782, 785, 788, 791, 792, + 792, 792, 792, 792, 792, 793, 793, 793, 794, 796, + 798, 801, 801, 801, 801, 803, 805, 807, 809, 812, + 814, 816, 819, 821, 822, 823, 823, 823, 823, 823, + 825, 827, 827, 827, 827, 829, 831, 834, 837, 840, + 843, 845, 848, 848, 848, 848, 848, 850, 852, 852, + + 852, 852, 855, 857, 859, 862, 864, 864, 864, 864, + 864, 866, 868, 868, 868, 868, 870, 872, 875, 878, + 878, 878, 878, 878, 880, 882, 882, 882, 882, 885, + 888, 888, 888, 888, 888, 890, 892, 893, 893, 893, + 893, 893, 893, 893, 895, 897, 897, 897, 897, 897, + 897, 897, 899, 901, 901, 902, 902, 902, 902, 902, + 905, 907, 907, 907, 907, 907, 907, 910, 910, 910, + 910, 910, 910, 910, 910, 910, 910, 910, 911, 911, + 911, 911, 911, 911, 911, 912, 912, 912, 914, 914, + 914, 914, 914, 915, 915, 915, 917, 917 + } ; static yyconst flex_int32_t yy_ec[256] = @@ -584,147 +589,151 @@ static yyconst flex_int32_t yy_meta[84] = 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[599] = +static yyconst flex_int16_t yy_base[621] = { 0, - 0, 0, 947, 948, 82, 0, 915, 78, 83, 58, - 81, 81, 948, 948, 914, 78, 948, 79, 77, 94, - 136, 196, 912, 948, 96, 912, 75, 948, 0, 908, - 886, 107, 894, 948, 936, 948, 907, 80, 45, 866, - 60, 62, 68, 72, 867, 71, 866, 874, 102, 66, - 865, 863, 868, 948, 89, 948, 948, 144, 0, 948, - 143, 948, 927, 167, 869, 101, 867, 856, 948, 948, - 948, 948, 129, 948, 923, 948, 948, 948, 948, 948, - 948, 907, 251, 150, 0, 948, 0, 134, 0, 226, - 133, 158, 0, 948, 948, 948, 893, 948, 948, 948, - - 892, 0, 879, 881, 157, 160, 871, 948, 948, 850, - 224, 851, 844, 856, 843, 858, 845, 851, 837, 838, - 835, 835, 841, 837, 834, 831, 0, 131, 835, 153, - 833, 89, 171, 837, 826, 829, 134, 139, 834, 948, - 948, 280, 836, 164, 837, 250, 839, 948, 299, 948, - 864, 0, 0, 195, 188, 307, 315, 183, 948, 192, - 217, 948, 948, 846, 188, 256, 948, 889, 229, 948, - 888, 852, 820, 100, 819, 810, 818, 816, 824, 819, - 804, 817, 811, 0, 810, 822, 817, 805, 192, 819, - 817, 813, 805, 811, 798, 813, 0, 799, 803, 0, - - 804, 801, 791, 789, 791, 793, 800, 786, 784, 784, - 796, 795, 785, 789, 793, 795, 784, 846, 784, 786, - 786, 781, 841, 783, 783, 779, 323, 339, 808, 219, - 948, 244, 948, 948, 324, 308, 801, 794, 795, 0, - 770, 768, 761, 765, 759, 213, 763, 758, 767, 758, - 759, 760, 0, 760, 0, 0, 751, 759, 748, 755, - 0, 0, 749, 759, 745, 0, 749, 0, 744, 744, - 743, 740, 752, 742, 746, 751, 750, 0, 748, 738, - 743, 0, 731, 743, 799, 948, 733, 795, 796, 737, - 794, 948, 735, 735, 727, 366, 948, 303, 948, 313, - - 0, 745, 748, 0, 381, 720, 718, 729, 724, 766, - 718, 712, 716, 723, 709, 725, 0, 0, 712, 713, - 718, 709, 0, 0, 716, 702, 710, 705, 0, 713, - 710, 712, 696, 705, 707, 0, 698, 701, 0, 704, - 760, 759, 948, 758, 367, 699, 703, 744, 738, 948, - 731, 707, 387, 699, 689, 679, 683, 682, 727, 674, - 676, 686, 676, 723, 670, 668, 668, 0, 0, 0, - 680, 681, 0, 0, 0, 0, 0, 0, 677, 677, - 670, 730, 731, 948, 730, 948, 382, 391, 397, 727, - 948, 707, 705, 660, 399, 671, 0, 655, 666, 699, - - 658, 659, 663, 660, 698, 655, 658, 0, 646, 643, - 0, 656, 654, 0, 658, 709, 404, 948, 367, 406, - 410, 708, 655, 685, 642, 412, 633, 642, 650, 649, - 637, 644, 646, 0, 674, 633, 0, 0, 0, 0, - 0, 686, 657, 385, 641, 692, 416, 948, 372, 691, - 948, 657, 637, 635, 621, 616, 619, 632, 613, 0, - 612, 629, 628, 622, 948, 669, 638, 392, 639, 407, - 633, 641, 603, 609, 614, 605, 0, 0, 0, 0, - 599, 616, 615, 394, 627, 421, 624, 622, 602, 609, - 609, 608, 0, 607, 614, 310, 605, 417, 612, 614, - - 591, 583, 600, 599, 0, 617, 420, 605, 423, 603, - 603, 589, 584, 0, 0, 613, 426, 610, 428, 611, - 596, 948, 484, 505, 425, 493, 432, 459, 465, 438, - 451, 429, 449, 430, 444, 446, 948, 447, 437, 440, - 435, 0, 435, 435, 436, 430, 438, 0, 412, 439, - 412, 440, 397, 441, 375, 442, 448, 452, 300, 445, - 350, 312, 948, 264, 256, 948, 475, 486, 230, 226, - 948, 118, 91, 948, 948, 500, 507, 514, 517, 524, - 527, 533, 540, 546, 553, 560, 567, 574, 581, 588, - 590, 597, 604, 608, 615, 622, 629, 636 - + 0, 0, 969, 970, 82, 0, 937, 78, 83, 58, + 81, 81, 970, 970, 936, 78, 970, 79, 77, 94, + 136, 196, 934, 970, 96, 934, 75, 970, 0, 930, + 908, 107, 916, 970, 958, 970, 929, 84, 43, 888, + 60, 62, 68, 82, 889, 76, 888, 896, 102, 93, + 887, 885, 890, 970, 89, 970, 970, 178, 0, 970, + 125, 970, 949, 167, 891, 84, 889, 878, 970, 970, + 970, 970, 83, 970, 945, 970, 970, 970, 970, 970, + 970, 929, 251, 167, 0, 970, 0, 158, 0, 226, + 162, 133, 0, 970, 970, 970, 915, 970, 970, 970, + + 914, 0, 901, 903, 148, 129, 893, 970, 970, 872, + 871, 224, 872, 865, 877, 864, 879, 866, 872, 858, + 859, 856, 856, 862, 858, 855, 852, 0, 160, 856, + 165, 854, 105, 159, 858, 847, 850, 77, 140, 855, + 970, 970, 280, 857, 131, 858, 250, 860, 970, 299, + 970, 885, 0, 0, 217, 188, 307, 315, 72, 970, + 197, 300, 970, 970, 867, 215, 235, 970, 910, 157, + 970, 909, 873, 841, 838, 186, 839, 830, 838, 836, + 844, 839, 824, 837, 831, 0, 830, 842, 837, 825, + 195, 839, 837, 833, 825, 831, 818, 833, 0, 819, + + 823, 0, 824, 821, 811, 809, 811, 813, 820, 806, + 804, 804, 816, 815, 805, 809, 813, 815, 804, 866, + 804, 806, 806, 801, 861, 803, 803, 799, 362, 370, + 828, 124, 970, 301, 970, 970, 303, 302, 821, 814, + 815, 0, 790, 795, 787, 780, 784, 778, 213, 782, + 777, 786, 777, 778, 779, 0, 779, 0, 0, 770, + 778, 767, 774, 0, 0, 768, 778, 764, 0, 768, + 0, 763, 763, 762, 759, 771, 761, 765, 770, 769, + 0, 767, 757, 762, 0, 750, 762, 818, 970, 752, + 814, 815, 756, 813, 970, 754, 754, 746, 345, 970, + + 195, 970, 305, 0, 764, 767, 0, 737, 351, 738, + 736, 747, 742, 784, 736, 730, 734, 741, 727, 743, + 0, 0, 730, 731, 736, 727, 0, 0, 734, 720, + 728, 723, 0, 731, 728, 730, 714, 723, 725, 0, + 716, 719, 0, 722, 778, 777, 970, 776, 308, 717, + 721, 762, 756, 970, 749, 725, 698, 358, 716, 706, + 696, 700, 699, 744, 691, 693, 703, 693, 740, 687, + 685, 685, 0, 0, 0, 697, 698, 0, 0, 0, + 0, 0, 0, 694, 694, 687, 747, 748, 970, 747, + 970, 359, 370, 396, 744, 970, 724, 722, 675, 676, + + 398, 687, 0, 671, 682, 715, 674, 675, 679, 676, + 714, 671, 674, 0, 662, 659, 0, 672, 670, 0, + 674, 725, 402, 970, 226, 406, 413, 724, 671, 701, + 656, 657, 415, 648, 657, 665, 664, 652, 659, 661, + 0, 689, 648, 0, 0, 0, 0, 0, 701, 672, + 407, 656, 707, 419, 970, 375, 706, 970, 672, 652, + 0, 650, 650, 635, 630, 633, 646, 627, 0, 626, + 643, 642, 636, 970, 683, 652, 396, 653, 409, 647, + 655, 617, 614, 622, 627, 618, 0, 0, 630, 0, + 611, 628, 627, 377, 639, 420, 636, 634, 614, 608, + + 620, 620, 619, 618, 0, 617, 624, 424, 615, 423, + 622, 624, 601, 600, 592, 609, 608, 0, 0, 626, + 431, 614, 425, 612, 612, 598, 601, 592, 0, 0, + 621, 426, 618, 437, 619, 604, 970, 578, 584, 605, + 432, 521, 441, 510, 498, 444, 444, 459, 436, 457, + 438, 451, 454, 431, 970, 458, 439, 451, 440, 0, + 445, 427, 440, 262, 447, 443, 0, 428, 424, 434, + 423, 442, 410, 404, 445, 324, 447, 970, 449, 453, + 315, 450, 362, 354, 970, 348, 312, 970, 461, 489, + 290, 258, 970, 222, 209, 970, 970, 505, 512, 519, + + 522, 529, 532, 538, 545, 551, 558, 565, 572, 579, + 586, 593, 595, 602, 609, 613, 620, 627, 634, 641 } ; -static yyconst flex_int16_t yy_def[599] = +static yyconst flex_int16_t yy_def[621] = { 0, - 575, 1, 575, 575, 575, 576, 575, 577, 575, 575, - 575, 578, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 579, 579, - 579, 579, 579, 575, 575, 575, 575, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 575, 575, 575, 575, 575, 576, 575, - 577, 575, 577, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 578, 575, 578, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 580, 575, 83, 21, 22, 575, - 575, 575, 581, 575, 575, 575, 575, 575, 575, 575, - - 575, 579, 579, 579, 582, 583, 579, 575, 575, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 584, 580, 575, 575, 575, 575, 575, 575, 575, - 581, 575, 575, 579, 579, 582, 575, 582, 583, 575, - 583, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 585, 575, 575, - 575, 575, 586, 575, 575, 575, 575, 575, 584, 575, - 575, 575, 575, 575, 575, 575, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 585, 575, 575, 575, 587, 575, - 586, 575, 575, 575, 575, 575, 575, 575, 575, 575, - - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 575, - 588, 587, 575, 589, 575, 575, 575, 575, 575, 575, - 579, 579, 575, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 575, 588, 575, 589, 575, 575, 590, 575, 575, - 575, 579, 579, 575, 579, 579, 579, 579, 579, 579, - - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 591, 575, 590, 590, 575, 590, 575, - 592, 593, 579, 579, 575, 575, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 594, 575, 590, 575, 592, 592, 575, 592, 593, - 575, 579, 579, 575, 575, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 575, 594, 575, 590, 575, 592, - 579, 579, 575, 575, 579, 579, 579, 579, 579, 579, - 579, 579, 575, 590, 575, 592, 579, 579, 575, 575, - 579, 579, 579, 579, 575, 590, 575, 592, 579, 579, - - 575, 575, 579, 579, 579, 575, 590, 575, 592, 579, - 579, 575, 575, 579, 579, 575, 590, 575, 592, 579, - 579, 575, 575, 575, 590, 575, 592, 579, 579, 575, - 575, 590, 575, 592, 579, 579, 575, 575, 590, 575, - 592, 579, 579, 575, 590, 575, 592, 579, 575, 590, - 575, 592, 575, 590, 575, 592, 595, 596, 575, 592, - 595, 595, 575, 596, 596, 575, 597, 598, 597, 597, - 575, 598, 598, 575, 0, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575 - + 597, 1, 597, 597, 597, 598, 597, 599, 597, 597, + 597, 600, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 601, 601, + 601, 601, 601, 597, 597, 597, 597, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 597, 597, 597, 597, 597, 598, 597, + 599, 597, 599, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 600, 597, 600, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 602, 597, 83, 21, 22, 597, + 597, 597, 603, 597, 597, 597, 597, 597, 597, 597, + + 597, 601, 601, 601, 604, 605, 601, 597, 597, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 606, 602, 597, 597, 597, 597, 597, 597, + 597, 603, 597, 597, 601, 601, 604, 597, 604, 605, + 597, 605, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 607, + 597, 597, 597, 597, 608, 597, 597, 597, 597, 597, + 606, 597, 597, 597, 597, 597, 597, 597, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 607, 597, 597, + 597, 609, 597, 608, 597, 597, 597, 597, 597, 597, + + 597, 597, 597, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 597, 610, 609, 597, 611, 597, 597, + 597, 597, 597, 597, 601, 601, 601, 597, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 597, 610, 597, 611, + 597, 597, 612, 597, 597, 597, 601, 601, 601, 597, + + 601, 601, 601, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 613, + 597, 612, 612, 597, 612, 597, 614, 615, 601, 601, + 601, 597, 597, 601, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 616, 597, + 612, 597, 614, 614, 597, 614, 615, 597, 601, 601, + 601, 597, 597, 597, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 597, 616, 597, 612, 597, 614, 601, + 601, 597, 597, 597, 601, 601, 601, 601, 601, 601, + 601, 601, 597, 612, 597, 614, 601, 601, 597, 597, + + 597, 601, 601, 601, 601, 601, 597, 612, 597, 614, + 601, 601, 597, 597, 597, 601, 601, 601, 601, 597, + 612, 597, 614, 601, 601, 597, 597, 597, 601, 601, + 597, 612, 597, 614, 601, 601, 597, 597, 597, 597, + 612, 597, 614, 601, 601, 597, 597, 597, 612, 597, + 614, 601, 601, 597, 597, 597, 612, 597, 614, 601, + 601, 597, 597, 612, 597, 614, 601, 597, 597, 612, + 597, 614, 597, 597, 612, 597, 614, 597, 617, 618, + 597, 614, 617, 617, 597, 618, 618, 597, 619, 620, + 619, 619, 597, 620, 620, 597, 0, 597, 597, 597, + + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597 } ; -static yyconst flex_int16_t yy_nxt[1032] = +static yyconst flex_int16_t yy_nxt[1054] = { 0, 4, 5, 6, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, @@ -735,114 +744,116 @@ static yyconst flex_int16_t yy_nxt[1032] = 44, 45, 29, 46, 29, 47, 29, 29, 29, 29, 48, 49, 50, 51, 52, 53, 29, 29, 29, 54, 55, 56, 57, 58, 62, 58, 58, 64, 69, 70, - 71, 74, 77, 574, 82, 79, 83, 83, 83, 83, + 71, 74, 77, 74, 82, 79, 83, 83, 83, 83, 83, 83, 83, 83, 95, 100, 101, 84, 78, 80, - 81, 72, 85, 105, 110, 115, 112, 106, 113, 140, - 574, 118, 116, 96, 86, 97, 98, 123, 117, 63, - 119, 127, 75, 120, 111, 121, 135, 124, 128, 74, - 125, 65, 66, 136, 122, 58, 67, 58, 58, 62, - 206, 151, 68, 87, 151, 88, 88, 88, 88, 88, - 88, 89, 89, 167, 131, 132, 144, 207, 145, 141, - 170, 242, 243, 90, 133, 158, 154, 134, 91, 152, - 75, 159, 155, 575, 92, 93, 142, 142, 142, 142, - 142, 142, 142, 142, 63, 90, 199, 213, 158, 154, - - 160, 91, 215, 200, 216, 214, 159, 155, 168, 92, - 575, 171, 93, 87, 202, 89, 89, 89, 89, 89, - 89, 89, 89, 160, 203, 204, 208, 220, 571, 238, - 232, 159, 571, 90, 234, 221, 239, 230, 91, 170, - 156, 209, 156, 231, 92, 157, 157, 157, 157, 157, - 157, 157, 157, 232, 223, 90, 159, 234, 566, 235, - 230, 91, 167, 257, 258, 236, 566, 231, 231, 92, - 83, 83, 83, 83, 83, 83, 83, 83, 309, 174, - 171, 175, 235, 176, 218, 310, 297, 177, 149, 150, - 236, 178, 231, 150, 179, 180, 181, 182, 183, 142, - - 142, 142, 142, 142, 142, 142, 142, 168, 224, 297, - 149, 150, 418, 227, 563, 227, 150, 225, 228, 228, - 228, 228, 228, 228, 228, 228, 157, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 157, 157, 228, 228, 228, 228, 228, 228, 228, 228, - 300, 299, 563, 233, 567, 350, 507, 233, 228, 228, - 228, 228, 228, 228, 228, 228, 298, 348, 387, 418, - 348, 388, 299, 300, 448, 233, 299, 150, 350, 349, - 233, 150, 353, 387, 353, 353, 387, 418, 353, 298, - 353, 353, 417, 418, 418, 417, 418, 299, 420, 150, - - 426, 421, 426, 426, 150, 417, 418, 420, 417, 448, - 420, 447, 448, 426, 447, 426, 426, 447, 448, 448, - 447, 444, 418, 448, 468, 448, 470, 418, 418, 559, - 448, 418, 448, 484, 448, 354, 415, 448, 418, 418, - 448, 418, 448, 418, 448, 419, 486, 448, 496, 562, - 563, 557, 562, 565, 566, 517, 565, 555, 419, 525, - 445, 394, 498, 527, 449, 534, 553, 551, 532, 519, - 449, 509, 539, 541, 545, 552, 570, 571, 547, 570, - 549, 550, 548, 546, 544, 556, 455, 573, 574, 543, - 573, 542, 540, 554, 538, 558, 560, 537, 536, 568, - - 59, 59, 535, 59, 59, 59, 59, 61, 61, 61, - 61, 61, 61, 61, 73, 73, 73, 73, 73, 73, - 73, 102, 102, 102, 153, 153, 533, 153, 153, 153, - 153, 161, 161, 166, 166, 166, 166, 166, 166, 166, - 169, 169, 169, 169, 169, 169, 169, 229, 531, 530, - 229, 229, 229, 285, 285, 285, 285, 285, 285, 285, - 291, 291, 291, 291, 291, 291, 291, 342, 342, 342, - 342, 342, 342, 342, 383, 383, 383, 383, 383, 383, - 383, 385, 385, 385, 385, 385, 385, 385, 416, 416, - 416, 416, 416, 416, 416, 442, 442, 446, 446, 446, - - 446, 446, 446, 446, 450, 450, 450, 450, 450, 450, - 450, 466, 466, 466, 466, 561, 561, 561, 561, 561, - 561, 561, 564, 564, 564, 564, 564, 564, 564, 569, - 569, 569, 569, 569, 569, 569, 572, 572, 572, 572, - 572, 572, 572, 529, 528, 526, 524, 523, 522, 521, - 520, 518, 516, 515, 514, 513, 512, 511, 510, 508, - 506, 505, 504, 503, 502, 501, 500, 499, 497, 495, - 494, 493, 492, 491, 490, 489, 488, 487, 485, 483, - 465, 482, 481, 480, 479, 478, 477, 476, 475, 474, - 473, 472, 471, 451, 448, 469, 467, 465, 464, 463, - - 462, 461, 460, 459, 458, 457, 456, 454, 453, 452, - 451, 418, 443, 441, 440, 439, 438, 437, 436, 435, - 434, 433, 432, 431, 430, 429, 428, 427, 425, 424, - 423, 422, 386, 384, 414, 413, 412, 411, 410, 409, - 408, 407, 406, 405, 404, 403, 402, 401, 400, 399, - 398, 397, 396, 395, 393, 392, 391, 349, 390, 389, - 386, 343, 384, 382, 381, 380, 379, 378, 377, 376, - 375, 374, 373, 372, 371, 370, 369, 368, 367, 366, - 365, 364, 363, 362, 361, 360, 359, 358, 357, 356, - 355, 352, 351, 347, 346, 345, 292, 344, 343, 341, - - 340, 286, 339, 338, 337, 336, 335, 334, 333, 332, - 331, 330, 329, 328, 327, 326, 325, 324, 323, 322, - 321, 320, 319, 318, 317, 316, 315, 314, 313, 312, - 311, 308, 307, 306, 305, 304, 303, 302, 301, 296, - 295, 294, 293, 292, 290, 289, 288, 287, 286, 284, - 283, 282, 281, 280, 279, 278, 277, 276, 275, 274, - 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, - 263, 262, 261, 260, 259, 256, 255, 254, 253, 252, - 251, 250, 249, 248, 247, 246, 245, 244, 241, 240, - 575, 575, 237, 152, 226, 222, 219, 217, 212, 211, - - 210, 205, 201, 198, 197, 196, 195, 194, 193, 192, - 191, 190, 189, 188, 187, 186, 185, 184, 173, 172, - 165, 164, 163, 162, 148, 575, 147, 146, 143, 575, - 139, 138, 137, 130, 129, 126, 114, 109, 108, 107, - 104, 103, 99, 94, 76, 60, 575, 3, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575 + 81, 72, 85, 105, 113, 116, 114, 106, 110, 141, + 160, 119, 117, 96, 86, 97, 98, 111, 118, 63, + 120, 62, 75, 121, 75, 122, 128, 124, 112, 171, + 215, 65, 66, 129, 123, 160, 67, 125, 216, 145, + 126, 146, 68, 87, 168, 88, 88, 88, 88, 88, + 88, 89, 89, 136, 132, 133, 208, 171, 152, 142, + 137, 152, 233, 90, 134, 161, 63, 135, 91, 58, + 172, 58, 58, 209, 92, 93, 143, 143, 143, 143, + 143, 143, 143, 143, 222, 90, 153, 233, 161, 169, + + 155, 91, 223, 217, 159, 218, 156, 597, 172, 92, + 160, 596, 93, 87, 210, 89, 89, 89, 89, 89, + 89, 89, 89, 155, 596, 201, 204, 159, 424, 211, + 234, 156, 202, 90, 597, 160, 205, 206, 91, 236, + 157, 168, 157, 302, 92, 158, 158, 158, 158, 158, + 158, 158, 158, 234, 225, 90, 240, 245, 246, 232, + 593, 91, 236, 241, 424, 233, 260, 261, 302, 92, + 83, 83, 83, 83, 83, 83, 83, 83, 313, 176, + 451, 177, 232, 178, 220, 314, 169, 179, 150, 151, + 233, 180, 593, 151, 181, 182, 183, 184, 185, 143, + + 143, 143, 143, 143, 143, 143, 143, 570, 226, 392, + 150, 151, 393, 229, 588, 229, 151, 227, 230, 230, + 230, 230, 230, 230, 230, 230, 158, 158, 158, 158, + 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 237, 300, 303, 301, 352, 354, 238, 352, + 588, 302, 358, 235, 358, 358, 585, 235, 353, 358, + 392, 358, 358, 392, 585, 237, 300, 303, 301, 589, + 354, 423, 424, 238, 423, 235, 302, 455, 581, 424, + 235, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 426, 424, 433, + + 427, 433, 433, 423, 424, 359, 423, 426, 151, 424, + 426, 455, 151, 421, 454, 455, 433, 454, 433, 433, + 454, 455, 455, 454, 425, 455, 424, 455, 424, 479, + 151, 508, 400, 424, 424, 151, 424, 494, 424, 455, + 455, 424, 455, 455, 455, 455, 477, 424, 496, 455, + 584, 585, 455, 584, 587, 588, 425, 587, 579, 541, + 452, 510, 592, 593, 578, 592, 532, 456, 576, 463, + 521, 534, 543, 456, 551, 549, 564, 523, 574, 557, + 572, 559, 573, 566, 571, 569, 568, 577, 575, 464, + 595, 596, 567, 595, 565, 563, 562, 561, 560, 580, + + 558, 582, 556, 555, 590, 59, 59, 554, 59, 59, + 59, 59, 61, 61, 61, 61, 61, 61, 61, 73, + 73, 73, 73, 73, 73, 73, 102, 102, 102, 154, + 154, 553, 154, 154, 154, 154, 162, 162, 167, 167, + 167, 167, 167, 167, 167, 170, 170, 170, 170, 170, + 170, 170, 231, 552, 550, 231, 231, 231, 288, 288, + 288, 288, 288, 288, 288, 294, 294, 294, 294, 294, + 294, 294, 346, 346, 346, 346, 346, 346, 346, 388, + 388, 388, 388, 388, 388, 388, 390, 390, 390, 390, + 390, 390, 390, 422, 422, 422, 422, 422, 422, 422, + + 449, 449, 453, 453, 453, 453, 453, 453, 453, 457, + 457, 457, 457, 457, 457, 457, 475, 475, 475, 475, + 583, 583, 583, 583, 583, 583, 583, 586, 586, 586, + 586, 586, 586, 586, 591, 591, 591, 591, 591, 591, + 591, 594, 594, 594, 594, 594, 594, 594, 548, 547, + 546, 545, 544, 542, 540, 539, 538, 537, 536, 535, + 533, 531, 530, 529, 528, 527, 526, 525, 524, 522, + 520, 519, 518, 517, 516, 515, 514, 513, 512, 511, + 509, 507, 506, 505, 504, 503, 502, 501, 500, 499, + 498, 497, 495, 493, 474, 492, 491, 490, 489, 488, + + 487, 486, 485, 484, 483, 482, 481, 480, 458, 455, + 478, 476, 474, 473, 472, 471, 470, 469, 468, 467, + 466, 465, 462, 461, 460, 459, 458, 424, 450, 448, + 447, 446, 445, 444, 443, 442, 441, 440, 439, 438, + 437, 436, 435, 434, 432, 431, 430, 429, 428, 391, + 389, 420, 419, 418, 417, 416, 415, 414, 413, 412, + 411, 410, 409, 408, 407, 406, 405, 404, 403, 402, + 401, 399, 398, 397, 396, 353, 395, 394, 391, 347, + 389, 387, 386, 385, 384, 383, 382, 381, 380, 379, + 378, 377, 376, 375, 374, 373, 372, 371, 370, 369, + + 368, 367, 366, 365, 364, 363, 362, 361, 360, 357, + 356, 355, 351, 350, 349, 295, 348, 347, 345, 344, + 289, 343, 342, 341, 340, 339, 338, 337, 336, 335, + 334, 333, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 323, 322, 321, 320, 319, 318, 317, 316, 315, + 312, 311, 310, 309, 308, 307, 306, 305, 304, 299, + 298, 297, 296, 295, 293, 292, 291, 290, 289, 287, + 286, 285, 284, 283, 282, 281, 280, 279, 278, 277, + 276, 275, 274, 273, 272, 271, 270, 269, 268, 267, + 266, 265, 264, 263, 262, 259, 258, 257, 256, 255, + + 254, 253, 252, 251, 250, 249, 248, 247, 244, 243, + 242, 597, 597, 239, 153, 228, 224, 221, 219, 214, + 213, 212, 207, 203, 200, 199, 198, 197, 196, 195, + 194, 193, 192, 191, 190, 189, 188, 187, 186, 175, + 174, 173, 166, 165, 164, 163, 149, 597, 148, 147, + 144, 597, 140, 139, 138, 131, 130, 127, 115, 109, + 108, 107, 104, 103, 99, 94, 76, 60, 597, 3, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597 } ; -static yyconst flex_int16_t yy_chk[1032] = +static yyconst flex_int16_t yy_chk[1054] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -853,111 +864,113 @@ static yyconst flex_int16_t yy_chk[1032] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 8, 5, 5, 9, 10, 10, - 11, 12, 16, 573, 19, 18, 19, 19, 19, 19, + 11, 12, 16, 73, 19, 18, 19, 19, 19, 19, 19, 19, 19, 19, 25, 27, 27, 20, 16, 18, - 18, 11, 20, 32, 38, 41, 39, 32, 39, 55, - 572, 42, 41, 25, 20, 25, 25, 44, 41, 8, - 42, 46, 12, 43, 38, 43, 50, 44, 46, 73, - 44, 9, 9, 50, 43, 58, 9, 58, 58, 61, - 132, 84, 9, 21, 84, 21, 21, 21, 21, 21, - 21, 21, 21, 105, 49, 49, 66, 132, 66, 55, - 106, 174, 174, 21, 49, 91, 88, 49, 21, 84, - 73, 91, 88, 88, 21, 21, 64, 64, 64, 64, - 64, 64, 64, 64, 61, 21, 128, 137, 91, 88, - - 92, 21, 138, 128, 138, 137, 91, 88, 105, 21, - 88, 106, 21, 22, 130, 22, 22, 22, 22, 22, - 22, 22, 22, 92, 130, 130, 133, 144, 570, 165, - 155, 158, 569, 22, 160, 144, 165, 154, 22, 169, - 90, 133, 90, 154, 22, 90, 90, 90, 90, 90, - 90, 90, 90, 155, 146, 22, 158, 160, 565, 161, - 154, 22, 166, 189, 189, 161, 564, 230, 154, 22, - 83, 83, 83, 83, 83, 83, 83, 83, 246, 111, - 169, 111, 161, 111, 142, 246, 232, 111, 83, 83, - 161, 111, 230, 83, 111, 111, 111, 111, 111, 142, - - 142, 142, 142, 142, 142, 142, 142, 166, 146, 232, - 83, 83, 496, 149, 562, 149, 83, 146, 149, 149, - 149, 149, 149, 149, 149, 149, 156, 156, 156, 156, - 156, 156, 156, 156, 157, 157, 157, 157, 157, 157, - 157, 157, 227, 227, 227, 227, 227, 227, 227, 227, - 236, 298, 561, 157, 559, 300, 496, 157, 228, 228, - 228, 228, 228, 228, 228, 228, 235, 296, 345, 419, - 296, 345, 235, 236, 449, 157, 298, 228, 300, 296, - 157, 228, 305, 387, 305, 305, 387, 444, 353, 235, - 353, 353, 388, 388, 468, 388, 484, 235, 389, 228, - - 395, 389, 395, 395, 228, 417, 417, 420, 417, 470, - 420, 421, 421, 426, 421, 426, 426, 447, 447, 498, - 447, 419, 507, 486, 444, 509, 449, 525, 517, 555, - 519, 532, 534, 468, 527, 305, 387, 541, 545, 539, - 547, 550, 552, 554, 556, 388, 470, 560, 484, 557, - 557, 553, 557, 558, 558, 507, 558, 551, 417, 517, - 420, 353, 486, 519, 421, 527, 549, 546, 525, 509, - 447, 498, 532, 534, 539, 547, 567, 567, 541, 567, - 544, 545, 543, 540, 538, 552, 426, 568, 568, 536, - 568, 535, 533, 550, 531, 554, 556, 530, 529, 560, - - 576, 576, 528, 576, 576, 576, 576, 577, 577, 577, - 577, 577, 577, 577, 578, 578, 578, 578, 578, 578, - 578, 579, 579, 579, 580, 580, 526, 580, 580, 580, - 580, 581, 581, 582, 582, 582, 582, 582, 582, 582, - 583, 583, 583, 583, 583, 583, 583, 584, 524, 523, - 584, 584, 584, 585, 585, 585, 585, 585, 585, 585, - 586, 586, 586, 586, 586, 586, 586, 587, 587, 587, - 587, 587, 587, 587, 588, 588, 588, 588, 588, 588, - 588, 589, 589, 589, 589, 589, 589, 589, 590, 590, - 590, 590, 590, 590, 590, 591, 591, 592, 592, 592, - - 592, 592, 592, 592, 593, 593, 593, 593, 593, 593, - 593, 594, 594, 594, 594, 595, 595, 595, 595, 595, - 595, 595, 596, 596, 596, 596, 596, 596, 596, 597, - 597, 597, 597, 597, 597, 597, 598, 598, 598, 598, - 598, 598, 598, 521, 520, 518, 516, 513, 512, 511, - 510, 508, 506, 504, 503, 502, 501, 500, 499, 497, - 495, 494, 492, 491, 490, 489, 488, 487, 485, 483, - 482, 481, 476, 475, 474, 473, 472, 471, 469, 467, - 466, 464, 463, 462, 461, 459, 458, 457, 456, 455, - 454, 453, 452, 450, 446, 445, 443, 442, 436, 435, - - 433, 432, 431, 430, 429, 428, 427, 425, 424, 423, - 422, 416, 415, 413, 412, 410, 409, 407, 406, 405, - 404, 403, 402, 401, 400, 399, 398, 396, 394, 393, - 392, 390, 385, 383, 382, 381, 380, 379, 372, 371, - 367, 366, 365, 364, 363, 362, 361, 360, 359, 358, - 357, 356, 355, 354, 352, 351, 349, 348, 347, 346, - 344, 342, 341, 340, 338, 337, 335, 334, 333, 332, - 331, 330, 328, 327, 326, 325, 322, 321, 320, 319, - 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, - 306, 303, 302, 295, 294, 293, 291, 290, 289, 288, - - 287, 285, 284, 283, 281, 280, 279, 277, 276, 275, - 274, 273, 272, 271, 270, 269, 267, 265, 264, 263, - 260, 259, 258, 257, 254, 252, 251, 250, 249, 248, - 247, 245, 244, 243, 242, 241, 239, 238, 237, 229, - 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, - 216, 215, 214, 213, 212, 211, 210, 209, 208, 207, - 206, 205, 204, 203, 202, 201, 199, 198, 196, 195, - 194, 193, 192, 191, 190, 188, 187, 186, 185, 183, - 182, 181, 180, 179, 178, 177, 176, 175, 173, 172, - 171, 168, 164, 151, 147, 145, 143, 139, 136, 135, - - 134, 131, 129, 126, 125, 124, 123, 122, 121, 120, - 119, 118, 117, 116, 115, 114, 113, 112, 110, 107, - 104, 103, 101, 97, 82, 75, 68, 67, 65, 63, - 53, 52, 51, 48, 47, 45, 40, 37, 35, 33, - 31, 30, 26, 23, 15, 7, 3, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - 575 + 18, 11, 20, 32, 39, 41, 39, 32, 38, 55, + 159, 42, 41, 25, 20, 25, 25, 38, 41, 8, + 42, 61, 12, 43, 73, 43, 46, 44, 38, 106, + 138, 9, 9, 46, 43, 159, 9, 44, 138, 66, + 44, 66, 9, 21, 105, 21, 21, 21, 21, 21, + 21, 21, 21, 50, 49, 49, 133, 170, 84, 55, + 50, 84, 232, 21, 49, 92, 61, 49, 21, 58, + 106, 58, 58, 133, 21, 21, 64, 64, 64, 64, + 64, 64, 64, 64, 145, 21, 84, 232, 92, 105, + + 88, 21, 145, 139, 91, 139, 88, 88, 170, 21, + 91, 595, 21, 22, 134, 22, 22, 22, 22, 22, + 22, 22, 22, 88, 594, 129, 131, 91, 425, 134, + 156, 88, 129, 22, 88, 91, 131, 131, 22, 161, + 90, 167, 90, 301, 22, 90, 90, 90, 90, 90, + 90, 90, 90, 156, 147, 22, 166, 176, 176, 155, + 592, 22, 161, 166, 564, 155, 191, 191, 301, 22, + 83, 83, 83, 83, 83, 83, 83, 83, 249, 112, + 425, 112, 155, 112, 143, 249, 167, 112, 83, 83, + 155, 112, 591, 83, 112, 112, 112, 112, 112, 143, + + 143, 143, 143, 143, 143, 143, 143, 564, 147, 349, + 83, 83, 349, 150, 587, 150, 83, 147, 150, 150, + 150, 150, 150, 150, 150, 150, 157, 157, 157, 157, + 157, 157, 157, 157, 158, 158, 158, 158, 158, 158, + 158, 158, 162, 234, 238, 237, 299, 303, 162, 299, + 586, 237, 309, 158, 309, 309, 584, 158, 299, 358, + 392, 358, 358, 392, 583, 162, 234, 238, 237, 581, + 303, 393, 393, 162, 393, 158, 237, 456, 576, 494, + 158, 229, 229, 229, 229, 229, 229, 229, 229, 230, + 230, 230, 230, 230, 230, 230, 230, 394, 477, 401, + + 394, 401, 401, 423, 423, 309, 423, 426, 230, 451, + 426, 479, 230, 392, 427, 427, 433, 427, 433, 433, + 454, 454, 496, 454, 393, 510, 508, 523, 532, 456, + 230, 494, 358, 521, 541, 230, 570, 477, 549, 534, + 551, 557, 559, 543, 572, 566, 451, 575, 479, 577, + 579, 579, 582, 579, 580, 580, 423, 580, 574, 532, + 426, 496, 589, 589, 573, 589, 521, 427, 571, 433, + 508, 523, 534, 454, 543, 541, 557, 510, 569, 549, + 566, 551, 568, 559, 565, 563, 562, 572, 570, 433, + 590, 590, 561, 590, 558, 556, 554, 553, 552, 575, + + 550, 577, 548, 547, 582, 598, 598, 546, 598, 598, + 598, 598, 599, 599, 599, 599, 599, 599, 599, 600, + 600, 600, 600, 600, 600, 600, 601, 601, 601, 602, + 602, 545, 602, 602, 602, 602, 603, 603, 604, 604, + 604, 604, 604, 604, 604, 605, 605, 605, 605, 605, + 605, 605, 606, 544, 542, 606, 606, 606, 607, 607, + 607, 607, 607, 607, 607, 608, 608, 608, 608, 608, + 608, 608, 609, 609, 609, 609, 609, 609, 609, 610, + 610, 610, 610, 610, 610, 610, 611, 611, 611, 611, + 611, 611, 611, 612, 612, 612, 612, 612, 612, 612, + + 613, 613, 614, 614, 614, 614, 614, 614, 614, 615, + 615, 615, 615, 615, 615, 615, 616, 616, 616, 616, + 617, 617, 617, 617, 617, 617, 617, 618, 618, 618, + 618, 618, 618, 618, 619, 619, 619, 619, 619, 619, + 619, 620, 620, 620, 620, 620, 620, 620, 540, 539, + 538, 536, 535, 533, 531, 528, 527, 526, 525, 524, + 522, 520, 517, 516, 515, 514, 513, 512, 511, 509, + 507, 506, 504, 503, 502, 501, 500, 499, 498, 497, + 495, 493, 492, 491, 489, 486, 485, 484, 483, 482, + 481, 480, 478, 476, 475, 473, 472, 471, 470, 468, + + 467, 466, 465, 464, 463, 462, 460, 459, 457, 453, + 452, 450, 449, 443, 442, 440, 439, 438, 437, 436, + 435, 434, 432, 431, 430, 429, 428, 422, 421, 419, + 418, 416, 415, 413, 412, 411, 410, 409, 408, 407, + 406, 405, 404, 402, 400, 399, 398, 397, 395, 390, + 388, 387, 386, 385, 384, 377, 376, 372, 371, 370, + 369, 368, 367, 366, 365, 364, 363, 362, 361, 360, + 359, 357, 356, 355, 353, 352, 351, 350, 348, 346, + 345, 344, 342, 341, 339, 338, 337, 336, 335, 334, + 332, 331, 330, 329, 326, 325, 324, 323, 320, 319, + + 318, 317, 316, 315, 314, 313, 312, 311, 310, 308, + 306, 305, 298, 297, 296, 294, 293, 292, 291, 290, + 288, 287, 286, 284, 283, 282, 280, 279, 278, 277, + 276, 275, 274, 273, 272, 270, 268, 267, 266, 263, + 262, 261, 260, 257, 255, 254, 253, 252, 251, 250, + 248, 247, 246, 245, 244, 243, 241, 240, 239, 231, + 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, + 218, 217, 216, 215, 214, 213, 212, 211, 210, 209, + 208, 207, 206, 205, 204, 203, 201, 200, 198, 197, + 196, 195, 194, 193, 192, 190, 189, 188, 187, 185, + + 184, 183, 182, 181, 180, 179, 178, 177, 175, 174, + 173, 172, 169, 165, 152, 148, 146, 144, 140, 137, + 136, 135, 132, 130, 127, 126, 125, 124, 123, 122, + 121, 120, 119, 118, 117, 116, 115, 114, 113, 111, + 110, 107, 104, 103, 101, 97, 82, 75, 68, 67, + 65, 63, 53, 52, 51, 48, 47, 45, 40, 37, + 35, 33, 31, 30, 26, 23, 15, 7, 3, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 597, + 597, 597, 597 } ; extern int yy_flex_debug; @@ -1011,6 +1024,7 @@ char *yytext; #line 32 "giscanner/scannerlexer.l" #include #include +#include #ifndef _WIN32 #include #endif @@ -1038,7 +1052,7 @@ static void process_linemarks (GISourceScanner *scanner); static int check_identifier (GISourceScanner *scanner, const char *); static int parse_ignored_macro (void); static void print_error (GISourceScanner *scanner); -#line 1042 "scannerlexer.c" +#line 1056 "scannerlexer.c" #define INITIAL 0 @@ -1218,10 +1232,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 72 "giscanner/scannerlexer.l" +#line 73 "giscanner/scannerlexer.l" -#line 1225 "scannerlexer.c" +#line 1239 "scannerlexer.c" if ( !(yy_init) ) { @@ -1279,14 +1293,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 576 ) + if ( yy_current_state >= 598 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_base[yy_current_state] != 948 ); + while ( yy_base[yy_current_state] != 970 ); yy_find_action: yy_current_state = *--(yy_state_ptr); @@ -1316,7 +1330,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 74 "giscanner/scannerlexer.l" +#line 75 "giscanner/scannerlexer.l" { strncpy(linebuf, yytext+1, sizeof(linebuf)); /* save the next line */ linebuf[sizeof(linebuf)-1]='\0'; /* printf("%4d:%s\n",lineno,linebuf); */ @@ -1327,734 +1341,749 @@ YY_RULE_SETUP case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 80 "giscanner/scannerlexer.l" +#line 81 "giscanner/scannerlexer.l" { ++lineno; } YY_BREAK case 3: YY_RULE_SETUP -#line 82 "giscanner/scannerlexer.l" +#line 83 "giscanner/scannerlexer.l" { /* Ignore whitespace. */ } YY_BREAK case 4: YY_RULE_SETUP -#line 84 "giscanner/scannerlexer.l" +#line 85 "giscanner/scannerlexer.l" { parse_comment(scanner); } YY_BREAK case 5: YY_RULE_SETUP -#line 85 "giscanner/scannerlexer.l" +#line 86 "giscanner/scannerlexer.l" { parse_trigraph(scanner); } YY_BREAK case 6: YY_RULE_SETUP -#line 86 "giscanner/scannerlexer.l" +#line 87 "giscanner/scannerlexer.l" { /* Ignore C++ style comments. */ } YY_BREAK case 7: YY_RULE_SETUP -#line 88 "giscanner/scannerlexer.l" +#line 89 "giscanner/scannerlexer.l" { yyless (yyleng - 1); return FUNCTION_MACRO; } YY_BREAK case 8: YY_RULE_SETUP -#line 89 "giscanner/scannerlexer.l" +#line 90 "giscanner/scannerlexer.l" { return OBJECT_MACRO; } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 90 "giscanner/scannerlexer.l" +#line 91 "giscanner/scannerlexer.l" { return IFDEF_GI_SCANNER; } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 91 "giscanner/scannerlexer.l" +#line 92 "giscanner/scannerlexer.l" { return IFNDEF_GI_SCANNER; } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 92 "giscanner/scannerlexer.l" +#line 93 "giscanner/scannerlexer.l" { return IFNDEF_COND; } YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 93 "giscanner/scannerlexer.l" +#line 94 "giscanner/scannerlexer.l" { return IFDEF_COND; } YY_BREAK case 13: /* rule 13 can match eol */ YY_RULE_SETUP -#line 94 "giscanner/scannerlexer.l" +#line 95 "giscanner/scannerlexer.l" { return IF_COND; } YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 95 "giscanner/scannerlexer.l" +#line 96 "giscanner/scannerlexer.l" { return ELIF_COND; } YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 96 "giscanner/scannerlexer.l" +#line 97 "giscanner/scannerlexer.l" { return ELSE_COND; } YY_BREAK case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 97 "giscanner/scannerlexer.l" +#line 98 "giscanner/scannerlexer.l" { return ENDIF_COND; } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 98 "giscanner/scannerlexer.l" +#line 99 "giscanner/scannerlexer.l" { /* Ignore pragma. */ } YY_BREAK case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 100 "giscanner/scannerlexer.l" +#line 101 "giscanner/scannerlexer.l" { process_linemarks(scanner); } YY_BREAK case 19: YY_RULE_SETUP -#line 101 "giscanner/scannerlexer.l" +#line 102 "giscanner/scannerlexer.l" { } YY_BREAK case 20: YY_RULE_SETUP -#line 102 "giscanner/scannerlexer.l" +#line 103 "giscanner/scannerlexer.l" { return '{'; } YY_BREAK case 21: YY_RULE_SETUP -#line 103 "giscanner/scannerlexer.l" +#line 104 "giscanner/scannerlexer.l" { return '{'; } YY_BREAK case 22: YY_RULE_SETUP -#line 104 "giscanner/scannerlexer.l" +#line 105 "giscanner/scannerlexer.l" { return '}'; } YY_BREAK case 23: YY_RULE_SETUP -#line 105 "giscanner/scannerlexer.l" +#line 106 "giscanner/scannerlexer.l" { return '}'; } YY_BREAK case 24: YY_RULE_SETUP -#line 106 "giscanner/scannerlexer.l" +#line 107 "giscanner/scannerlexer.l" { return '['; } YY_BREAK case 25: YY_RULE_SETUP -#line 107 "giscanner/scannerlexer.l" +#line 108 "giscanner/scannerlexer.l" { return '['; } YY_BREAK case 26: YY_RULE_SETUP -#line 108 "giscanner/scannerlexer.l" +#line 109 "giscanner/scannerlexer.l" { return ']'; } YY_BREAK case 27: YY_RULE_SETUP -#line 109 "giscanner/scannerlexer.l" +#line 110 "giscanner/scannerlexer.l" { return ']'; } YY_BREAK case 28: YY_RULE_SETUP -#line 110 "giscanner/scannerlexer.l" +#line 111 "giscanner/scannerlexer.l" { return '('; } YY_BREAK case 29: YY_RULE_SETUP -#line 111 "giscanner/scannerlexer.l" +#line 112 "giscanner/scannerlexer.l" { return ')'; } YY_BREAK case 30: YY_RULE_SETUP -#line 112 "giscanner/scannerlexer.l" +#line 113 "giscanner/scannerlexer.l" { return ';'; } YY_BREAK case 31: YY_RULE_SETUP -#line 113 "giscanner/scannerlexer.l" +#line 114 "giscanner/scannerlexer.l" { return ':'; } YY_BREAK case 32: YY_RULE_SETUP -#line 114 "giscanner/scannerlexer.l" +#line 115 "giscanner/scannerlexer.l" { return ELLIPSIS; } YY_BREAK case 33: YY_RULE_SETUP -#line 115 "giscanner/scannerlexer.l" +#line 116 "giscanner/scannerlexer.l" { return '?'; } YY_BREAK case 34: YY_RULE_SETUP -#line 116 "giscanner/scannerlexer.l" +#line 117 "giscanner/scannerlexer.l" { return '.'; } YY_BREAK case 35: YY_RULE_SETUP -#line 117 "giscanner/scannerlexer.l" +#line 118 "giscanner/scannerlexer.l" { return '+'; } YY_BREAK case 36: YY_RULE_SETUP -#line 118 "giscanner/scannerlexer.l" +#line 119 "giscanner/scannerlexer.l" { return '-'; } YY_BREAK case 37: YY_RULE_SETUP -#line 119 "giscanner/scannerlexer.l" +#line 120 "giscanner/scannerlexer.l" { return '*'; } YY_BREAK case 38: YY_RULE_SETUP -#line 120 "giscanner/scannerlexer.l" +#line 121 "giscanner/scannerlexer.l" { return '/'; } YY_BREAK case 39: YY_RULE_SETUP -#line 121 "giscanner/scannerlexer.l" +#line 122 "giscanner/scannerlexer.l" { return '%'; } YY_BREAK case 40: YY_RULE_SETUP -#line 122 "giscanner/scannerlexer.l" +#line 123 "giscanner/scannerlexer.l" { return '^'; } YY_BREAK case 41: YY_RULE_SETUP -#line 123 "giscanner/scannerlexer.l" +#line 124 "giscanner/scannerlexer.l" { return '&'; } YY_BREAK case 42: YY_RULE_SETUP -#line 124 "giscanner/scannerlexer.l" +#line 125 "giscanner/scannerlexer.l" { return '|'; } YY_BREAK case 43: YY_RULE_SETUP -#line 125 "giscanner/scannerlexer.l" +#line 126 "giscanner/scannerlexer.l" { return '~'; } YY_BREAK case 44: YY_RULE_SETUP -#line 126 "giscanner/scannerlexer.l" +#line 127 "giscanner/scannerlexer.l" { return '!'; } YY_BREAK case 45: YY_RULE_SETUP -#line 127 "giscanner/scannerlexer.l" +#line 128 "giscanner/scannerlexer.l" { return '='; } YY_BREAK case 46: YY_RULE_SETUP -#line 128 "giscanner/scannerlexer.l" +#line 129 "giscanner/scannerlexer.l" { return '<'; } YY_BREAK case 47: YY_RULE_SETUP -#line 129 "giscanner/scannerlexer.l" +#line 130 "giscanner/scannerlexer.l" { return '>'; } YY_BREAK case 48: YY_RULE_SETUP -#line 130 "giscanner/scannerlexer.l" +#line 131 "giscanner/scannerlexer.l" { return ADDEQ; } YY_BREAK case 49: YY_RULE_SETUP -#line 131 "giscanner/scannerlexer.l" +#line 132 "giscanner/scannerlexer.l" { return SUBEQ; } YY_BREAK case 50: YY_RULE_SETUP -#line 132 "giscanner/scannerlexer.l" +#line 133 "giscanner/scannerlexer.l" { return MULEQ; } YY_BREAK case 51: YY_RULE_SETUP -#line 133 "giscanner/scannerlexer.l" +#line 134 "giscanner/scannerlexer.l" { return DIVEQ; } YY_BREAK case 52: YY_RULE_SETUP -#line 134 "giscanner/scannerlexer.l" +#line 135 "giscanner/scannerlexer.l" { return MODEQ; } YY_BREAK case 53: YY_RULE_SETUP -#line 135 "giscanner/scannerlexer.l" +#line 136 "giscanner/scannerlexer.l" { return XOREQ; } YY_BREAK case 54: YY_RULE_SETUP -#line 136 "giscanner/scannerlexer.l" +#line 137 "giscanner/scannerlexer.l" { return ANDEQ; } YY_BREAK case 55: YY_RULE_SETUP -#line 137 "giscanner/scannerlexer.l" +#line 138 "giscanner/scannerlexer.l" { return OREQ; } YY_BREAK case 56: YY_RULE_SETUP -#line 138 "giscanner/scannerlexer.l" +#line 139 "giscanner/scannerlexer.l" { return SL; } YY_BREAK case 57: YY_RULE_SETUP -#line 139 "giscanner/scannerlexer.l" +#line 140 "giscanner/scannerlexer.l" { return SR; } YY_BREAK case 58: YY_RULE_SETUP -#line 140 "giscanner/scannerlexer.l" +#line 141 "giscanner/scannerlexer.l" { return SLEQ; } YY_BREAK case 59: YY_RULE_SETUP -#line 141 "giscanner/scannerlexer.l" +#line 142 "giscanner/scannerlexer.l" { return SREQ; } YY_BREAK case 60: YY_RULE_SETUP -#line 142 "giscanner/scannerlexer.l" +#line 143 "giscanner/scannerlexer.l" { return EQ; } YY_BREAK case 61: YY_RULE_SETUP -#line 143 "giscanner/scannerlexer.l" +#line 144 "giscanner/scannerlexer.l" { return NOTEQ; } YY_BREAK case 62: YY_RULE_SETUP -#line 144 "giscanner/scannerlexer.l" +#line 145 "giscanner/scannerlexer.l" { return LTEQ; } YY_BREAK case 63: YY_RULE_SETUP -#line 145 "giscanner/scannerlexer.l" +#line 146 "giscanner/scannerlexer.l" { return GTEQ; } YY_BREAK case 64: YY_RULE_SETUP -#line 146 "giscanner/scannerlexer.l" +#line 147 "giscanner/scannerlexer.l" { return ANDAND; } YY_BREAK case 65: YY_RULE_SETUP -#line 147 "giscanner/scannerlexer.l" +#line 148 "giscanner/scannerlexer.l" { return OROR; } YY_BREAK case 66: YY_RULE_SETUP -#line 148 "giscanner/scannerlexer.l" +#line 149 "giscanner/scannerlexer.l" { return PLUSPLUS; } YY_BREAK case 67: YY_RULE_SETUP -#line 149 "giscanner/scannerlexer.l" +#line 150 "giscanner/scannerlexer.l" { return MINUSMINUS; } YY_BREAK case 68: YY_RULE_SETUP -#line 150 "giscanner/scannerlexer.l" +#line 151 "giscanner/scannerlexer.l" { return ','; } YY_BREAK case 69: YY_RULE_SETUP -#line 151 "giscanner/scannerlexer.l" +#line 152 "giscanner/scannerlexer.l" { return ARROW; } YY_BREAK case 70: YY_RULE_SETUP -#line 153 "giscanner/scannerlexer.l" +#line 154 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 71: YY_RULE_SETUP -#line 154 "giscanner/scannerlexer.l" +#line 155 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 72: YY_RULE_SETUP -#line 155 "giscanner/scannerlexer.l" +#line 156 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 73: YY_RULE_SETUP -#line 156 "giscanner/scannerlexer.l" +#line 157 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 74: YY_RULE_SETUP -#line 157 "giscanner/scannerlexer.l" +#line 158 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 75: YY_RULE_SETUP -#line 158 "giscanner/scannerlexer.l" +#line 159 "giscanner/scannerlexer.l" { if (!parse_ignored_macro()) REJECT; } YY_BREAK case 76: YY_RULE_SETUP -#line 159 "giscanner/scannerlexer.l" -{ return CONST; } +#line 160 "giscanner/scannerlexer.l" +{ if (!parse_ignored_macro()) REJECT; } YY_BREAK case 77: YY_RULE_SETUP -#line 160 "giscanner/scannerlexer.l" -{ return EXTENSION; } +#line 161 "giscanner/scannerlexer.l" +{ return CONST; } YY_BREAK case 78: YY_RULE_SETUP -#line 161 "giscanner/scannerlexer.l" -{ return INLINE; } +#line 162 "giscanner/scannerlexer.l" +{ return EXTENSION; } YY_BREAK case 79: YY_RULE_SETUP -#line 162 "giscanner/scannerlexer.l" +#line 163 "giscanner/scannerlexer.l" { return INLINE; } YY_BREAK case 80: YY_RULE_SETUP -#line 163 "giscanner/scannerlexer.l" -{ if (!parse_ignored_macro()) REJECT; } +#line 164 "giscanner/scannerlexer.l" +{ return INLINE; } YY_BREAK case 81: YY_RULE_SETUP -#line 164 "giscanner/scannerlexer.l" -{ return SIGNED; } +#line 165 "giscanner/scannerlexer.l" +{ if (!parse_ignored_macro()) REJECT; } YY_BREAK case 82: YY_RULE_SETUP -#line 165 "giscanner/scannerlexer.l" -{ return RESTRICT; } +#line 166 "giscanner/scannerlexer.l" +{ /* Ignore */ } YY_BREAK case 83: YY_RULE_SETUP -#line 166 "giscanner/scannerlexer.l" -{ if (!parse_ignored_macro()) REJECT; } +#line 167 "giscanner/scannerlexer.l" +{ return SIGNED; } YY_BREAK case 84: YY_RULE_SETUP -#line 167 "giscanner/scannerlexer.l" -{ return VOLATILE; } +#line 168 "giscanner/scannerlexer.l" +{ return RESTRICT; } YY_BREAK case 85: YY_RULE_SETUP -#line 168 "giscanner/scannerlexer.l" -{ return VOLATILE; } +#line 169 "giscanner/scannerlexer.l" +{ return RESTRICT; } YY_BREAK case 86: YY_RULE_SETUP -#line 169 "giscanner/scannerlexer.l" -{ return BOOL; } +#line 170 "giscanner/scannerlexer.l" +{ if (!parse_ignored_macro()) REJECT; } YY_BREAK case 87: YY_RULE_SETUP #line 171 "giscanner/scannerlexer.l" -{ return INTL_CONST; } +{ return VOLATILE; } YY_BREAK case 88: YY_RULE_SETUP #line 172 "giscanner/scannerlexer.l" -{ return INTUL_CONST; } +{ return VOLATILE; } YY_BREAK case 89: YY_RULE_SETUP -#line 174 "giscanner/scannerlexer.l" -{ return BOOLEAN; } +#line 173 "giscanner/scannerlexer.l" +{ return BOOL; } YY_BREAK case 90: YY_RULE_SETUP #line 175 "giscanner/scannerlexer.l" -{ return BOOLEAN; } +{ return INTL_CONST; } YY_BREAK case 91: YY_RULE_SETUP #line 176 "giscanner/scannerlexer.l" -{ return BOOLEAN; } +{ return INTUL_CONST; } YY_BREAK case 92: YY_RULE_SETUP -#line 177 "giscanner/scannerlexer.l" +#line 178 "giscanner/scannerlexer.l" { return BOOLEAN; } YY_BREAK case 93: YY_RULE_SETUP #line 179 "giscanner/scannerlexer.l" -{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; } +{ return BOOLEAN; } YY_BREAK case 94: YY_RULE_SETUP -#line 181 "giscanner/scannerlexer.l" -{ if (!parse_ignored_macro()) REJECT; } +#line 180 "giscanner/scannerlexer.l" +{ return BOOLEAN; } YY_BREAK case 95: YY_RULE_SETUP -#line 182 "giscanner/scannerlexer.l" -{ return AUTO; } +#line 181 "giscanner/scannerlexer.l" +{ return BOOLEAN; } YY_BREAK case 96: YY_RULE_SETUP #line 183 "giscanner/scannerlexer.l" -{ return BREAK; } +{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; } YY_BREAK case 97: YY_RULE_SETUP -#line 184 "giscanner/scannerlexer.l" -{ return CASE; } +#line 185 "giscanner/scannerlexer.l" +{ if (!parse_ignored_macro()) REJECT; } YY_BREAK case 98: YY_RULE_SETUP -#line 185 "giscanner/scannerlexer.l" -{ return CHAR; } +#line 186 "giscanner/scannerlexer.l" +{ return AUTO; } YY_BREAK case 99: YY_RULE_SETUP -#line 186 "giscanner/scannerlexer.l" -{ return CONST; } +#line 187 "giscanner/scannerlexer.l" +{ return BREAK; } YY_BREAK case 100: YY_RULE_SETUP -#line 187 "giscanner/scannerlexer.l" -{ return CONTINUE; } +#line 188 "giscanner/scannerlexer.l" +{ return CASE; } YY_BREAK case 101: YY_RULE_SETUP -#line 188 "giscanner/scannerlexer.l" -{ return DEFAULT; } +#line 189 "giscanner/scannerlexer.l" +{ return CHAR; } YY_BREAK case 102: YY_RULE_SETUP -#line 189 "giscanner/scannerlexer.l" -{ return DO; } +#line 190 "giscanner/scannerlexer.l" +{ return CONST; } YY_BREAK case 103: YY_RULE_SETUP -#line 190 "giscanner/scannerlexer.l" -{ return DOUBLE; } +#line 191 "giscanner/scannerlexer.l" +{ return CONTINUE; } YY_BREAK case 104: YY_RULE_SETUP -#line 191 "giscanner/scannerlexer.l" -{ return ELSE; } +#line 192 "giscanner/scannerlexer.l" +{ return DEFAULT; } YY_BREAK case 105: YY_RULE_SETUP -#line 192 "giscanner/scannerlexer.l" -{ return ENUM; } +#line 193 "giscanner/scannerlexer.l" +{ return DO; } YY_BREAK case 106: YY_RULE_SETUP -#line 193 "giscanner/scannerlexer.l" -{ return EXTERN; } +#line 194 "giscanner/scannerlexer.l" +{ return DOUBLE; } YY_BREAK case 107: YY_RULE_SETUP -#line 194 "giscanner/scannerlexer.l" -{ return FLOAT; } +#line 195 "giscanner/scannerlexer.l" +{ return ELSE; } YY_BREAK case 108: YY_RULE_SETUP -#line 195 "giscanner/scannerlexer.l" -{ return FOR; } +#line 196 "giscanner/scannerlexer.l" +{ return ENUM; } YY_BREAK case 109: YY_RULE_SETUP -#line 196 "giscanner/scannerlexer.l" -{ return GOTO; } +#line 197 "giscanner/scannerlexer.l" +{ return EXTERN; } YY_BREAK case 110: YY_RULE_SETUP -#line 197 "giscanner/scannerlexer.l" -{ return IF; } +#line 198 "giscanner/scannerlexer.l" +{ return FLOAT; } YY_BREAK case 111: YY_RULE_SETUP -#line 198 "giscanner/scannerlexer.l" -{ return INLINE; } +#line 199 "giscanner/scannerlexer.l" +{ return FOR; } YY_BREAK case 112: YY_RULE_SETUP -#line 199 "giscanner/scannerlexer.l" -{ return INT; } +#line 200 "giscanner/scannerlexer.l" +{ return GOTO; } YY_BREAK case 113: YY_RULE_SETUP -#line 200 "giscanner/scannerlexer.l" -{ return INT; } +#line 201 "giscanner/scannerlexer.l" +{ return IF; } YY_BREAK case 114: YY_RULE_SETUP -#line 201 "giscanner/scannerlexer.l" -{ return INT; } +#line 202 "giscanner/scannerlexer.l" +{ return INLINE; } YY_BREAK case 115: YY_RULE_SETUP -#line 202 "giscanner/scannerlexer.l" +#line 203 "giscanner/scannerlexer.l" { return INT; } YY_BREAK case 116: YY_RULE_SETUP -#line 203 "giscanner/scannerlexer.l" +#line 204 "giscanner/scannerlexer.l" { return INT; } YY_BREAK case 117: YY_RULE_SETUP -#line 204 "giscanner/scannerlexer.l" -{ return LONG; } +#line 205 "giscanner/scannerlexer.l" +{ return INT; } YY_BREAK case 118: YY_RULE_SETUP -#line 205 "giscanner/scannerlexer.l" -{ return REGISTER; } +#line 206 "giscanner/scannerlexer.l" +{ return INT; } YY_BREAK case 119: YY_RULE_SETUP -#line 206 "giscanner/scannerlexer.l" -{ return RESTRICT; } +#line 207 "giscanner/scannerlexer.l" +{ return INT; } YY_BREAK case 120: YY_RULE_SETUP -#line 207 "giscanner/scannerlexer.l" -{ return RETURN; } +#line 208 "giscanner/scannerlexer.l" +{ return LONG; } YY_BREAK case 121: YY_RULE_SETUP -#line 208 "giscanner/scannerlexer.l" -{ return SHORT; } +#line 209 "giscanner/scannerlexer.l" +{ return REGISTER; } YY_BREAK case 122: YY_RULE_SETUP -#line 209 "giscanner/scannerlexer.l" -{ return SIGNED; } +#line 210 "giscanner/scannerlexer.l" +{ return RESTRICT; } YY_BREAK case 123: YY_RULE_SETUP -#line 210 "giscanner/scannerlexer.l" -{ return SIZEOF; } +#line 211 "giscanner/scannerlexer.l" +{ return RETURN; } YY_BREAK case 124: YY_RULE_SETUP -#line 211 "giscanner/scannerlexer.l" -{ return STATIC; } +#line 212 "giscanner/scannerlexer.l" +{ return SHORT; } YY_BREAK case 125: YY_RULE_SETUP -#line 212 "giscanner/scannerlexer.l" -{ return STRUCT; } +#line 213 "giscanner/scannerlexer.l" +{ return SIGNED; } YY_BREAK case 126: YY_RULE_SETUP -#line 213 "giscanner/scannerlexer.l" -{ return SWITCH; } +#line 214 "giscanner/scannerlexer.l" +{ return SIZEOF; } YY_BREAK case 127: YY_RULE_SETUP -#line 214 "giscanner/scannerlexer.l" -{ return TYPEDEF; } +#line 215 "giscanner/scannerlexer.l" +{ return STATIC; } YY_BREAK case 128: YY_RULE_SETUP -#line 215 "giscanner/scannerlexer.l" -{ return UNION; } +#line 216 "giscanner/scannerlexer.l" +{ return STRUCT; } YY_BREAK case 129: YY_RULE_SETUP -#line 216 "giscanner/scannerlexer.l" -{ return UNSIGNED; } +#line 217 "giscanner/scannerlexer.l" +{ return SWITCH; } YY_BREAK case 130: YY_RULE_SETUP -#line 217 "giscanner/scannerlexer.l" -{ return VOID; } +#line 218 "giscanner/scannerlexer.l" +{ return TYPEDEF; } YY_BREAK case 131: YY_RULE_SETUP -#line 218 "giscanner/scannerlexer.l" -{ return VOLATILE; } +#line 219 "giscanner/scannerlexer.l" +{ return UNION; } YY_BREAK case 132: YY_RULE_SETUP -#line 219 "giscanner/scannerlexer.l" -{ return WHILE; } +#line 220 "giscanner/scannerlexer.l" +{ return UNSIGNED; } YY_BREAK case 133: YY_RULE_SETUP #line 221 "giscanner/scannerlexer.l" -{ return check_identifier(scanner, yytext); } +{ return VOID; } YY_BREAK case 134: YY_RULE_SETUP -#line 223 "giscanner/scannerlexer.l" -{ return INTEGER; } +#line 222 "giscanner/scannerlexer.l" +{ return VOLATILE; } YY_BREAK case 135: YY_RULE_SETUP -#line 224 "giscanner/scannerlexer.l" -{ return INTEGER; } +#line 223 "giscanner/scannerlexer.l" +{ return WHILE; } YY_BREAK case 136: YY_RULE_SETUP #line 225 "giscanner/scannerlexer.l" -{ return INTEGER; } +{ return check_identifier(scanner, yytext); } YY_BREAK case 137: YY_RULE_SETUP #line 227 "giscanner/scannerlexer.l" -{ return FLOATING; } +{ return INTEGER; } YY_BREAK case 138: YY_RULE_SETUP #line 228 "giscanner/scannerlexer.l" -{ return FLOATING; } +{ return INTEGER; } YY_BREAK case 139: -/* rule 139 can match eol */ YY_RULE_SETUP -#line 230 "giscanner/scannerlexer.l" -{ return CHARACTER; } +#line 229 "giscanner/scannerlexer.l" +{ return INTEGER; } YY_BREAK case 140: -/* rule 140 can match eol */ YY_RULE_SETUP #line 231 "giscanner/scannerlexer.l" -{ return CHARACTER; } +{ return FLOATING; } YY_BREAK case 141: -/* rule 141 can match eol */ YY_RULE_SETUP -#line 233 "giscanner/scannerlexer.l" -{ return STRING; } +#line 232 "giscanner/scannerlexer.l" +{ return FLOATING; } YY_BREAK case 142: /* rule 142 can match eol */ YY_RULE_SETUP #line 234 "giscanner/scannerlexer.l" -{ return STRING; } +{ return CHARACTER; } YY_BREAK case 143: +/* rule 143 can match eol */ YY_RULE_SETUP -#line 236 "giscanner/scannerlexer.l" -{ print_error(scanner); } +#line 235 "giscanner/scannerlexer.l" +{ return CHARACTER; } YY_BREAK case 144: +/* rule 144 can match eol */ +YY_RULE_SETUP +#line 237 "giscanner/scannerlexer.l" +{ return STRING; } + YY_BREAK +case 145: +/* rule 145 can match eol */ YY_RULE_SETUP #line 238 "giscanner/scannerlexer.l" +{ return STRING; } + YY_BREAK +case 146: +YY_RULE_SETUP +#line 240 "giscanner/scannerlexer.l" +{ print_error(scanner); } + YY_BREAK +case 147: +YY_RULE_SETUP +#line 242 "giscanner/scannerlexer.l" ECHO; YY_BREAK -#line 2058 "scannerlexer.c" +#line 2087 "scannerlexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2315,7 +2344,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 576 ) + if ( yy_current_state >= 598 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2338,11 +2367,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 576 ) + if ( yy_current_state >= 598 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 575); + yy_is_jam = (yy_current_state == 597); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -2985,7 +3014,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 238 "giscanner/scannerlexer.l" +#line 242 "giscanner/scannerlexer.l" diff --git a/tests/Makefile.in b/tests/Makefile.in index 580e800..439bf4e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -599,7 +599,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -616,7 +616,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -626,7 +626,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ diff --git a/tests/offsets/Makefile.in b/tests/offsets/Makefile.in index 266df42..7eea691 100644 --- a/tests/offsets/Makefile.in +++ b/tests/offsets/Makefile.in @@ -600,7 +600,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -617,7 +617,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -627,7 +627,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ diff --git a/tests/scanner/Makefile.in b/tests/scanner/Makefile.in index d43d2ee..d502c46 100644 --- a/tests/scanner/Makefile.in +++ b/tests/scanner/Makefile.in @@ -702,7 +702,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -716,7 +716,7 @@ INTROSPECTION_SCANNER_ARGS = --verbose -I$(top_srcdir) \ --add-include-path=$(builddir) \ --add-include-path=$(top_builddir) --warn-all INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -726,7 +726,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page similarity index 56% rename from tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page rename to tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page index 6dc17b3..55a4b6d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -1,25 +1,14 @@ - - - - + - Regress.AnAnonymousUnion.None - - - - - - - - - - - + Regress.ANNOTATION_CALCULATED_DEFINE + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 0000000..c8887ff --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE +

Constant to define a calculated large value

+

Since 1.4

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 0000000..08eda31 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV +

Constant to define a calculated large value

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page index e131f6f..f9a50a1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.ATestError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page index 9490e4a..097c37b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AliasedTestBoxed - - - -

Typedef TestBoxed to test caller-allocates correctness

- - - - - - - +

Typedef TestBoxed to test caller-allocates correctness

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page new file mode 100644 index 0000000..bc24e5d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnAnonymousUnion->None + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page new file mode 100644 index 0000000..458ce06 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnAnonymousUnion->x + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page index f9323c6..aa4ed24 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page @@ -1,25 +1,35 @@ - - - + Regress.AnAnonymousUnion - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page index 4e19ef9..7964b3b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page @@ -1,25 +1,14 @@ - - - + Regress.AnnotationBitfield - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page index 9a652d8..d1f7d10 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page @@ -1,25 +1,28 @@ - - - - + + Regress.AnnotationCallback - - - -

This is a callback.

- - - - - - - + +const gint* AnnotationCallback (const gint* in); + +

This is a callback.

+ + + +<code>in</code> +

array of ints

+ + +<code>Returns</code> +

array of ints

+ + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page new file mode 100644 index 0000000..71a9afb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->arr +

an array of length @len

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page new file mode 100644 index 0000000..36204ad --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->field1 +

Some documentation

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page new file mode 100644 index 0000000..e56ec4f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->len +

the length of array

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page index 74c6eab..50f9bc6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page @@ -1,25 +1,35 @@ - - - + Regress.AnnotationFields - - - -

This is a struct for testing field documentation and annotations

- - - - - - - +

This is a struct for testing field documentation and annotations

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page index db77a11..3feafad 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page @@ -1,25 +1,38 @@ - - - - + + Regress.AnnotationForeachFunc - - - - - - - - - - - + +void AnnotationForeachFunc (RegressAnnotationObject* object, + const char* item, + gpointer user_data); + + + + + +<code>object</code> + + + +<code>item</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page index 79844c6..275feff 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page @@ -1,25 +1,28 @@ - - - - + + Regress.AnnotationListCallback - - - -

This is a callback taking a list.

- - - - - - - + +GList* AnnotationListCallback (GList* in); + +

This is a callback taking a list.

+ + + +<code>in</code> +

list of strings

+ + +<code>Returns</code> +

list of strings

+ + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page index 17c8029..e2e5880 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page @@ -1,26 +1,29 @@ - - - - + + Regress.AnnotationNotifyFunc - - - -

This is a callback with a 'closure' argument that is not named + +void AnnotationNotifyFunc (gpointer data); + +

This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated.

- - - - - - - + + + +<code>data</code> +

The user data

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page index 64e30a6..8f63763 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page @@ -6,39 +6,29 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - attribute-signal - Regress.AnnotationObject::attribute-signal - - + gchar* attribute-signal (gchar* arg1, gchar* arg2); - + +

This signal tests a signal with attributes.

- -

This signal tests a signal with attributes.

- - - - <code>arg1</code> -

a value

+

a value

 <code>arg2</code> -

another value

+

another value

 <code>Returns</code> -

the return value

+

the return value

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 48acac5..f42b7d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - doc-empty-arg-parsing - Regress.AnnotationObject::doc-empty-arg-parsing - - + void doc-empty-arg-parsing (gpointer arg1); - + +

This signal tests an empty document argument (arg1)

- -

This signal tests an empty document argument (arg1)

- - - - <code>arg1</code> @@ -34,6 +26,4 @@ void doc-empty-arg-parsing (gpointer arg1); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page index bd640b5..075d072 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - function-property - Regress.AnnotationObject:function-property - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page index 29ad584..2893385 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-signal - Regress.AnnotationObject::list-signal - - + void list-signal (gpointer list); - - - -

This is a signal which takes a list of strings, but it's not + +

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

- - - - + <code>list</code> -

a list of strings

+

a list of strings

 <code>Returns</code> @@ -35,6 +27,4 @@ known by GObject as it's only marked as G_TYPE_POINTER

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page new file mode 100644 index 0000000..97f17cd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationObject->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page index 70b80ae..23ae488 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page @@ -6,22 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-property - Regress.AnnotationObject:string-property - - - -

This is a property which is a string

- - -

Since 1.0

- - - - - +

This is a property which is a string

+

Since 1.0

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page index e25d2bb..88317ee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page @@ -6,29 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-signal - Regress.AnnotationObject::string-signal - - + void string-signal (gpointer string); - - - -

This is a signal which has a broken signal handler, + +

This is a signal which has a broken signal handler, it says it's pointer but it's actually a string.

- - -

Since 1.0

- - +

Since 1.0

<code>string</code> -

a string

+

a string

 <code>Returns</code> @@ -36,6 +27,4 @@ it says it's pointer but it's actually a string.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page index 446729b..d4914db 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -6,23 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - tab-property - Regress.AnnotationObject:tab-property - - - -

This is a property annotation intentionally indented with a mix +

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

- - - - - +

Since 1.2

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page index 1d553fd..8fac991 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,25 +21,18 @@ somearg - regress_annotation_object_allow_none - - + GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, const gchar* somearg); - + + - - - - - - <code>object</code> -

a

+

a GObject.Object

 <code>somearg</code> @@ -48,10 +40,8 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, <code>Returns</code> -

NULL always

+

NULL always

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page index fc1758b..f8b9393 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ toown - regress_annotation_object_calleeowns - - + gint regress_annotation_object_calleeowns (RegressAnnotationObject* object, GObject** toown); - + +

This is a test for out arguments; GObject defaults to transfer

- -

This is a test for out arguments; GObject defaults to transfer

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>toown</code> -

a

+

a GObject.Object

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page index f168030..36d6b60 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,41 +25,32 @@ toown2 - regress_annotation_object_calleesowns - - + gint regress_annotation_object_calleesowns (RegressAnnotationObject* object, GObject** toown1, GObject** toown2); - + +

This is a test for out arguments, one transferred, other not

- -

This is a test for out arguments, one transferred, other not

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>toown1</code> -

a

+

a GObject.Object

 <code>toown2</code> -

a

+

a GObject.Object

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page index eaf0040..38a7d66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ nums - regress_annotation_object_compute_sum - - + void regress_annotation_object_compute_sum (RegressAnnotationObject* object, int* nums); - + +

Test taking a zero-terminated array

- -

Test taking a zero-terminated array

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>nums</code> -

Sequence of numbers

+

Sequence of numbers

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page index 91ebe4b..38c0bcb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,35 +25,28 @@ n_nums - regress_annotation_object_compute_sum_n - - + void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, int* nums, int n_nums); - + +

Test taking an array with length parameter

- -

Test taking an array with length parameter

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>nums</code> -

Sequence of +

Sequence of numbers that are zero-terminated

 <code>n_nums</code> -

Length of number array

+

Length of number array

 <code>Returns</code> @@ -62,6 +54,4 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page index 7f5b0cf..09be2a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,35 +25,28 @@ n_nums - regress_annotation_object_compute_sum_nz - - + void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object, int* nums, int n_nums); - + +

Test taking a zero-terminated array with length parameter

- -

Test taking a zero-terminated array with length parameter

- - - - <code>object</code> -

a

+

a

<code>nums</code> -

Sequence of numbers that +

Sequence of numbers that are zero-terminated

 <code>n_nums</code> -

Length of number array

+

Length of number array

 <code>Returns</code> @@ -62,6 +54,4 @@ are zero-terminated

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page index 6ad744b..e485b87 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ object - regress_annotation_object_create_object - - + GObject* regress_annotation_object_create_object (RegressAnnotationObject* object); - + +

Test returning a caller-owned object

- -

Test returning a caller-owned object

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

The object

+

The object

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page index 4d651ca..a70e335 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ object - regress_annotation_object_do_not_use - - + GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object); - + + - - - - - - <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

NULL always

+

NULL always

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page index 809ebd2..a21e323 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ object - regress_annotation_object_extra_annos - - + void regress_annotation_object_extra_annos (RegressAnnotationObject* object); - + + - - - - - - <code>object</code> @@ -43,6 +35,4 @@ void regress_annotation_object_extra_annos (RegressAnnotationObject* object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page index f74ca97..4dd7967 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,34 +25,27 @@ user_data - regress_annotation_object_foreach - - + void regress_annotation_object_foreach (RegressAnnotationObject* object, RegressAnnotationForeachFunc func, gpointer user_data); - + +

Test taking a call-scoped callback

- -

Test taking a call-scoped callback

- - - - <code>object</code> -

a

+

a

<code>func</code> -

Callback to invoke

+

Callback to invoke

 <code>user_data</code> -

Callback user data

+

Callback user data

 <code>Returns</code> @@ -61,6 +53,4 @@ void regress_annotation_object_foreach (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page index 6cc123b..514b23d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,32 +17,23 @@ object - regress_annotation_object_get_hash - - + GHashTable* regress_annotation_object_get_hash (RegressAnnotationObject* object); - - - -

This is a test for returning a hash table mapping strings to + +

This is a test for returning a hash table mapping strings to objects.

- - - - + <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

hash table

+

hash table

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page index 3021ce5..e01d092 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,33 +17,24 @@ object - regress_annotation_object_get_objects - - + GSList* regress_annotation_object_get_objects (RegressAnnotationObject* object); - - - -

This is a test for returning a list of objects. + +

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

- - - - + <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

list of objects

+

list of objects

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page index 62087b0..739a119 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,32 +17,23 @@ object - regress_annotation_object_get_strings - - + GList* regress_annotation_object_get_strings (RegressAnnotationObject* object); - - - -

This is a test for returning a list of strings, where + +

This is a test for returning a list of strings, where each string needs to be freed.

- - - - + <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

list of strings

+

list of strings

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page index f1696c0..dae414e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ object - regress_annotation_object_hidden_self - - + void regress_annotation_object_hidden_self (gpointer object); - + + - - - - - - <code>object</code> -

A

+

A

<code>Returns</code> @@ -43,6 +35,4 @@ void regress_annotation_object_hidden_self (gpointer object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page index ef1f430..a741e9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ inarg - regress_annotation_object_in - - + gint regress_annotation_object_in (RegressAnnotationObject* object, int* inarg); - + +

This is a test for in arguments

- -

This is a test for in arguments

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>inarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page index 0e95829..b9cbfe8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ inoutarg - regress_annotation_object_inout - - + gint regress_annotation_object_inout (RegressAnnotationObject* object, int* inoutarg); - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page index cae38e5..f4f9638 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ inoutarg - regress_annotation_object_inout2 - - + gint regress_annotation_object_inout2 (RegressAnnotationObject* object, int* inoutarg); - + +

This is a second test for out arguments

- -

This is a second test for out arguments

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page index 8ca35f3..d000434 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ inoutarg - regress_annotation_object_inout3 - - + gint regress_annotation_object_inout3 (RegressAnnotationObject* object, int* inoutarg); - + +

This is a 3th test for out arguments

- -

This is a 3th test for out arguments

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page index 8f0e187..1558a2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ object - regress_annotation_object_method - - + gint regress_annotation_object_method (RegressAnnotationObject* object); - + + - - - - - - <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page index de87deb..7cc6002 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ object - regress_annotation_object_notrans - - + GObject* regress_annotation_object_notrans (RegressAnnotationObject* object); - + + - - - - - - <code>object</code> -

a

+

a GObject.Object

 <code>Returns</code> -

An object, not referenced

+

An object, not referenced

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page index d244433..90f4bcf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ outarg - regress_annotation_object_out - - + gint regress_annotation_object_out (RegressAnnotationObject* object, int* outarg); - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - <code>object</code> -

a

+

a GObject.Object

 <code>outarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page index 80d4339..2851d7e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AnnotationObject - - - -

This is an object used to test annotations.

- - - - +

This is an object used to test annotations.

+ Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page index 2fa9f09..928e980 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,34 +25,27 @@ argv - regress_annotation_object_parse_args - - + void regress_annotation_object_parse_args (RegressAnnotationObject* object, int* argc, char*** argv); - + +

Test taking a zero-terminated array with length parameter

- -

Test taking a zero-terminated array with length parameter

- - - - <code>object</code> -

a

+

a

<code>argc</code> -

Length of the argument vector

+

Length of the argument vector

 <code>argv</code> -

Argument vector

+

Argument vector

 <code>Returns</code> @@ -61,6 +53,4 @@ void regress_annotation_object_parse_args (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page index a52c0ff..dd49cf0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,34 +25,27 @@ length - regress_annotation_object_set_data - - + void regress_annotation_object_set_data (RegressAnnotationObject* object, guchar* data, gsize length); - + +

Test taking a guchar * with a length.

- -

Test taking a guchar * with a length.

- - - - <code>object</code> -

a

+

a

<code>data</code> -

The data

+

The data

 <code>length</code> -

Length of the data

+

Length of the data

 <code>Returns</code> @@ -61,6 +53,4 @@ void regress_annotation_object_set_data (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page index dd72420..345be7f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,34 +25,27 @@ length - regress_annotation_object_set_data2 - - + void regress_annotation_object_set_data2 (RegressAnnotationObject* object, gint8* data, gsize length); - + +

Test taking a gchar * with a length.

- -

Test taking a gchar * with a length.

- - - - <code>object</code> -

a

+

a

<code>data</code> -

The data

+

The data

 <code>length</code> -

Length of the data

+

Length of the data

 <code>Returns</code> @@ -61,6 +53,4 @@ void regress_annotation_object_set_data2 (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page index 86666ef..ce904c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,35 +25,28 @@ length - regress_annotation_object_set_data3 - - + void regress_annotation_object_set_data3 (RegressAnnotationObject* object, guint8* data, gsize length); - - - -

Test taking a gchar * with a length, overriding the array element + +

Test taking a gchar * with a length, overriding the array element type.

- - - - + <code>object</code> -

a

+

a

<code>data</code> -

The data

+

The data

 <code>length</code> -

Length of the data

+

Length of the data

 <code>Returns</code> @@ -62,6 +54,4 @@ type.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page index a70d477..6fec0d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ str_out - regress_annotation_object_string_out - - + gboolean regress_annotation_object_string_out (RegressAnnotationObject* object, char** str_out); - + +

Test returning a string as an out parameter

- -

Test returning a string as an out parameter

- - - - <code>object</code> -

a

+

a

<code>str_out</code> -

string return value

+

string return value

 <code>Returns</code> -

some boolean

+

some boolean

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page index 3228007..4ef5cb7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,25 +21,18 @@ bytes - regress_annotation_object_use_buffer - - + void regress_annotation_object_use_buffer (RegressAnnotationObject* object, guchar* bytes); - + + - - - - - - <code>object</code> -

a

+

a GObject.Object

 <code>bytes</code> @@ -52,6 +44,4 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page index 76402aa..6052118 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -6,13 +6,12 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - void - regress_annotation_object_watch + regress_annotation_object_watch_full RegressAnnotationObject* object @@ -25,36 +24,37 @@ gpointer user_data + + GDestroyNotify + destroy + - - regress_annotation_object_watch - - -void regress_annotation_object_watch (RegressAnnotationObject* object, - RegressAnnotationForeachFunc func, - gpointer user_data); - + regress_annotation_object_watch_full + +void regress_annotation_object_watch_full (RegressAnnotationObject* object, + RegressAnnotationForeachFunc func, + gpointer user_data, + GDestroyNotify destroy); + +

Test overriding via the "Rename To" annotation.

- -

This is here just for the sake of being overriden by its -.

- - - - <code>object</code> -

A

+

A

<code>func</code> -

The callback

+

The callback

 <code>user_data</code> -

The callback data

+

The callback data

+ + +<code>destroy</code> +

Destroy notification

 <code>Returns</code> @@ -62,6 +62,4 @@ void regress_annotation_object_watch (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page deleted file mode 100644 index 1fe2080..0000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - void - - regress_annotation_object_watch_full - - RegressAnnotationObject* - object - - - RegressAnnotationForeachFunc - func - - - gpointer - user_data - - - GDestroyNotify - destroy - - - - - regress_annotation_object_watch_full - - -void regress_annotation_object_watch_full (RegressAnnotationObject* object, - RegressAnnotationForeachFunc func, - gpointer user_data, - GDestroyNotify destroy); - - - -

Test overriding via the "Rename To" annotation.

- - - - - - -<code>object</code> -

A

- - -<code>func</code> -

The callback

- - -<code>user_data</code> -

The callback data

- - -<code>destroy</code> -

Destroy notification

- - -<code>Returns</code> - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page index ef9436e..5b21ead 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ data - regress_annotation_object_with_voidp - - + void regress_annotation_object_with_voidp (RegressAnnotationObject* object, void* data); - + + - - - - - - <code>object</code> @@ -44,7 +36,7 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object, <code>data</code> -

Opaque pointer handle

+

Opaque pointer handle

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page new file mode 100644 index 0000000..2b52122 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationObjectClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page index 28b8a71..faa43dc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.AnnotationObjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page new file mode 100644 index 0000000..f1498fc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationStruct->objects + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page index 341362a..d3af464 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page @@ -1,25 +1,35 @@ - - - + Regress.AnnotationStruct - - - -

This is a test of an array of object in an field of a struct.

- - - - - - - +

This is a test of an array of object in an field of a struct.

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page similarity index 56% rename from tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page rename to tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page index 6dc17b3..e65594f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page @@ -1,25 +1,14 @@ - - - - + - Regress.AnAnonymousUnion.None - - - - - - - - - - - + Regress.BOOL_CONSTANT + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page similarity index 56% rename from tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page rename to tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page index 6dc17b3..bbc2a03 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page @@ -1,25 +1,14 @@ - - - - + - Regress.AnAnonymousUnion.None - - - - - - - - - - - + Regress.DOUBLE_CONSTANT + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 0000000..09b1561 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_DEFINE_SHOULD_BE_EXPOSED + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 0000000..132f508 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_PIE_IS_TASTY + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 0000000..58650ec --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_SUCCESS_INT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page index 39ebf9c..adc4f20 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooASingle - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page index 717b501..98056a5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooAddressType - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page new file mode 100644 index 0000000..b444125 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooBRect->x + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page new file mode 100644 index 0000000..8d7b0f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooBRect->y + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page index 38eae39..854ef78 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ b2 - regress_foo_brect_add - - + void regress_foo_brect_add (RegressFooBRect* b1, RegressFooBRect* b2); - + + - - - - - - <code>b1</code> @@ -52,6 +44,4 @@ void regress_foo_brect_add (RegressFooBRect* b1, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page index 3ca2281..0a7caf0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ y - regress_foo_brect_new - - + RegressFooBRect* regress_foo_brect_new (double x, double y); - + + - - - - - - <code>x</code> @@ -52,6 +44,4 @@ RegressFooBRect* regress_foo_brect_new (double x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page index abd6b03..2f6a48d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page @@ -1,25 +1,35 @@ - - - + Regress.FooBRect - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page new file mode 100644 index 0000000..1c7cead --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooBUnion->rect + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page new file mode 100644 index 0000000..6fdd489 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooBUnion->type + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page new file mode 100644 index 0000000..0a39062 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooBUnion->v + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page index 1ee353f..3ff48f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ bunion - regress_foo_bunion_get_contained_type - - + int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion); - + + - - - - - - <code>bunion</code> @@ -43,6 +35,4 @@ int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page index b760f20..ca979f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_bunion_new - regress_foo_bunion_new - - + RegressFooBUnion* regress_foo_bunion_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressFooBUnion* regress_foo_bunion_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page index 8644d96..2398703 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page @@ -1,25 +1,35 @@ - - - + Regress.FooBUnion - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page index 7483641..b999962 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_foo_boxed_method - - + void regress_foo_boxed_method (RegressFooBoxed* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ void regress_foo_boxed_method (RegressFooBoxed* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page index 3e3e4f9..7a92963 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_boxed_new - regress_foo_boxed_new - - + RegressFooBoxed* regress_foo_boxed_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressFooBoxed* regress_foo_boxed_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page index e711c3e..82b56c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page @@ -1,25 +1,35 @@ - - - + Regress.FooBoxed - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page index 267ddcb..4eb0b4d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooBuffer - - - - - - - - + + Hierarchy @@ -33,8 +25,11 @@ - - + + Constructors + @@ -43,7 +38,7 @@ - Functions + Static Functions Properties @@ -54,8 +49,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page index 6f6469d..594c564 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ buffer - regress_foo_buffer_some_method - - + void regress_foo_buffer_some_method (RegressFooBuffer* buffer); - + + - - - - - - <code>buffer</code> @@ -43,6 +35,4 @@ void regress_foo_buffer_some_method (RegressFooBuffer* buffer); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page new file mode 100644 index 0000000..dd411f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page @@ -0,0 +1,35 @@ + + + + + + Regress.FooBufferClass + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page index 52feda2..67ea939 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page @@ -1,25 +1,38 @@ - - - - + + Regress.FooCallback - - - - - - - - - - - + +gboolean FooCallback (RegressFooObject* regress_foo, + gboolean b, + gpointer data); + + + + + +<code>regress_foo</code> + + + +<code>b</code> + + + +<code>data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page index 8694337..3335ed5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ dbusdata - regress_foo_dbus_data_method - - + void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); - + + - - - - - - <code>dbusdata</code> @@ -43,6 +35,4 @@ void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page index 09050e7..8c8016a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page @@ -1,25 +1,35 @@ - - - + Regress.FooDBusData - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page index 80f6c3b..0427ba6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooEnumFullname - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page index b3c71a6..803a5e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooEnumNoType - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page index 6ecf2dd..43ac529 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page @@ -6,8 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + int @@ -18,20 +17,13 @@ regress_foo_enum - regress_foo_enum_type_method - - + int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); - + + - - - - - - <code>regress_foo_enum</code> @@ -43,6 +35,4 @@ int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page index 6dd3491..52aaf30 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooEnumType - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page index aa0c6c1..96a0003 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page @@ -6,8 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + RegressFooEnumType @@ -18,20 +17,13 @@ x - regress_foo_enum_type_returnv - - + RegressFooEnumType regress_foo_enum_type_returnv (int x); - + + - - - - - - <code>x</code> @@ -43,6 +35,4 @@ RegressFooEnumType regress_foo_enum_type_returnv (int x); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page index 79bb9d2..6848fb2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page index dde46fb..fb8559c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GQuark regress_foo_error_quark - regress_foo_error_quark - - + GQuark regress_foo_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_foo_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page new file mode 100644 index 0000000..aab09bd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEvent->any + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page new file mode 100644 index 0000000..58dc674 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEvent->expose + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page new file mode 100644 index 0000000..d9ea332 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEvent->type + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page index ce36830..98f2344 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page @@ -1,25 +1,35 @@ - - - + Regress.FooEvent - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page new file mode 100644 index 0000000..045be53 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEventAny->send_event + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page index 0e3a555..d98a36d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page @@ -1,25 +1,35 @@ - - - + Regress.FooEventAny - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page new file mode 100644 index 0000000..f9e410c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEventExpose->count + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page new file mode 100644 index 0000000..d06c23a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooEventExpose->send_event + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page index 27c4c4a..e538b2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page @@ -1,25 +1,35 @@ - - - + Regress.FooEventExpose - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page index 53539d4..f45f4bc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page @@ -1,25 +1,14 @@ - - - + Regress.FooFlagsNoType - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page index 2b4afeb..3714e53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page @@ -1,25 +1,14 @@ - - - + Regress.FooFlagsType - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page new file mode 100644 index 0000000..07c098c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooForeignStruct->regress_foo + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page index 217a983..582e019 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ original - regress_foo_foreign_struct_copy - - + RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruct* original); - + + - - - - - - <code>original</code> @@ -43,6 +35,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruc - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page index 7314c1d..5bb3d93 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_foreign_struct_new - regress_foo_foreign_struct_new - - + RegressFooForeignStruct* regress_foo_foreign_struct_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page index ee3e5e7..357ca22 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page @@ -1,25 +1,35 @@ - - - + Regress.FooForeignStruct - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page index b3faca6..61f1681 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooInterface::do_regress_foo - - + void do_regress_foo (RegressFooInterface* self, int x); - + + - - - - - - <code>self</code> @@ -38,6 +30,4 @@ void do_regress_foo (RegressFooInterface* self, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page index 7c44fd4..ef3ca53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ x - regress_foo_interface_do_regress_foo - - + void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, int x); - + + - - - - - - <code>iface</code> @@ -52,6 +44,4 @@ void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page index 7ec29fe..266aac9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page @@ -1,34 +1,29 @@ - - - + Regress.FooInterface - - - - - - - - + + - Hierarchy - - - Regress.FooInterface - - + Prerequisites +

FooInterface requires GObject.Object

+ + + Known Implementations +

FooInterface is implemented by FooBuffer, FooObject and FooSubobject

 - - + + Constructors + @@ -37,7 +32,7 @@ - Functions + Static Functions Properties @@ -48,8 +43,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page index a3ad69a..b6fc598 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ x - regress_foo_interface_static_method - - + void regress_foo_interface_static_method (int x); - + + - - - - - - <code>x</code> @@ -43,6 +35,4 @@ void regress_foo_interface_static_method (int x); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page new file mode 100644 index 0000000..e105b4e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooInterfaceIface->do_regress_foo + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page new file mode 100644 index 0000000..e7a7e3e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooInterfaceIface->parent_iface + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page index 0b90042..3c8b881 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page @@ -1,25 +1,33 @@ - - - - + + Regress.FooInterfaceIface.do_regress_foo - - - - - - - - - - - + +void do_regress_foo (RegressFooInterface* self, + int x); + + + + + +<code>self</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page index 53b09b4..26a98b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page @@ -1,25 +1,35 @@ - - - + Regress.FooInterfaceIface - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page index ccfbcfa..f34361e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hidden - Regress.FooObject:hidden - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page new file mode 100644 index 0000000..d9cf9b8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObject->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page index f99f3c0..e390f39 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page @@ -6,36 +6,28 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooObject::read_fn - - + void read_fn (RegressFooObject* object, int offset, int length); - + +

Read some stuff.

- -

Read some stuff.

- - - - <code>object</code> -

obj

+

obj

 <code>offset</code> -

offset

+

offset

 <code>length</code> -

length

+

length

 <code>Returns</code> @@ -43,6 +35,4 @@ void read_fn (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page index 3a8c131..d718206 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - signal - Regress.FooObject::signal - - + gchar* signal (GObject object, gpointer p0); - + + - - - - - - <code>object</code> @@ -39,6 +31,4 @@ gchar* signal (GObject object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page new file mode 100644 index 0000000..b45dca8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObject->some_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page index b0ed3c7..49bf07c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string - Regress.FooObject:string - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page index 3e3f04e..133178d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooObject::virtual_method - - + gboolean virtual_method (RegressFooObject* object, int first_param); - + + - - - - - - <code>object</code> @@ -38,6 +30,4 @@ gboolean virtual_method (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page index 801f59a..b9f46af 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_foo_object_a_global_method - - + void regress_foo_object_a_global_method (UtilityObject* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_foo_object_a_global_method (UtilityObject* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page index 82bbc26..99efa0f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ x - regress_foo_object_append_new_stack_layer - - + RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObject* obj, int x); - + +

This shouldn't be scanned as a constructor.

- -

This shouldn't be scanned as a constructor.

- - - - <code>obj</code> @@ -52,6 +44,4 @@ RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObje - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page index 6419ed7..e279ca8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ object - regress_foo_object_dup_name - - + char* regress_foo_object_dup_name (RegressFooObject* object); - + + - - - - - - <code>object</code> @@ -43,6 +35,4 @@ char* regress_foo_object_dup_name (RegressFooObject* object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page index 77c8dc8..b3f3a8e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ object - regress_foo_object_external_type - - + UtilityObject* regress_foo_object_external_type (RegressFooObject* object); - + + - - - - - - <code>object</code> -

a

+

a

<code>Returns</code> -

NULL always

+

NULL always

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page index 04c38a2..7e7a809 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,28 +13,19 @@ regress_foo_object_get_default - regress_foo_object_get_default - - + RegressFooObject* regress_foo_object_get_default (void); - - - -

This function is intended to match clutter_stage_get_default which + +

This function is intended to match clutter_stage_get_default which uses a C sugar return type.

- - - - + <code>Returns</code> -

The global

+

The global

- - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page index 68b305b..e5b9827 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ object - regress_foo_object_get_name - - + const char* regress_foo_object_get_name (RegressFooObject* object); - + + - - - - - - <code>object</code> @@ -43,6 +35,4 @@ const char* regress_foo_object_get_name (RegressFooObject* object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page index 0cb58ae..0bfa338 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ glyph - regress_foo_object_handle_glyph - - + void regress_foo_object_handle_glyph (RegressFooObject* object, UtilityGlyph glyph); - + + - - - - - - <code>object</code> @@ -52,6 +44,4 @@ void regress_foo_object_handle_glyph (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page index f643665..fa62ffd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ time - regress_foo_object_is_it_time_yet - - + void regress_foo_object_is_it_time_yet (RegressFooObject* object, time_t time); - + + - - - - - - <code>object</code> @@ -52,6 +44,4 @@ void regress_foo_object_is_it_time_yet (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page index 75b0e07..e5b6329 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_object_new - regress_foo_object_new - - + RegressFooObject* regress_foo_object_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressFooObject* regress_foo_object_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page index 069a421..e733fb8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_object_new_as_super - regress_foo_object_new_as_super - - + GObject* regress_foo_object_new_as_super (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GObject* regress_foo_object_new_as_super (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page index 312e93c..364ad35 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ target - regress_foo_object_new_cookie - - + RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, const char* target); - + +

Not sure why this test is here...

- -

Not sure why this test is here...

- - - - <code>object</code> @@ -52,6 +44,4 @@ RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page index fff026c..0fae891 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObject - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page index d641502..6336041 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,34 +25,27 @@ length - regress_foo_object_read - - + void regress_foo_object_read (RegressFooObject* object, int offset, int length); - + +

Read some stuff.

- -

Read some stuff.

- - - - <code>object</code> -

obj

+

obj

 <code>offset</code> -

offset

+

offset

 <code>length</code> -

length

+

length

 <code>Returns</code> @@ -61,6 +53,4 @@ void regress_foo_object_read (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page index aea1afd..413631f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ object - regress_foo_object_skipped_method - - + void regress_foo_object_skipped_method (RegressFooObject* object); - + +

This is only useful from C.

- -

This is only useful from C.

- - - - <code>object</code> -

obj

+

obj

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_foo_object_skipped_method (RegressFooObject* object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page index 9b157bb..bdd23ba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_object_static_meth - regress_foo_object_static_meth - - + int regress_foo_object_static_meth (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ int regress_foo_object_static_meth (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index 92d7543..b8f88f8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -23,22 +22,15 @@ - regress_foo_object_take_all - - + void regress_foo_object_take_all (RegressFooObject* object, int x, ...); - + + - - - - - - <code>object</code> @@ -58,6 +50,4 @@ void regress_foo_object_take_all (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page index eea3c15..dc00f08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ some_type - regress_foo_object_various - - + void regress_foo_object_various (RegressFooObject* object, void* data, GType some_type); - + + - - - - - - <code>object</code> @@ -61,6 +53,4 @@ void regress_foo_object_various (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page index 3f04cb4..2d4e41c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ first_param - regress_foo_object_virtual_method - - + gboolean regress_foo_object_virtual_method (RegressFooObject* object, int first_param); - + + - - - - - - <code>object</code> @@ -52,6 +44,4 @@ gboolean regress_foo_object_virtual_method (RegressFooObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page new file mode 100644 index 0000000..34d688e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObjectClass->_reserved + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page new file mode 100644 index 0000000..0338849 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObjectClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page new file mode 100644 index 0000000..52ff58a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObjectClass->read_fn + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page new file mode 100644 index 0000000..6edab47 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooObjectClass->virtual_method + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page index 9d52838..ea57e84 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.FooObjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page index 39078bf..05f3ffc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page @@ -1,25 +1,38 @@ - - - - + + Regress.FooObjectClass.read_fn - - - - - - - - - - - + +void read_fn (RegressFooObject* object, + int offset, + int length); + + + + + +<code>object</code> +

obj

+ + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page index 2882c6d..9c05faa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page @@ -1,25 +1,33 @@ - - - - + + Regress.FooObjectClass.virtual_method - - - - - - - - - - - + +gboolean virtual_method (RegressFooObject* object, + int first_param); + + + + + +<code>object</code> + + + +<code>first_param</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page index 44a63ab..fecc554 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObjectCookie - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page index 491d023..b61c3fe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooOtherObject - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page new file mode 100644 index 0000000..7b15b42 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page @@ -0,0 +1,35 @@ + + + + + + Regress.FooOtherObjectClass + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page new file mode 100644 index 0000000..f1da68f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->height + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page new file mode 100644 index 0000000..dd55384 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->width + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page new file mode 100644 index 0000000..2c4377b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->x + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page new file mode 100644 index 0000000..8b4a9a3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->y + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page index 84a46bb..df8fee5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ r2 - regress_foo_rectangle_add - - + void regress_foo_rectangle_add (RegressFooRectangle* r1, const RegressFooRectangle* r2); - + + - - - - - - <code>r1</code> -

add to this rect

+

add to this rect

 <code>r2</code> -

source rectangle

+

source rectangle

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_foo_rectangle_add (RegressFooRectangle* r1, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page index b9f16ea..b296c40 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -30,24 +29,17 @@ height - regress_foo_rectangle_new - - + RegressFooRectangle* regress_foo_rectangle_new (int x, int y, int width, int height); - - - -

This is a C convenience constructor; we have to (skip) + +

This is a C convenience constructor; we have to (skip) it because it's not a boxed type.

- - - - + <code>x</code> @@ -71,6 +63,4 @@ it because it's not a boxed type.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page index d485de0..7562ec6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page @@ -1,25 +1,35 @@ - - - + Regress.FooRectangle - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page index 0d50e70..bc86268 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSkippable - - - -

Some type that is only interesting from C and should not be +

Some type that is only interesting from C and should not be exposed to language bindings.

- - - - - - - + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page index 961d19c..83cae47 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooStackLayer - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page new file mode 100644 index 0000000..655d65d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooStruct->member + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page new file mode 100644 index 0000000..a0d9891 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooStruct->priv + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page index 65b4f26..a0e9b54 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page @@ -1,25 +1,35 @@ - - - + Regress.FooStruct - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page new file mode 100644 index 0000000..6d460be --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page @@ -0,0 +1,35 @@ + + + + + + Regress.FooStructPrivate + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page index 6af09fd..b5a6e78 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - destroy-event - Regress.FooSubInterface::destroy-event - - + void destroy-event (void); - + + - - - - - - <code>Returns</code> @@ -30,6 +22,4 @@ void destroy-event (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page index eb08ec7..04b51de 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page @@ -6,22 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooSubInterface::destroy_event - - + void destroy_event (RegressFooSubInterface* self); - + + - - - - - - <code>self</code> @@ -33,6 +25,4 @@ void destroy_event (RegressFooSubInterface* self); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page index 56bdfed..c268c83 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page @@ -6,22 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooSubInterface::do_bar - - + void do_bar (RegressFooSubInterface* self); - + + - - - - - - <code>self</code> @@ -33,6 +25,4 @@ void do_bar (RegressFooSubInterface* self); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page index ac59643..7324fde 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.FooSubInterface::do_baz - - + void do_baz (RegressFooSubInterface* self, GCallback callback, gpointer user_data); - + + - - - - - - <code>self</code> @@ -43,6 +35,4 @@ void do_baz (RegressFooSubInterface* self, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page index 6d7d970..bb7ec6e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ self - regress_foo_sub_interface_do_bar - - + void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); - + + - - - - - - <code>self</code> @@ -43,6 +35,4 @@ void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page index bab0d68..f4c4d21 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ user_data - regress_foo_sub_interface_do_baz - - + void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, GCallback callback, gpointer user_data); - + + - - - - - - <code>self</code> @@ -61,6 +53,4 @@ void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page index 9b25845..e91decb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page @@ -1,34 +1,29 @@ - - - + Regress.FooSubInterface - - - - - - - - + + - Hierarchy - - - Regress.FooSubInterface - - + Prerequisites +

FooSubInterface requires Regress.FooInterface

+ + + Known Implementations +

None

 - - + + Constructors + @@ -37,7 +32,7 @@ - Functions + Static Functions Properties @@ -48,8 +43,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page new file mode 100644 index 0000000..37a09ba --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubInterfaceIface->destroy_event + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page new file mode 100644 index 0000000..2e00c95 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubInterfaceIface->do_bar + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page new file mode 100644 index 0000000..98644fb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubInterfaceIface->do_baz + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page new file mode 100644 index 0000000..d7626b6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubInterfaceIface->parent_iface + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page index 9513683..416cacf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page @@ -1,25 +1,28 @@ - - - - + + Regress.FooSubInterfaceIface.destroy_event - - - - - - - - - - - + +void destroy_event (RegressFooSubInterface* self); + + + + + +<code>self</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page index ec46cdd..5dd05da 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page @@ -1,25 +1,28 @@ - - - - + + Regress.FooSubInterfaceIface.do_bar - - - - - - - - - - - + +void do_bar (RegressFooSubInterface* self); + + + + + +<code>self</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page index d0f5804..5ad8c56 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page @@ -1,25 +1,38 @@ - - - - + + Regress.FooSubInterfaceIface.do_baz - - - - - - - - - - - + +void do_baz (RegressFooSubInterface* self, + GCallback callback, + gpointer user_data); + + + + + +<code>self</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page index f8643cf..50b4d12 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page @@ -1,25 +1,35 @@ - - - + Regress.FooSubInterfaceIface - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page new file mode 100644 index 0000000..33994c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubobject->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page index c4adff6..6d13005 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_subobject_new - regress_foo_subobject_new - - + RegressFooSubobject* regress_foo_subobject_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressFooSubobject* regress_foo_subobject_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page index 6a70ef7..951f11c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubobject - - - - - - - - + + Hierarchy @@ -33,8 +25,11 @@ - - + + Constructors + @@ -43,7 +38,7 @@ - Functions + Static Functions Properties @@ -54,8 +49,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page new file mode 100644 index 0000000..cf86502 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubobjectClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page index 499599c..426fe2f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.FooSubobjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page new file mode 100644 index 0000000..cc40f8f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->data + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page new file mode 100644 index 0000000..6db4319 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->lines + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page new file mode 100644 index 0000000..c13779f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->x + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page new file mode 100644 index 0000000..df8f251 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->y + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page index 6033817..22f3d64 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page @@ -1,25 +1,35 @@ - - - + Regress.FooThingWithArray - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page new file mode 100644 index 0000000..6c180dd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooUnion->regress_foo + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page index 9746f17..ebb0b1c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page @@ -1,25 +1,35 @@ - - - + Regress.FooUnion - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page new file mode 100644 index 0000000..26d131c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooUtilityStruct->bar + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page index d281ffb..d956c4d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page @@ -1,25 +1,35 @@ - - - + Regress.FooUtilityStruct - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page index a57ea4d..083a99f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page @@ -1,25 +1,33 @@ - - - - + + Regress.FooVarargsCallback - - - - - - - - - - - + +void FooVarargsCallback (const char* param, + ...); + + + + + +<code>param</code> + + + +<code>...</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page index c389ef0..19bee42 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooXEvent - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page new file mode 100644 index 0000000..e9876e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_ELSE + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page new file mode 100644 index 0000000..bfef183 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_IFDEF + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 0000000..8c16dd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 0000000..3b0d6f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANTA + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 0000000..cdce607 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.G_GINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page new file mode 100644 index 0000000..e0512ab --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page index b8710cf..b8324f8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.IntSet - - - -

Compatibility typedef, like telepathy-glib's TpIntSet

- - - - - - - +

Compatibility typedef, like telepathy-glib's TpIntSet

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page b/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page new file mode 100644 index 0000000..69d8300 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page @@ -0,0 +1,35 @@ + + + + + + Regress.Intset +

Like telepathy-glib's TpIntset.

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 0000000..85fe96e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.LONG_STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page new file mode 100644 index 0000000..db51500 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->attributes + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page new file mode 100644 index 0000000..3bfbac1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->dummy + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page new file mode 100644 index 0000000..408ab29 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->dummy2 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 242fad0..33b117c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -1,25 +1,35 @@ - - - + Regress.LikeGnomeKeyringPasswordSchema - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page new file mode 100644 index 0000000..dbc8998 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page @@ -0,0 +1,14 @@ + + + + + + Regress.LikeXklConfigItem->name + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page index 3b14aae..e073de0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page @@ -1,25 +1,35 @@ - - - + Regress.LikeXklConfigItem - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page index 0a4aecb..e5137c4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ name - regress_like_xkl_config_item_set_name - - + void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self, const char* name); - + + - - - - - - <code>self</code> @@ -52,6 +44,4 @@ void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page new file mode 100644 index 0000000..91d7ce5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MAXUINT64 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page new file mode 100644 index 0000000..1531540 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MININT64 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 0000000..29e7314 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,14 @@ + + + + + + Regress.Mixed_Case_Constant + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 0000000..a0aad76 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page index f66aee4..1acd4d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.PtrArrayAlias - - - -

Typedef'd GPtrArray for some reason

- - - - - - - +

Typedef'd GPtrArray for some reason

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 0000000..be1d6e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page new file mode 100644 index 0000000..3b55d6c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page @@ -0,0 +1,14 @@ + + + + + + Regress.SkippedStructure->v + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page new file mode 100644 index 0000000..a7b5ac9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.SkippedStructure->x + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page index ad13eea..1ff59e1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page @@ -1,26 +1,36 @@ - - - + Regress.SkippedStructure - - - -

This should be skipped, and moreover, all function which +

This should be skipped, and moreover, all function which use it should be.

- - - - - - - + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page index 384ffb8..a504645 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestABCError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page index 7ed5152..ab2b773 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GQuark regress_test_abc_error_quark - regress_test_abc_error_quark - - + GQuark regress_test_abc_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_test_abc_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page new file mode 100644 index 0000000..d394f4d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->nested_a + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page new file mode 100644 index 0000000..3084c21 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->priv + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page new file mode 100644 index 0000000..36f6632 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page index 4027391..53d2074 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_test_boxed_copy - - + RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page index 26206b6..0af199b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ other - regress_test_boxed_equals - - + gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, RegressTestBoxed* other); - + + - - - - - - <code>boxed</code> @@ -52,6 +44,4 @@ gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page index 5e05794..f9f57ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_boxed_new - regress_test_boxed_new - - + RegressTestBoxed* regress_test_boxed_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressTestBoxed* regress_test_boxed_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page index 2bc8192..9341856 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ i - regress_test_boxed_new_alternative_constructor1 - - + RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); - + + - - - - - - <code>i</code> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page index e43127e..39ea62b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ j - regress_test_boxed_new_alternative_constructor2 - - + RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, int j); - + + - - - - - - <code>i</code> @@ -52,6 +44,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page index ac75d2c..6cd8084 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ s - regress_test_boxed_new_alternative_constructor3 - - + RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); - + + - - - - - - <code>s</code> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page index d667532..1805f5a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page @@ -1,25 +1,35 @@ - - - + Regress.TestBoxed - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page new file mode 100644 index 0000000..c7666c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page new file mode 100644 index 0000000..a5f4a34 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedB->some_long + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page index df0da11..bc33c57 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_test_boxed_b_copy - - + RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page index 7a0bc2b..f5d2210 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ some_long - regress_test_boxed_b_new - - + RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, glong some_long); - + + - - - - - - <code>some_int8</code> @@ -52,6 +44,4 @@ RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page index 856d7da..fe1a6d6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page @@ -1,25 +1,35 @@ - - - + Regress.TestBoxedB - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page new file mode 100644 index 0000000..a5d7c2b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedC->another_thing + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page new file mode 100644 index 0000000..0f755dd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedC->refcount + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page index 4657b52..4b8e300 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_boxed_c_new - regress_test_boxed_c_new - - + RegressTestBoxedC* regress_test_boxed_c_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressTestBoxedC* regress_test_boxed_c_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page index c890545..aabd9b2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page @@ -1,25 +1,35 @@ - - - + Regress.TestBoxedC - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page index ed99996..ac9e71b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_test_boxed_d_copy - - + RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page index 4622fcd..4aa4e44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_test_boxed_d_free - - + void regress_test_boxed_d_free (RegressTestBoxedD* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ void regress_test_boxed_d_free (RegressTestBoxedD* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page index bbd78ab..dc98da2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_test_boxed_d_get_magic - - + int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page index 5034562..2a5bd4b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ a_int - regress_test_boxed_d_new - - + RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, int a_int); - + + - - - - - - <code>a_string</code> @@ -52,6 +44,4 @@ RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page index b5110c2..c194f35 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page @@ -1,25 +1,35 @@ - - - + Regress.TestBoxedD - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page new file mode 100644 index 0000000..8523949 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page @@ -0,0 +1,35 @@ + + + + + + Regress.TestBoxedPrivate + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page index bed84d5..d75adc9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page @@ -1,25 +1,24 @@ - - - - + + Regress.TestCallback - - - - - - - - - - - + +int TestCallback (void); + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page index 7d3f7b8..ef49dd2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page @@ -1,25 +1,43 @@ - - - - + + Regress.TestCallbackArray - - - - - - - - - - - + +int TestCallbackArray (int* one, + gsize one_length, + utf8* two, + int two_length); + + + + + +<code>one</code> + + + +<code>one_length</code> + + + +<code>two</code> + + + +<code>two_length</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page index 0b8fca1..013755e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page @@ -1,25 +1,38 @@ - - - - + + Regress.TestCallbackFull - - - - - - - - - - - + +int TestCallbackFull (int foo, + double bar, + char* path); + + + + + +<code>foo</code> +

the investment rate

+ + +<code>bar</code> +

how much money

+ + +<code>path</code> +

Path to file

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page index 804382f..e05c876 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestCallbackGError - - - - - - - - - - - + +void TestCallbackGError (const GError* error); + + + + + +<code>error</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page index 06ebb70..b0140ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestCallbackHashtable - - - - - - - - - - - + +void TestCallbackHashtable (GHashTable* data); + + + + + +<code>data</code> +

a hash table; will be modified

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page index 28b21ea..2599a8a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestCallbackOwnedGError - - - - - - - - - - - + +void TestCallbackOwnedGError (GError* error); + + + + + +<code>error</code> +

GError instance; must be freed by the callback

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page index 286c830..c646ae8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestCallbackUserData - - - - - - - - - - - + +int TestCallbackUserData (gpointer user_data); + + + + + +<code>user_data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page index b485450..734dc79 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestDEFError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page index a672d7e..38be2b3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnum - - - -

By purpose, not all members have documentation

- - - - - - - +

By purpose, not all members have documentation

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page index 542ba60..0b2d8f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page @@ -6,8 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + const gchar* @@ -18,20 +17,13 @@ e - regress_test_enum_param - - + const gchar* regress_test_enum_param (RegressTestEnum e); - + + - - - - - - <code>e</code> @@ -43,6 +35,4 @@ const gchar* regress_test_enum_param (RegressTestEnum e); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page index cffae73..1294242 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnumNoGEnum - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page index 81a9aa9..c5e7ccf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnumUnsigned - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page index 97f829b..0b51365 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page index 9140ac5..97774c1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GQuark regress_test_error_quark - regress_test_error_quark - - + GQuark regress_test_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_test_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page new file mode 100644 index 0000000..6514a35 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestExternallyDefinedCallback.page @@ -0,0 +1,33 @@ + + + + + + Regress.TestExternallyDefinedCallback + +void TestExternallyDefinedCallback (RegressTestObj* obj, + int someint); + + + + + +<code>obj</code> + + + +<code>someint</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page index d5bfeeb..54c679a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page @@ -1,25 +1,14 @@ - - - + Regress.TestFlags - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page new file mode 100644 index 0000000..c546875 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFloating->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page index 5f4a3a5..400e34a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_floating_new - regress_test_floating_new - - + RegressTestFloating* regress_test_floating_new (void); - + + - - - - - - <code>Returns</code> -

A new floating

+

A new floating

- - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page index 1189912..3f8b267 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFloating - - - - - - - - + + Hierarchy @@ -33,8 +25,11 @@ - - + + Constructors + @@ -43,7 +38,7 @@ - Functions + Static Functions Properties @@ -54,8 +49,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page new file mode 100644 index 0000000..9196604 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFloatingClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page index e7d5236..234bf1f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestFloatingClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page new file mode 100644 index 0000000..d4435c6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-copy.page @@ -0,0 +1,28 @@ + + + + + + Regress.TestFundamentalObject::copy + +RegressTestFundamentalObject* copy (const RegressTestFundamentalObject* obj); + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page new file mode 100644 index 0000000..060684a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-finalize.page @@ -0,0 +1,28 @@ + + + + + + Regress.TestFundamentalObject::finalize + +void finalize (RegressTestFundamentalObject* obj); + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page new file mode 100644 index 0000000..875ba30 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->flags + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page new file mode 100644 index 0000000..693df03 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page new file mode 100644 index 0000000..3413765 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->refcount + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page index 473f1af..4289f4f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalObject - - - - - - - - + + Hierarchy @@ -27,8 +19,11 @@ - - + + Constructors + @@ -37,7 +32,7 @@ - Functions + Static Functions Properties @@ -48,8 +43,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page index 3e63b1e..fada738 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ fundamental_object - regress_test_fundamental_object_ref - - + RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFundamentalObject* fundamental_object); - + + - - - - - - <code>fundamental_object</code> @@ -39,10 +31,8 @@ RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFu <code>Returns</code> -

A new

+

A new

- - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page index 6f5c16b..726b1d5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ fundamental_object - regress_test_fundamental_object_unref - - + void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundamental_object); - + + - - - - - - <code>fundamental_object</code> @@ -43,6 +35,4 @@ void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundam - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page new file mode 100644 index 0000000..6b5178a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObjectClass->copy + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page new file mode 100644 index 0000000..a7fdff4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObjectClass->finalize + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page new file mode 100644 index 0000000..57e088c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObjectClass->type_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page index 443ce70..38aea87 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestFundamentalObjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page index 73a3328..c6acc8f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestFundamentalObjectCopyFunction - - - - - - - - - - - + +RegressTestFundamentalObject* TestFundamentalObjectCopyFunction (const RegressTestFundamentalObject* obj); + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page index df0e8fb..ee150df 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -1,25 +1,28 @@ - - - - + + Regress.TestFundamentalObjectFinalizeFunction - - - - - - - - - - - + +void TestFundamentalObjectFinalizeFunction (RegressTestFundamentalObject* obj); + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page new file mode 100644 index 0000000..02269eb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalSubObject->data + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page new file mode 100644 index 0000000..27c5cf4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalSubObject->fundamental_object + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page index a449540..13a4127 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -20,20 +19,13 @@ data - regress_test_fundamental_sub_object_new - - + RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const char* data); - + + - - - - - - <code>data</code> @@ -45,6 +37,4 @@ RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page index 6ed3608..d0a09c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalSubObject - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page new file mode 100644 index 0000000..a9faf9a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalSubObjectClass->fundamental_object_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page index 79e14d5..1947fa4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestFundamentalSubObjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page new file mode 100644 index 0000000..2295feb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInheritDrawable->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page index 24bd9c4..7d6bcde 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ x - regress_test_inherit_drawable_do_foo - - + void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, int x); - + + - - - - - - <code>drawable</code> @@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index e90dcd1..1a62b79 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ x - regress_test_inherit_drawable_do_foo_maybe_throw - - + void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable* drawable, int x); - + + - - - - - - <code>drawable</code> @@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawabl - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page index 9ab00c6..7a33019 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ y - regress_test_inherit_drawable_get_origin - - + void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawable, int* x, int* y); - + + - - - - - - <code>drawable</code> @@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawa - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page index c9c778e..2e74a29 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ height - regress_test_inherit_drawable_get_size - - + void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawable, guint* width, guint* height); - + + - - - - - - <code>drawable</code> @@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawabl - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page index 20ef3ff..fae7264 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestInheritDrawable - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page new file mode 100644 index 0000000..b14538c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInheritDrawableClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page index 2579f56..58369c4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestInheritDrawableClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page new file mode 100644 index 0000000..bf056d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInheritPixmapObjectClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page index 3cf69e8..b5e07b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestInheritPixmapObjectClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page index 1c53fd4..19e4521 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page @@ -1,34 +1,29 @@ - - - + Regress.TestInterface - - - - - - - - + + - Hierarchy - - - Regress.TestInterface - - + Prerequisites +

TestInterface requires GObject.Object

+ + + Known Implementations +

None

 - - + + Constructors + @@ -37,7 +32,7 @@ - Functions + Static Functions Properties @@ -48,8 +43,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page new file mode 100644 index 0000000..f9454e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInterfaceIface->base_iface + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page index a643e5d..ced653c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page @@ -1,25 +1,35 @@ - - - + Regress.TestInterfaceIface - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page index 37b5dd3..936be81 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - all - Regress.TestObj::all - - + void all (void); - + + - - - - - - <code>Returns</code> @@ -30,6 +22,4 @@ void all (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page index f3447b5..fa78f22 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.TestObj::allow_none_vfunc - - + void allow_none_vfunc (RegressTestObj* obj, RegressTestObj* two); - + + - - - - - - <code>obj</code> @@ -30,7 +22,7 @@ void allow_none_vfunc (RegressTestObj* obj, <code>two</code> -

Another object

+

Another object

 <code>Returns</code> @@ -38,6 +30,4 @@ void allow_none_vfunc (RegressTestObj* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page index 4873a1c..c4ea79a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - bare - Regress.TestObj:bare - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page index 460104b..61597b9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - boxed - Regress.TestObj:boxed - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page index bef9537..bf23ce2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - cleanup - Regress.TestObj::cleanup - - + void cleanup (void); - + + - - - - - - <code>Returns</code> @@ -30,6 +22,4 @@ void cleanup (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page new file mode 100644 index 0000000..50b9b0f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-complex_vfunc.page @@ -0,0 +1,33 @@ + + + + + + Regress.TestObj::complex_vfunc + +void complex_vfunc (RegressTestObj* obj, + int someint); + + + + + +<code>obj</code> + + + +<code>someint</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page index bb907ab..0115614 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - double - Regress.TestObj:double - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page index 5600be6..e9e31d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - first - Regress.TestObj::first - - + void first (void); - + + - - - - - - <code>Returns</code> @@ -30,6 +22,4 @@ void first (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page index a981cf8..64ad436 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - float - Regress.TestObj:float - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page new file mode 100644 index 0000000..dca9a51 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-function_ptr.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->function_ptr + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page index 2fbf9d9..2b8adb7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - gtype - Regress.TestObj:gtype - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page index 003425b..46c5046 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table-old - Regress.TestObj:hash-table-old - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page index f11e465..c90c44d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table - Regress.TestObj:hash-table - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page new file mode 100644 index 0000000..40653a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->hash_table + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page index 95a4902..3ba1d11 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - int - Regress.TestObj:int - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page index 680636d..29708fe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-old - Regress.TestObj:list-old - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page index 7ea5130..4e1abc8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list - Regress.TestObj:list - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page index 4320365..7fb7eca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page @@ -6,33 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Regress.TestObj::matrix - - + int matrix (RegressTestObj* obj, const char* somestr); - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>obj</code> -

A

+

A

<code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -40,6 +32,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page new file mode 100644 index 0000000..52b356b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page index 9ec983b..dcb254b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -6,32 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-len-prop - Regress.TestObj::sig-with-array-len-prop - - + void sig-with-array-len-prop (guint* arr, gint len); - + +

This test signal similar to GSettings::change-event

- -

This test signal similar to GSettings::change-event

- - - - <code>arr</code> -

numbers, or NULL

+

numbers, or NULL

 <code>len</code> -

length of arr, or 0

+

length of arr, or 0

 <code>Returns</code> @@ -39,6 +31,4 @@ void sig-with-array-len-prop (guint* arr, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page index 05b911c..190a191 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-prop - Regress.TestObj::sig-with-array-prop - - + void sig-with-array-prop (guint* arr); - - - -

This test signal is like TelepathyGlib's + +

This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed:

- - - - + <code>arr</code> -

numbers

+

numbers

 <code>Returns</code> @@ -35,6 +27,4 @@ void sig-with-array-prop (guint* arr); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page index c2cb882..cf6147f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-foreign-struct - Regress.TestObj::sig-with-foreign-struct - - + void sig-with-foreign-struct (cairo_t cr); - + + - - - - - - <code>cr</code> -

A cairo context.

+

A cairo context.

 <code>Returns</code> @@ -34,6 +26,4 @@ void sig-with-foreign-struct (cairo_t cr); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page index 9ddd536..c3cce66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-hash-prop - Regress.TestObj::sig-with-hash-prop - - + void sig-with-hash-prop (<map> hash); - - - -

This test signal is like TelepathyGlib's + +

This test signal is like TelepathyGlib's TpAccount::status-changed

- - - - + <code>hash</code> @@ -35,6 +27,4 @@ void sig-with-hash-prop (<map> hash); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page index d8a9037..900d7ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-int64-prop - Regress.TestObj::sig-with-int64-prop - - + gint64 sig-with-int64-prop (gint64 i); - - - -

You can use this with regress_test_obj_emit_sig_with_int64, or raise from + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage.

- - - - + <code>i</code> -

an integer

+

an integer

 <code>Returns</code> @@ -35,6 +27,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page index 7f041e2..b9be7d5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-intarray-ret - Regress.TestObj::sig-with-intarray-ret - - + None sig-with-intarray-ret (gint i); - + + - - - - - - <code>i</code> -

an integer

+

an integer

 <code>Returns</code> @@ -34,6 +26,4 @@ None sig-with-intarray-ret (gint i); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page index 9d69a6f..d8e9d5f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-obj - Regress.TestObj::sig-with-obj - - + void sig-with-obj (GObject obj); - - - -

Test transfer none GObject as a param (tests refcounting). + +

Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj

- - - - + <code>obj</code> -

A newly created RegressTestObj

+

A newly created RegressTestObj

 <code>Returns</code> @@ -35,6 +27,4 @@ Use with regress_test_obj_emit_sig_with_obj

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page index 919d38f..f2b2911 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-strv - Regress.TestObj::sig-with-strv - - + void sig-with-strv (utf8* strs); - + +

Test GStrv as a param.

- -

Test GStrv as a param.

- - - - <code>strs</code> -

strings

+

strings

 <code>Returns</code> @@ -34,6 +26,4 @@ void sig-with-strv (utf8* strs); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page index 6ee6bda..3bb5b5e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-uint64-prop - Regress.TestObj::sig-with-uint64-prop - - + guint64 sig-with-uint64-prop (guint64 i); - - - -

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage.

- - - - + <code>i</code> -

an integer

+

an integer

 <code>Returns</code> @@ -35,6 +27,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page new file mode 100644 index 0000000..ffd77f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_double + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page new file mode 100644 index 0000000..0c22a20 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_float + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page new file mode 100644 index 0000000..8836889 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page index 1ae4803..d548cb9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string - Regress.TestObj:string - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page index 1ffe66e..f4bf0ab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test-with-static-scope-arg - Regress.TestObj::test-with-static-scope-arg - - + void test-with-static-scope-arg (RegressTestSimpleBoxedA object); - + + - - - - - - <code>object</code> @@ -34,6 +26,4 @@ void test-with-static-scope-arg (RegressTestSimpleBoxedA object); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page index 15599c6..5ac080e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test - Regress.TestObj::test - - + void test (void); - + + - - - - - - <code>Returns</code> @@ -30,6 +22,4 @@ void test (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page index 8efd161..bf3b58a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_constructor - regress_constructor - - + RegressTestObj* regress_constructor (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressTestObj* regress_constructor (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page index bc4e762..da367ee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ somestr - regress_test_obj_do_matrix - - + int regress_test_obj_do_matrix (RegressTestObj* obj, const char* somestr); - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>obj</code> -

A

+

A

<code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -54,6 +46,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 1ba8436..38fa185 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_obj_emit_sig_with_foreign_struct - - + void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page index 24f5826..97e1c9f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_obj_emit_sig_with_int64 - - + void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page index e0d123e..195f4a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_obj_emit_sig_with_obj - - + void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page index 0c2c68c..b5ed20d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_obj_emit_sig_with_uint64 - - + void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page index 92bfa2d..3c59d28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ obj - regress_forced_method - - + void regress_forced_method (RegressTestObj* obj); - + + - - - - - - <code>obj</code> -

A

+

A

<code>Returns</code> @@ -43,6 +35,4 @@ void regress_forced_method (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page new file mode 100644 index 0000000..3456540 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.function_ptr.page @@ -0,0 +1,24 @@ + + + + + + Regress.TestObj.function_ptr + +void function_ptr (void); + + + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page index 7469238..673e7e0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_obj_instance_method - - + int regress_test_obj_instance_method (RegressTestObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ int regress_test_obj_instance_method (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page index 668096a..ecf8e54 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ callback - regress_test_obj_instance_method_callback - - + void regress_test_obj_instance_method_callback (RegressTestObj* obj, RegressTestCallback callback); - + + - - - - - - <code>obj</code> @@ -52,6 +44,4 @@ void regress_test_obj_instance_method_callback (RegressTestObj* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page index e931f7d..1144f60 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ obj - regress_test_obj_new - - + RegressTestObj* regress_test_obj_new (RegressTestObj* obj); - + + - - - - - - <code>obj</code> -

A

+

A

<code>Returns</code> @@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page index d2ec5f6..0fdb54c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ notify - regress_test_obj_new_callback - - + RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); - + + - - - - - - <code>callback</code> @@ -61,6 +53,4 @@ RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callb - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page index a77e915..21dc2b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ x - regress_test_obj_new_from_file - - + RegressTestObj* regress_test_obj_new_from_file (const char* x); - + + - - - - - - <code>x</code> @@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new_from_file (const char* x); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page index c86b4b2..c79e304 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ obj - regress_test_obj_null_out - - + void regress_test_obj_null_out (RegressTestObj** obj); - + + - - - - - - <code>obj</code> -

A

+

A

<code>Returns</code> @@ -43,6 +35,4 @@ void regress_test_obj_null_out (RegressTestObj** obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page index 42f26db..8950858 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page index 160b8d2..cfcdd65 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ bare - regress_test_obj_set_bare - - + void regress_test_obj_set_bare (RegressTestObj* obj, GObject* bare); - + + - - - - - - <code>obj</code> @@ -52,6 +44,4 @@ void regress_test_obj_set_bare (RegressTestObj* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page index 333d170..b8d64c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,11 +45,9 @@ num2 - regress_test_obj_skip_inout_param - - + gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>obj</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> -

TRUE if the call succeeds, FALSE if @error is set.

+

TRUE if the call succeeds, FALSE if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page index 1df6c18..fc4cdd5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,11 +45,9 @@ num2 - regress_test_obj_skip_out_param - - + gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>obj</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> -

TRUE if the call succeeds, FALSE if @error is set.

+

TRUE if the call succeeds, FALSE if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page index deca81b..a9a3448 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,11 +45,9 @@ num2 - regress_test_obj_skip_param - - + gboolean regress_test_obj_skip_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); - + +

Check that a parameter is skipped

- -

Check that a parameter is skipped

- - - - <code>obj</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> -

TRUE if the call succeeds, FALSE if @error is set.

+

TRUE if the call succeeds, FALSE if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page index 47402c9..6f69b9b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,11 +45,9 @@ num2 - regress_test_obj_skip_return_val - - + gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); - + +

Check that the return value is skipped

- -

Check that the return value is skipped

- - - - <code>obj</code> -

a

+

a

<code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

A return value.

+

A return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> -

TRUE if the call succeeds, FALSE if @error is set.

+

TRUE if the call succeeds, FALSE if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page index b590de2..2961ec8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,37 +21,28 @@ a - regress_test_obj_skip_return_val_no_out - - + gboolean regress_test_obj_skip_return_val_no_out (RegressTestObj* obj, gint a); - - - -

Check that the return value is skipped. Succeed if a is nonzero, otherwise + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.

- - - - + <code>obj</code> -

a

+

a

<code>a</code> -

Parameter.

+

Parameter.

 <code>Returns</code> -

TRUE if the call succeeds, FALSE if @error is set.

+

TRUE if the call succeeds, FALSE if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page index 8e5c9b1..0f7a2bf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ x - regress_test_obj_static_method - - + double regress_test_obj_static_method (int x); - + + - - - - - - <code>x</code> @@ -43,6 +35,4 @@ double regress_test_obj_static_method (int x); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page index 8058ac0..d9a2bea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_obj_static_method_callback - - + void regress_test_obj_static_method_callback (RegressTestCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_obj_static_method_callback (RegressTestCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page index 3e2fb61..61ae71c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -42,11 +41,9 @@ m - regress_test_obj_torture_signature_0 - - + void regress_test_obj_torture_signature_0 (RegressTestObj* obj, int x, double* y, @@ -54,18 +51,13 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj, const char* foo, int* q, guint m); - + + - - - - - - <code>obj</code> -

A

+

A

<code>x</code> @@ -97,6 +89,4 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page index 37e1ad2..c3d85fa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -42,11 +41,9 @@ m - regress_test_obj_torture_signature_1 - - + gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, int x, double* y, @@ -54,18 +51,13 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, const char* foo, int* q, guint m); - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>obj</code> -

A

+

A

<code>x</code> @@ -97,6 +89,4 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page new file mode 100644 index 0000000..724610e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->_regress_reserved1 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page new file mode 100644 index 0000000..b865102 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->_regress_reserved2 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page new file mode 100644 index 0000000..5f5d375 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->allow_none_vfunc + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page new file mode 100644 index 0000000..d658928 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-complex_vfunc.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->complex_vfunc + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page new file mode 100644 index 0000000..d50f3d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->matrix + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page new file mode 100644 index 0000000..905a767 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page new file mode 100644 index 0000000..c8da9dc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->test_signal + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page new file mode 100644 index 0000000..fdbc6a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObjClass->test_signal_with_static_scope_arg + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page index 3aec143..466f846 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page @@ -1,25 +1,24 @@ - - - - + + Regress.TestObjClass._regress_reserved1 - - - - - - - - - - - + +void _regress_reserved1 (void); + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page index 8bfc4d1..9b6aa75 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page @@ -1,25 +1,24 @@ - - - - + + Regress.TestObjClass._regress_reserved2 - - - - - - - - - - - + +void _regress_reserved2 (void); + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page index b45f05d..e93242a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page @@ -1,25 +1,33 @@ - - - - + + Regress.TestObjClass.allow_none_vfunc - - - - - - - - - - - + +void allow_none_vfunc (RegressTestObj* obj, + RegressTestObj* two); + + + + + +<code>obj</code> + + + +<code>two</code> +

Another object

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page index 312b198..4f4b0a8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page @@ -1,25 +1,33 @@ - - - - + + Regress.TestObjClass.matrix - - - - - - - - - - - + +int matrix (RegressTestObj* obj, + const char* somestr); + + + + + +<code>obj</code> +

A

+ + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page index 86db748..5a6da18 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestObjClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page index 7d2d53b..98eba50 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestOtherError - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page index 4ed8d53..9bb6a28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GQuark regress_test_unconventional_error_quark - regress_test_unconventional_error_quark - - + GQuark regress_test_unconventional_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_test_unconventional_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page index 66b477d..e37674e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page @@ -1,25 +1,14 @@ - - - + Regress.TestPrivateEnum - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page new file mode 100644 index 0000000..843ed30 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestPrivateStruct->this_is_public_after + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page new file mode 100644 index 0000000..84a6eca --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestPrivateStruct->this_is_public_before + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page index 5d55c80..c8eea18 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page @@ -1,25 +1,35 @@ - - - + Regress.TestPrivateStruct - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page index 44c3cad..85923d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestReferenceEnum - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page new file mode 100644 index 0000000..61e4303 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_double + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page new file mode 100644 index 0000000..c31c20d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_enum + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page new file mode 100644 index 0000000..aad211d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page new file mode 100644 index 0000000..349c0af --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page index 628186a..4910e4d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_simple_boxed_a_const_return - regress_test_simple_boxed_a_const_return - - + const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page index 4e7cf0e..e711958 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ a - regress_test_simple_boxed_a_copy - - + RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxedA* a); - + + - - - - - - <code>a</code> @@ -43,6 +35,4 @@ RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxe - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page index 5e5dcbd..43f8cba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ other_a - regress_test_simple_boxed_a_equals - - + gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, RegressTestSimpleBoxedA* other_a); - + + - - - - - - <code>a</code> @@ -52,6 +44,4 @@ gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page index 08f968f..54570ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page @@ -1,25 +1,35 @@ - - - + Regress.TestSimpleBoxedA - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page new file mode 100644 index 0000000..6014279 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedB->nested_a + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page new file mode 100644 index 0000000..8c8b86d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page index fd59315..3664cda 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ b - regress_test_simple_boxed_b_copy - - + RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxedB* b); - + + - - - - - - <code>b</code> @@ -43,6 +35,4 @@ RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxe - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page index 2ed2304..170c176 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page @@ -1,25 +1,35 @@ - - - + Regress.TestSimpleBoxedB - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page index f815782..322d497 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page @@ -1,25 +1,24 @@ - - - - + + Regress.TestSimpleCallback - - - - - - - - - - - + +void TestSimpleCallback (void); + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page new file mode 100644 index 0000000..6cc6110 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_double + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page new file mode 100644 index 0000000..1fc8f31 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_enum + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page new file mode 100644 index 0000000..b3e1d84 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page new file mode 100644 index 0000000..cdfd2a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page index 9b4d353..e928083 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ a_out - regress_test_struct_a_clone - - + void regress_test_struct_a_clone (RegressTestStructA* a, RegressTestStructA* a_out); - + +

Make a copy of a RegressTestStructA

- -

Make a copy of a RegressTestStructA

- - - - <code>a</code> -

the structure

+

the structure

 <code>a_out</code> -

the cloned structure

+

the cloned structure

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_struct_a_clone (RegressTestStructA* a, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page index 22a1e90..b7f81f3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructA - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page index befbd7c..4ac3686 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ string - regress_test_struct_a_parse - - + void regress_test_struct_a_parse (RegressTestStructA* a_out, const gchar* string); - + + - - - - - - <code>a_out</code> -

the structure that is to be filled

+

the structure that is to be filled

 <code>string</code> -

ignored

+

ignored

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_struct_a_parse (RegressTestStructA* a_out, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page new file mode 100644 index 0000000..5864588 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructB->nested_a + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page new file mode 100644 index 0000000..d7e90d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page index b3a9f99..c87287e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ b_out - regress_test_struct_b_clone - - + void regress_test_struct_b_clone (RegressTestStructB* b, RegressTestStructB* b_out); - + +

Make a copy of a RegressTestStructB

- -

Make a copy of a RegressTestStructB

- - - - <code>b</code> -

the structure

+

the structure

 <code>b_out</code> -

the cloned structure

+

the cloned structure

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_struct_b_clone (RegressTestStructB* b, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page index 4ed2b54..36e2629 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructB - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page new file mode 100644 index 0000000..9d3e222 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructC->another_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page new file mode 100644 index 0000000..ecf3c25 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructC->obj + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page index f208fcd..c14639e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructC - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page new file mode 100644 index 0000000..6e8cf23 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->array1 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page new file mode 100644 index 0000000..93995fe --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->array2 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page new file mode 100644 index 0000000..e46d5da --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->field + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page new file mode 100644 index 0000000..39adf11 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->garray + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page new file mode 100644 index 0000000..2601051 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->list + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page index f791d70..0195113 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructD - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page new file mode 100644 index 0000000..ea61037 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructE->some_type + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page new file mode 100644 index 0000000..fda8d2a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructE->some_union + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page index ccc8bbd..0520f3c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructE - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page new file mode 100644 index 0000000..d80e779 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_double + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page new file mode 100644 index 0000000..30d6126 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_float + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page new file mode 100644 index 0000000..487a6c5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page new file mode 100644 index 0000000..fbe75bf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_int64 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page new file mode 100644 index 0000000..a909fa8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_long + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page new file mode 100644 index 0000000..8dca96c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_pointer + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page new file mode 100644 index 0000000..61d30a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_uint + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page new file mode 100644 index 0000000..360e1e9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_uint64 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page new file mode 100644 index 0000000..117b95f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_ulong + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page index 3b81e62..e9b94f4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructE__some_union__union - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page new file mode 100644 index 0000000..5d424ad --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data1 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page new file mode 100644 index 0000000..b03800e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data2 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page new file mode 100644 index 0000000..e25e712 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data3 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page new file mode 100644 index 0000000..ceedf9d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data4 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page new file mode 100644 index 0000000..d239488 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data5 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page new file mode 100644 index 0000000..09d7215 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data6 + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page new file mode 100644 index 0000000..98fad0b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->ref_count + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page index 74e8483..860d608 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructF - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page new file mode 100644 index 0000000..fb214ce --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructFixedArray->array + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page new file mode 100644 index 0000000..0c8a594 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructFixedArray->just_int + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page index 7d5ed65..ad52571 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ str - regress_test_struct_fixed_array_frob - - + void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); - + + - - - - - - <code>str</code> @@ -43,6 +35,4 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page index f33eed9..6b6ea3a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page @@ -1,25 +1,35 @@ - - - + Regress.TestStructFixedArray - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page new file mode 100644 index 0000000..15b87da --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSubObj->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page index fa401f5..3a16280 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_sub_obj_instance_method - - + int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page index fbff9d9..ffada79 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_sub_obj_new - regress_test_sub_obj_new - - + RegressTestObj* regress_test_sub_obj_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressTestObj* regress_test_sub_obj_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page index 7c6cb98..240e155 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestSubObj - - - - - - - - + + Hierarchy @@ -33,8 +25,11 @@ - - + + Constructors + @@ -43,7 +38,7 @@ - Functions + Static Functions Properties @@ -54,8 +49,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page index 5497c25..c33ed67 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_sub_obj_unset_bare - - + void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page new file mode 100644 index 0000000..618b8f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSubObjClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page index 8954334..ab00f64 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestSubObjClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page index e0a7bc0..fcb2f3b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestTypeGUInt64 - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page new file mode 100644 index 0000000..7bdb8c1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestWi8021x->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page index 47ad7be..ab6862c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - testbool - Regress.TestWi8021x:testbool - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page index 9153172..208e214 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ obj - regress_test_wi_802_1x_get_testbool - - + gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); - + + - - - - - - <code>obj</code> @@ -43,6 +35,4 @@ gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page index 7afe8b1..e136adc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_wi_802_1x_new - regress_test_wi_802_1x_new - - + RegressTestWi8021x* regress_test_wi_802_1x_new (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ RegressTestWi8021x* regress_test_wi_802_1x_new (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page index 2965873..8346e89 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestWi8021x - - - - - - - - + + Hierarchy @@ -30,8 +22,11 @@ - - + + Constructors + @@ -40,7 +35,7 @@ - Functions + Static Functions Properties @@ -51,8 +46,10 @@ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page index bad3b1d..170fd5c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ v - regress_test_wi_802_1x_set_testbool - - + void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, gboolean v); - + + - - - - - - <code>obj</code> @@ -52,6 +44,4 @@ void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page index c0e98df..ef11560 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ x - regress_test_wi_802_1x_static_method - - + int regress_test_wi_802_1x_static_method (int x); - + + - - - - - - <code>x</code> @@ -43,6 +35,4 @@ int regress_test_wi_802_1x_static_method (int x); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page new file mode 100644 index 0000000..f3dba05 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestWi8021xClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page index 5959303..5fe3d2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page @@ -1,25 +1,35 @@ - - - + Regress.TestWi8021xClass - - - - - - - - - - - + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 0000000..343ad00 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.UTF8_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page index 6b7d031..7df012a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.VaListAlias - - - -

Typedef'd va_list for additional reasons

- - - - - - - +

Typedef'd va_list for additional reasons

+ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page index 769da09..6e4065a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ boxed - regress_aliased_caller_alloc - - + void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); - + + - - - - - - <code>boxed</code> @@ -43,6 +35,4 @@ void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page index dbf8b82..f57817b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ data - regress_annotation_attribute_func - - + gint regress_annotation_attribute_func (RegressAnnotationObject* object, const gchar* data); - + + - - - - - - <code>object</code> -

A .

+

A .

 <code>data</code> -

Some data.

+

Some data.

 <code>Returns</code> -

The return value.

+

The return value.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 2a474a5..72f910a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,27 +25,20 @@ data - regress_annotation_custom_destroy - - + void regress_annotation_custom_destroy (RegressAnnotationCallback callback, RegressAnnotationNotifyFunc destroy, gpointer data); - - - -

Test messing up the heuristic of closure/destroy-notification + +

Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations.

- - - - + <code>callback</code> -

Destroy notification

+

Destroy notification

 <code>destroy</code> @@ -62,6 +54,4 @@ detection, and fixing it via annotations.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page index a76bade..c05e678 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_annotation_get_source_file - regress_annotation_get_source_file - - + char* regress_annotation_get_source_file (void); - + + - - - - - - <code>Returns</code> -

Source file

+

Source file

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page index d2f479a..7e14343 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ argv - regress_annotation_init - - + void regress_annotation_init (int* argc, char*** argv); - + + - - - - - - <code>argc</code> -

The number of args.

+

The number of args.

 <code>argv</code> -

The arguments.

+

The arguments.

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_annotation_init (int* argc, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page index e0399cd..acec228 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ foo - regress_annotation_invalid_regress_annotation - - + void regress_annotation_invalid_regress_annotation (int foo); - + + - - - - - - <code>foo</code> -

some text (e.g. example) or else

+

some text (e.g. example) or else

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_annotation_invalid_regress_annotation (int foo); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page index 3b83de9..e88f535 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ array - regress_annotation_ptr_array - - + void regress_annotation_ptr_array (GValue* array); - + + - - - - - - <code>array</code> -

the array

+

the array

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_annotation_ptr_array (GValue* array); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page index d13fee5..1048c61 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ length - regress_annotation_return_array - - + char** regress_annotation_return_array (int* length); - + + - - - - - - <code>length</code> -

Number of return values

+

Number of return values

 <code>Returns</code> -

The return value

+

The return value

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page index 2e48458..0afdf09 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_annotation_return_filename - regress_annotation_return_filename - - + gchar* regress_annotation_return_filename (void); - + + - - - - - - <code>Returns</code> -

An annotated filename

+

An annotated filename

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page index 84c616f..2f7fb86 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ fname - regress_annotation_set_source_file - - + void regress_annotation_set_source_file (char* fname); - + + - - - - - - <code>fname</code> -

Source file

+

Source file

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_annotation_set_source_file (char* fname); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page index 39cd529..1453f0e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_annotation_space_after_comment_bug631690 - regress_annotation_space_after_comment_bug631690 - - + void regress_annotation_space_after_comment_bug631690 (void); - + +

Explicitly test having a space after the ** here.

- -

Explicitly test having a space after the ** here.

- - - - <code>Returns</code> @@ -35,6 +27,4 @@ void regress_annotation_space_after_comment_bug631690 (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page index 5d3813d..d37326c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ properties - regress_annotation_string_array_length - - + void regress_annotation_string_array_length (guint n_properties, utf8* properties); - + + - - - - - - <code>n_properties</code> @@ -52,6 +44,4 @@ void regress_annotation_string_array_length (guint n_properties, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page index 8c68554..48c812e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_annotation_string_zero_terminated - regress_annotation_string_zero_terminated - - + char** regress_annotation_string_zero_terminated (void); - + + - - - - - - <code>Returns</code> -

The return value

+

The return value

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page index 13eb1ca..ac9964d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ out - regress_annotation_string_zero_terminated_out - - + void regress_annotation_string_zero_terminated_out (char*** out); - + + - - - - - - <code>out</code> @@ -43,6 +35,4 @@ void regress_annotation_string_zero_terminated_out (char*** out); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page index 6fc0ad4..b9dba0a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_annotation_test_parsing_bug630862 - regress_annotation_test_parsing_bug630862 - - + GObject* regress_annotation_test_parsing_bug630862 (void); - + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- -

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- - - - <code>Returns</code> -

An object, note the colon:in here

+

An object, note the colon:in here

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page index 4db50ca..78684c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_annotation_transfer_floating - regress_annotation_transfer_floating - - + GObject* regress_annotation_transfer_floating (void); - + + - - - - - - <code>Returns</code> -

A floating object

+

A floating object

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page index f12a3cf..2d36790 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,21 +13,13 @@ regress_annotation_versioned - regress_annotation_versioned - - + void regress_annotation_versioned (void); - + - - - - -

Since 0.6

- - +

Since 0.6

<code>Returns</code> @@ -36,6 +27,4 @@ void regress_annotation_versioned (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page index 75bc68c..6d9968b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_atest_error_quark - regress_atest_error_quark - - + GQuark regress_atest_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_atest_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page index eadb613..f667df6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ user_data - regress_foo_async_ready_callback - - + void regress_foo_async_ready_callback (GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data); - + + - - - - - - <code>cancellable</code> @@ -61,6 +53,4 @@ void regress_foo_async_ready_callback (GCancellable* cancellable, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page index b37a287..58a7e41 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ destroy - regress_foo_destroy_notify_callback - - + void regress_foo_destroy_notify_callback (RegressFooCallback callback, gpointer data, GDestroyNotify destroy); - + + - - - - - - <code>callback</code> @@ -61,6 +53,4 @@ void regress_foo_destroy_notify_callback (RegressFooCallback callback, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page index f035be5..e627759 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_init - regress_foo_init - - + gint regress_foo_init (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ gint regress_foo_init (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page index 5eef0df..2a77e2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -30,23 +29,16 @@ s - regress_foo_method_external_references - - + void regress_foo_method_external_references (UtilityObject* object, UtilityEnumType e, UtilityFlagType f, UtilityStruct s); - + + - - - - - - <code>object</code> @@ -70,6 +62,4 @@ void regress_foo_method_external_references (UtilityObject* object, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page index 63d5766..01bbafe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,21 +13,14 @@ regress_foo_not_a_constructor_new - regress_foo_not_a_constructor_new - - + RegressFooObject* regress_foo_not_a_constructor_new (void); - - - -

This should be scanned as a top-level function, and shouldn't cause + +

This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning.

- - - - + <code>Returns</code> @@ -36,6 +28,4 @@ a "Can't find matching type for constructor" warning.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page index 96773b3..df4d2e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,25 +17,18 @@ fs - regress_foo_skip_me - - + void regress_foo_skip_me (RegressFooSkippable fs); - - - -

Does something that's only interesting from C and should not be + +

Does something that's only interesting from C and should not be exposed to language bindings.

- - - - + <code>fs</code> -

a

+

a

<code>Returns</code> @@ -44,6 +36,4 @@ exposed to language bindings.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page index 41e570f..ca7cd1e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ args - regress_foo_some_variant - - + void regress_foo_some_variant (guint x, va_list args); - + + - - - - - - <code>x</code> @@ -52,6 +44,4 @@ void regress_foo_some_variant (guint x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page index 81483f1..a292f00 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ args - regress_foo_some_variant_ptr - - + void regress_foo_some_variant_ptr (guint x, va_list* args); - + + - - - - - - <code>x</code> @@ -52,6 +44,4 @@ void regress_foo_some_variant_ptr (guint x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page index 810eba9..d04ec86 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_test_array - regress_foo_test_array - - + GArray* regress_foo_test_array (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GArray* regress_foo_test_array (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page index 57ca7b3..9368b46 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ param - regress_foo_test_const_char_param - - + void regress_foo_test_const_char_param (const char* param); - + + - - - - - - <code>param</code> @@ -43,6 +35,4 @@ void regress_foo_test_const_char_param (const char* param); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page index 839bee2..bc5b9b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_test_const_char_retval - regress_foo_test_const_char_retval - - + const char* regress_foo_test_const_char_retval (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const char* regress_foo_test_const_char_retval (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page index 00a1e07..414a286 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ param - regress_foo_test_const_struct_param - - + void regress_foo_test_const_struct_param (const RegressFooStruct* param); - + + - - - - - - <code>param</code> @@ -43,6 +35,4 @@ void regress_foo_test_const_struct_param (const RegressFooStruct* param); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page index 527b8ea..72c58a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_foo_test_const_struct_retval - regress_foo_test_const_struct_retval - - + const RegressFooStruct* regress_foo_test_const_struct_retval (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const RegressFooStruct* regress_foo_test_const_struct_retval (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page index 17bf08a..d6bc02b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ array - regress_foo_test_string_array - - + void regress_foo_test_string_array (char** array); - + + - - - - - - <code>array</code> @@ -43,6 +35,4 @@ void regress_foo_test_string_array (char** array); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page index 91d5824..22d2635 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ array - regress_foo_test_string_array_with_g - - + void regress_foo_test_string_array_with_g (gchar** array); - + + - - - - - - <code>array</code> @@ -43,6 +35,4 @@ void regress_foo_test_string_array_with_g (gchar** array); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page index 8e02366..7019d51 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ unsigned_param - regress_foo_test_unsigned_qualifier - - + void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); - + + - - - - - - <code>unsigned_param</code> @@ -43,6 +35,4 @@ void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page index 04eec05..56870b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ unsigned_param - regress_foo_test_unsigned_type - - + void regress_foo_test_unsigned_type (unsigned unsigned_param); - + + - - - - - - <code>unsigned_param</code> @@ -43,6 +35,4 @@ void regress_foo_test_unsigned_type (unsigned unsigned_param); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page index 210f53c..edc60f1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ callback - regress_foo_test_varargs_callback - - + void regress_foo_test_varargs_callback (gint i, RegressFooVarargsCallback callback); - + + - - - - - - <code>i</code> @@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback (gint i, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page index 1d49d31..ef371fc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_foo_test_varargs_callback2 - - + void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page index 19c1932..0453e64 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ callback2 - regress_foo_test_varargs_callback3 - - + void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, RegressFooVarargsCallback callback2); - + + - - - - - - <code>callback</code> @@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page index 40093e2..7507bb7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ obj - regress_func_obj_null_in - - + void regress_func_obj_null_in (RegressTestObj* obj); - + + - - - - - - <code>obj</code> -

A

+

A

<code>Returns</code> @@ -43,6 +35,4 @@ void regress_func_obj_null_in (RegressTestObj* obj); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page index a43baa0..d174ecc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ v - regress_global_get_flags_out - - + void regress_global_get_flags_out (RegressTestFlags* v); - + + - - - - - - <code>v</code> -

A flags value

+

A flags value

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_global_get_flags_out (RegressTestFlags* v); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page index 6fd4e6b..05505a7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,30 +21,23 @@ attributes - regress_has_parameter_named_attrs - - + void regress_has_parameter_named_attrs (int foo, gpointer* attributes); - - - -

This test case mirrors GnomeKeyringPasswordSchema from + +

This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.

- - - - + <code>foo</code> -

some int

+

some int

 <code>attributes</code> -

list of attributes

+

list of attributes

 <code>Returns</code> @@ -53,6 +45,4 @@ libgnome-keyring.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page index 4d30ec5..dc6b573 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ data - regress_introspectable_via_alias - - + void regress_introspectable_via_alias (RegressPtrArrayAlias* data); - + + - - - - - - <code>data</code> @@ -43,6 +35,4 @@ void regress_introspectable_via_alias (RegressPtrArrayAlias* data); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page index 6158db4..a9f494c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ ok - regress_not_introspectable_via_alias - - + void regress_not_introspectable_via_alias (RegressVaListAlias ok); - + + - - - - - - <code>ok</code> @@ -43,6 +35,4 @@ void regress_not_introspectable_via_alias (RegressVaListAlias ok); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page index 3304979..e6fb0a6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ v - regress_random_function_with_skipped_structure - - + void regress_random_function_with_skipped_structure (int x, RegressSkippedStructure* foo, double v); - + + - - - - - - <code>x</code> @@ -61,6 +53,4 @@ void regress_random_function_with_skipped_structure (int x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page index 2853609..0d02fd1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ abort_on_error - regress_set_abort_on_error - - + void regress_set_abort_on_error (gboolean abort_on_error); - + + - - - - - - <code>abort_on_error</code> @@ -43,6 +35,4 @@ void regress_set_abort_on_error (gboolean abort_on_error); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page index ee1afcd..ea616e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_array_callback - - + int regress_test_array_callback (RegressTestCallbackArray callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ int regress_test_array_callback (RegressTestCallbackArray callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page index 8110915..c759e09 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ objs - regress_test_array_fixed_out_objects - - + void regress_test_array_fixed_out_objects (RegressTestObj*** objs); - + + - - - - - - <code>objs</code> -

An array of

+

An array of

<code>Returns</code> @@ -43,6 +35,4 @@ void regress_test_array_fixed_out_objects (RegressTestObj*** objs); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page index 21c6d9f..d5d7d80 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ ints - regress_test_array_fixed_size_int_in - - + int regress_test_array_fixed_size_int_in (int* ints); - + + - - - - - - <code>ints</code> -

a list of 5 integers

+

a list of 5 integers

 <code>Returns</code> -

the sum of the items in ints

+

the sum of the items in ints

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page index 3fa5c4e..414bb64 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ ints - regress_test_array_fixed_size_int_out - - + void regress_test_array_fixed_size_int_out (int** ints); - + + - - - - - - <code>ints</code> -

a list of 5 integers ranging from 0 to 4

+

a list of 5 integers ranging from 0 to 4

 <code>Returns</code> @@ -43,6 +35,4 @@ void regress_test_array_fixed_size_int_out (int** ints); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page index 913dc0d..5b70e08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_array_fixed_size_int_return - regress_test_array_fixed_size_int_return - - + int* regress_test_array_fixed_size_int_return (void); - + + - - - - - - <code>Returns</code> -

a list of 5 integers ranging from 0 to 4

+

a list of 5 integers ranging from 0 to 4

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page index 7d05b00..6325a59 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ ints - regress_test_array_gint16_in - - + int regress_test_array_gint16_in (int n_ints, gint16* ints); - + + - - - - - - <code>n_ints</code> @@ -44,7 +36,7 @@ int regress_test_array_gint16_in (int n_ints, <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -52,6 +44,4 @@ int regress_test_array_gint16_in (int n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page index c5eee2d..36f0e64 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ ints - regress_test_array_gint32_in - - + gint32 regress_test_array_gint32_in (int n_ints, gint32* ints); - + + - - - - - - <code>n_ints</code> @@ -44,7 +36,7 @@ gint32 regress_test_array_gint32_in (int n_ints, <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -52,6 +44,4 @@ gint32 regress_test_array_gint32_in (int n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page index 7a7701d..96f37c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ ints - regress_test_array_gint64_in - - + gint64 regress_test_array_gint64_in (int n_ints, gint64* ints); - + + - - - - - - <code>n_ints</code> @@ -44,7 +36,7 @@ gint64 regress_test_array_gint64_in (int n_ints, <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -52,6 +44,4 @@ gint64 regress_test_array_gint64_in (int n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page index 8e68579..6b6fd24 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ ints - regress_test_array_gint8_in - - + int regress_test_array_gint8_in (int n_ints, gint8* ints); - + + - - - - - - <code>n_ints</code> @@ -44,7 +36,7 @@ int regress_test_array_gint8_in (int n_ints, <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -52,6 +44,4 @@ int regress_test_array_gint8_in (int n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page index 0eab274..51545e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ types - regress_test_array_gtype_in - - + char* regress_test_array_gtype_in (int n_types, GType* types); - + + - - - - - - <code>n_types</code> @@ -44,14 +36,12 @@ char* regress_test_array_gtype_in (int n_types, <code>types</code> -

List of types

+

List of types

 <code>Returns</code> -

string representation of provided types

+

string representation of provided types

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page index 5eb26d6..54fdd14 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ len - regress_test_array_int_full_out - - + int* regress_test_array_int_full_out (int* len); - + + - - - - - - <code>len</code> -

length of the returned array.

+

length of the returned array.

 <code>Returns</code> -

a new array of integers.

+

a new array of integers.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page index 0caeee1..97a25eb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ ints - regress_test_array_int_in - - + int regress_test_array_int_in (int n_ints, int* ints); - + + - - - - - - <code>n_ints</code> @@ -44,7 +36,7 @@ int regress_test_array_int_in (int n_ints, <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -52,6 +44,4 @@ int regress_test_array_int_in (int n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page index 75d142a..1fc3d1b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ ints - regress_test_array_int_inout - - + void regress_test_array_int_inout (int* n_ints, int** ints); - + + - - - - - - <code>n_ints</code> -

the length of ints

+

the length of ints

 <code>ints</code> -

a list of integers whose items will be increased by 1, except the first that will be dropped

+

a list of integers whose items will be increased by 1, except the first that will be dropped

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_array_int_inout (int* n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page index c4698ce..91bef74 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ len - regress_test_array_int_none_out - - + int* regress_test_array_int_none_out (int* len); - + + - - - - - - <code>len</code> -

length of the returned array.

+

length of the returned array.

 <code>Returns</code> -

a static array of integers.

+

a static array of integers.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page index bab1741..824fc94 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ len - regress_test_array_int_null_in - - + void regress_test_array_int_null_in (int* arr, int len); - + + - - - - - - <code>arr</code> @@ -44,7 +36,7 @@ void regress_test_array_int_null_in (int* arr, <code>len</code> -

length

+

length

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_array_int_null_in (int* arr, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page index cdf6bda..c3645c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ len - regress_test_array_int_null_out - - + void regress_test_array_int_null_out (int** arr, int* len); - + + - - - - - - <code>arr</code> @@ -44,7 +36,7 @@ void regress_test_array_int_null_out (int** arr, <code>len</code> -

length

+

length

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_array_int_null_out (int** arr, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page index b88feb2..c7f3407 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ ints - regress_test_array_int_out - - + void regress_test_array_int_out (int* n_ints, int** ints); - + + - - - - - - <code>n_ints</code> -

the length of ints

+

the length of ints

 <code>ints</code> -

a list of 5 integers, from 0 to 4 in consecutive order

+

a list of 5 integers, from 0 to 4 in consecutive order

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_array_int_out (int* n_ints, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page index bd65df0..0d893ad 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_async_ready_callback - - + void regress_test_async_ready_callback (GAsyncReadyCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page index a444eb2..576763e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_boolean - - + gboolean regress_test_boolean (gboolean in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gboolean regress_test_boolean (gboolean in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page index c96a2f9..2743a49 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_boolean_false - - + gboolean regress_test_boolean_false (gboolean in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gboolean regress_test_boolean_false (gboolean in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page index 1fb64c1..4eb3597 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_boolean_true - - + gboolean regress_test_boolean_true (gboolean in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gboolean regress_test_boolean_true (gboolean in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page new file mode 100644 index 0000000..dd1b24b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page @@ -0,0 +1,38 @@ + + + + + + + void + + regress_test_boxeds_not_a_method + + RegressTestBoxed* + boxed + + + + regress_test_boxeds_not_a_method + +void regress_test_boxeds_not_a_method (RegressTestBoxed* boxed); + + + + + +<code>boxed</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page new file mode 100644 index 0000000..583fa93 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page @@ -0,0 +1,30 @@ + + + + + + + void + + regress_test_boxeds_not_a_static + + + regress_test_boxeds_not_a_static + +void regress_test_boxeds_not_a_static (void); + + + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page index 8ada9d2..ac5bb55 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_cairo_context_full_return - regress_test_cairo_context_full_return - - + cairo_t* regress_test_cairo_context_full_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ cairo_t* regress_test_cairo_context_full_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page index 059afd5..42abbee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ context - regress_test_cairo_context_none_in - - + void regress_test_cairo_context_none_in (cairo_t* context); - + + - - - - - - <code>context</code> @@ -43,6 +35,4 @@ void regress_test_cairo_context_none_in (cairo_t* context); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page index c04a345..3ce5239 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ surface - regress_test_cairo_surface_full_out - - + void regress_test_cairo_surface_full_out (cairo_surface_t** surface); - + + - - - - - - <code>surface</code> @@ -43,6 +35,4 @@ void regress_test_cairo_surface_full_out (cairo_surface_t** surface); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page index 7d77ae6..d2110e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_cairo_surface_full_return - regress_test_cairo_surface_full_return - - + cairo_surface_t* regress_test_cairo_surface_full_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_full_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page index 6730247..ee9d5d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ surface - regress_test_cairo_surface_none_in - - + void regress_test_cairo_surface_none_in (cairo_surface_t* surface); - + + - - - - - - <code>surface</code> @@ -43,6 +35,4 @@ void regress_test_cairo_surface_none_in (cairo_surface_t* surface); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page index a5ac661..c5f471c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_cairo_surface_none_return - regress_test_cairo_surface_none_return - - + cairo_surface_t* regress_test_cairo_surface_none_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_none_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page index 7d2f2c8..a70aecb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_callback - - + int regress_test_callback (RegressTestCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ int regress_test_callback (RegressTestCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page index 8c0a62e..69885df 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ user_data - regress_test_callback_async - - + void regress_test_callback_async (RegressTestCallbackUserData callback, gpointer user_data); - + + - - - - - - <code>callback</code> @@ -52,6 +44,4 @@ void regress_test_callback_async (RegressTestCallbackUserData callback, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page index f7a5e56..484bdae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ notify - regress_test_callback_destroy_notify - - + int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); - - - -

Notified - callback persists until a DestroyNotify delegate + +

Notified - callback persists until a DestroyNotify delegate is invoked.

- - - - + <code>callback</code> @@ -62,6 +54,4 @@ is invoked.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page index 3b162e2..44933c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,22 +21,15 @@ notify - regress_test_callback_destroy_notify_no_user_data - - + int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback, GDestroyNotify notify); - - - -

Adds a scope notified callback with no user data. This can invoke an error + +

Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.

- - - - + <code>callback</code> @@ -53,6 +45,4 @@ condition in bindings which needs to be tested.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page index 5cc1557..7babbdf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_callback_thaw_async - regress_test_callback_thaw_async - - + int regress_test_callback_thaw_async (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ int regress_test_callback_thaw_async (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page index bb0ed81..3ff8aaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_callback_thaw_notifications - regress_test_callback_thaw_notifications - - + int regress_test_callback_thaw_notifications (void); - - - -

Invokes all callbacks installed by #test_callback_destroy_notify(), + +

Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.

- - - - + <code>Returns</code> -

Sum of the return values of the invoked callbacks.

+

Sum of the return values of the invoked callbacks.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page index 3a98a47..1f120a9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,22 +21,15 @@ user_data - regress_test_callback_user_data - - + int regress_test_callback_user_data (RegressTestCallbackUserData callback, gpointer user_data); - - - -

Call - callback parameter persists for the duration of the method + +

Call - callback parameter persists for the duration of the method call and can be released on return.

- - - - + <code>callback</code> @@ -53,6 +45,4 @@ call and can be released on return.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page index 0fdad91..5979523 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ closure - regress_test_closure - - + int regress_test_closure (GClosure* closure); - + + - - - - - - <code>closure</code> @@ -43,6 +35,4 @@ int regress_test_closure (GClosure* closure); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page index 0708b5c..c772776 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ arg - regress_test_closure_one_arg - - + int regress_test_closure_one_arg (GClosure* closure, int arg); - + + - - - - - - <code>closure</code> @@ -52,6 +44,4 @@ int regress_test_closure_one_arg (GClosure* closure, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page index 681b37a..ec22a9e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,36 +21,27 @@ arg - regress_test_closure_variant - - + GVariant* regress_test_closure_variant (GClosure* closure, GVariant* arg); - + + - - - - - - <code>closure</code> -

GClosure which takes one GVariant and returns a GVariant

+

GClosure which takes one GVariant and returns a GVariant

 <code>arg</code> -

a GVariant passed as argument to closure

+

a GVariant passed as argument to closure

 <code>Returns</code> -

the return value of closure

+

the return value of closure

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page index adb21f2..caca59c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_date_in_gvalue - regress_test_date_in_gvalue - - + GValue* regress_test_date_in_gvalue (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GValue* regress_test_date_in_gvalue (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page index 7ad7eb0..1990677 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_def_error_quark - regress_test_def_error_quark - - + GQuark regress_test_def_error_quark (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GQuark regress_test_def_error_quark (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page index f954fe8..ad2a039 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_double - - + gdouble regress_test_double (gdouble in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gdouble regress_test_double (gdouble in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page index 857e4da..43e5aab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_filename_return - regress_test_filename_return - - + GSList* regress_test_filename_return (void); - + + - - - - - - <code>Returns</code> -

list of strings

+

list of strings

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page index c395b04..3e70394 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_float - - + gfloat regress_test_float (gfloat in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gfloat regress_test_float (gfloat in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page index f17cdd9..ccee90d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_garray_container_return - regress_test_garray_container_return - - + GPtrArray* regress_test_garray_container_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_container_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page index b127ed7..64b1817 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_garray_full_return - regress_test_garray_full_return - - + GPtrArray* regress_test_garray_full_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_full_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page index 1a5f54c..7a2080c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_gerror_callback - - + void regress_test_gerror_callback (RegressTestCallbackGError callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page index d465113..539d7eb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_container_return - regress_test_ghash_container_return - - + GHashTable* regress_test_ghash_container_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_container_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page index 616432a..a4ca1cf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_everything_return - regress_test_ghash_everything_return - - + GHashTable* regress_test_ghash_everything_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_everything_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page index 7603f2a..e7d8ba8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,24 +17,17 @@ hash - regress_test_ghash_gvalue_in - - + void regress_test_ghash_gvalue_in (GHashTable* hash); - + + - - - - - - <code>hash</code> -

the hash table returned by +

the hash table returned by .

 @@ -44,6 +36,4 @@ void regress_test_ghash_gvalue_in (GHashTable* hash); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page index 2e739c8..726f674 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_gvalue_return - regress_test_ghash_gvalue_return - - + GHashTable* regress_test_ghash_gvalue_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_gvalue_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page index 6b53197..f721d1b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_nested_everything_return - regress_test_ghash_nested_everything_return - - + GHashTable* regress_test_ghash_nested_everything_return (void); - + +

Specify nested parameterized types directly with the (type ) annotation.

- -

Specify nested parameterized types directly with the (type ) annotation.

- - - - <code>Returns</code> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nested_everything_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page index 0c780b5..4b145bd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,21 +13,14 @@ regress_test_ghash_nested_everything_return2 - regress_test_ghash_nested_everything_return2 - - + GHashTable* regress_test_ghash_nested_everything_return2 (void); - - - -

Another way of specifying nested parameterized types: using the + +

Another way of specifying nested parameterized types: using the element-type annotation.

- - - - + <code>Returns</code> @@ -36,6 +28,4 @@ element-type annotation.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page index 8c457ad..ebda10b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ghash_nothing_in - - + void regress_test_ghash_nothing_in (const GHashTable* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in (const GHashTable* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page index a56ad65..6a6c95c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ghash_nothing_in2 - - + void regress_test_ghash_nothing_in2 (GHashTable* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in2 (GHashTable* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page index c258ee0..d291e15 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_nothing_return - regress_test_ghash_nothing_return - - + const GHashTable* regress_test_ghash_nothing_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_nothing_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page index d221744..1c2eced 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_nothing_return2 - regress_test_ghash_nothing_return2 - - + GHashTable* regress_test_ghash_nothing_return2 (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nothing_return2 (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page index a538b44..e8a6d68 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ghash_null_in - - + void regress_test_ghash_null_in (const GHashTable* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_ghash_null_in (const GHashTable* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page index 323469c..9acbfa9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ out - regress_test_ghash_null_out - - + void regress_test_ghash_null_out (const GHashTable** out); - + + - - - - - - <code>out</code> @@ -43,6 +35,4 @@ void regress_test_ghash_null_out (const GHashTable** out); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page index 03461fd..aa97efb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_ghash_null_return - regress_test_ghash_null_return - - + const GHashTable* regress_test_ghash_null_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_null_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page index 32a3c3a..ee98b28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_glist_container_return - regress_test_glist_container_return - - + GList* regress_test_glist_container_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GList* regress_test_glist_container_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page index 6de1a9c..96f7985 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_glist_everything_return - regress_test_glist_everything_return - - + GList* regress_test_glist_everything_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GList* regress_test_glist_everything_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page index d88487f..c14e0a1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_glist_nothing_in - - + void regress_test_glist_nothing_in (const GList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_glist_nothing_in (const GList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page index 7cba851..310643b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_glist_nothing_in2 - - + void regress_test_glist_nothing_in2 (GList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_glist_nothing_in2 (GList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page index af54aea..7e87fca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_glist_nothing_return - regress_test_glist_nothing_return - - + const GList* regress_test_glist_nothing_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const GList* regress_test_glist_nothing_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page index 2901e41..c59cb8d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_glist_nothing_return2 - regress_test_glist_nothing_return2 - - + GList* regress_test_glist_nothing_return2 (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GList* regress_test_glist_nothing_return2 (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page index b6ca3ab..db71142 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_glist_null_in - - + void regress_test_glist_null_in (GSList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_glist_null_in (GSList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page index 13e421d..ac03e1a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ out_list - regress_test_glist_null_out - - + void regress_test_glist_null_out (GSList** out_list); - + + - - - - - - <code>out_list</code> @@ -43,6 +35,4 @@ void regress_test_glist_null_out (GSList** out_list); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page index 05587fc..4920cfb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_gslist_container_return - regress_test_gslist_container_return - - + GSList* regress_test_gslist_container_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_container_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page index a03f4d8..4939dd1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_gslist_everything_return - regress_test_gslist_everything_return - - + GSList* regress_test_gslist_everything_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_everything_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page index 61a14b1..76ddec5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_gslist_nothing_in - - + void regress_test_gslist_nothing_in (const GSList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in (const GSList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page index 0703ec0..bc93886 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_gslist_nothing_in2 - - + void regress_test_gslist_nothing_in2 (GSList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in2 (GSList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page index 8df79aa..1b18f67 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_gslist_nothing_return - regress_test_gslist_nothing_return - - + const GSList* regress_test_gslist_nothing_return (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const GSList* regress_test_gslist_nothing_return (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page index aeb9a67..3d8caef 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_gslist_nothing_return2 - regress_test_gslist_nothing_return2 - - + GSList* regress_test_gslist_nothing_return2 (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_nothing_return2 (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page index 21d8d5c..2dd93e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_gslist_null_in - - + void regress_test_gslist_null_in (GSList* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_gslist_null_in (GSList* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page index d763519..8448b51 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ out_list - regress_test_gslist_null_out - - + void regress_test_gslist_null_out (GSList** out_list); - + + - - - - - - <code>out_list</code> @@ -43,6 +35,4 @@ void regress_test_gslist_null_out (GSList** out_list); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page index 76e678b..bd800b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_gtype - - + GType regress_test_gtype (GType in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ GType regress_test_gtype (GType in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page index df9d988..e0e1f80 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_gvariant_as - regress_test_gvariant_as - - + GVariant* regress_test_gvariant_as (void); - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page index 2d64ab2..c23f3b2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_gvariant_asv - regress_test_gvariant_asv - - + GVariant* regress_test_gvariant_asv (void); - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page index 2eec994..1d5ed1f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_gvariant_i - regress_test_gvariant_i - - + GVariant* regress_test_gvariant_i (void); - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page index 9ef9d9f..2ba1a2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_gvariant_s - regress_test_gvariant_s - - + GVariant* regress_test_gvariant_s (void); - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page index c07b2ac..d47e28c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_gvariant_v - regress_test_gvariant_v - - + GVariant* regress_test_gvariant_v (void); - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page index 24862b1..a623454 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,25 +21,18 @@ callback - regress_test_hash_table_callback - - + void regress_test_hash_table_callback (GHashTable* data, RegressTestCallbackHashtable callback); - + + - - - - - - <code>data</code> -

GHashTable that gets passed to callback

+

GHashTable that gets passed to callback

 <code>callback</code> @@ -52,6 +44,4 @@ void regress_test_hash_table_callback (GHashTable* data, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page index 430af30..747b2cd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_int - - + gint regress_test_int (gint in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gint regress_test_int (gint in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page index d5be61d..ff49f2e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_int16 - - + gint16 regress_test_int16 (gint16 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gint16 regress_test_int16 (gint16 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page index be90ac6..96962ba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_int32 - - + gint32 regress_test_int32 (gint32 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gint32 regress_test_int32 (gint32 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page index d864702..f2f73f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_int64 - - + gint64 regress_test_int64 (gint64 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gint64 regress_test_int64 (gint64 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page index 1cfb431..67746b3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_int8 - - + gint8 regress_test_int8 (gint8 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gint8 regress_test_int8 (gint8 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page index 80276c0..6089228 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ in - regress_test_int_out_utf8 - - + void regress_test_int_out_utf8 (int* length, const char* in); - + + - - - - - - <code>length</code> @@ -52,6 +44,4 @@ void regress_test_int_out_utf8 (int* length, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page index a61c91c..51735d1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ v - regress_test_int_value_arg - - + int regress_test_int_value_arg (const GValue* v); - + + - - - - - - <code>v</code> @@ -43,6 +35,4 @@ int regress_test_int_value_arg (const GValue* v); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page index 30bf3af..840b0b8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_long - - + glong regress_test_long (glong in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ glong regress_test_long (glong in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page index 152c916..dfa77f2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_multi_callback - - + int regress_test_multi_callback (RegressTestCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ int regress_test_multi_callback (RegressTestCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page index 5135297..693a2c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,22 +25,15 @@ two - regress_test_multi_double_args - - + void regress_test_multi_double_args (gdouble in, gdouble* one, gdouble* two); - + + - - - - - - <code>in</code> @@ -61,6 +53,4 @@ void regress_test_multi_double_args (gdouble in, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page index d660bd8..9c4c685 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_multiline_doc_comments - regress_test_multiline_doc_comments - - + void regress_test_multiline_doc_comments (void); - + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- -

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- - - - <code>Returns</code> @@ -35,6 +27,4 @@ void regress_test_multiline_doc_comments (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page index c28cc8f..c04055c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,16 +17,12 @@ a - regress_test_nested_parameter - - + void regress_test_nested_parameter (int a); - - - -

<informaltable> + +

<informaltable> <tgroup cols="3"> <thead> <row> @@ -52,15 +47,12 @@ rgb(20%, 30%, 0%)</literallayout></entry> </row> </tbody> </tgroup> -</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

- - - - +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ <code>a</code> -

An integer

+

An integer

 <code>Returns</code> @@ -68,6 +60,4 @@ rgb(20%, 30%, 0%)</literallayout></entry> - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page index bdcc152..c6ed1f9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_null_gerror_callback - - + void regress_test_null_gerror_callback (RegressTestCallbackGError callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_null_gerror_callback (RegressTestCallbackGError callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page index 49f1b36..3e12c1d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_owned_gerror_callback - - + void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page index 53d3b1b..fd17290 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_short - - + gshort regress_test_short (gshort in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gshort regress_test_short (gshort in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page index 514fbfa..fa5974d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ callback - regress_test_simple_callback - - + void regress_test_simple_callback (RegressTestSimpleCallback callback); - + + - - - - - - <code>callback</code> @@ -43,6 +35,4 @@ void regress_test_simple_callback (RegressTestSimpleCallback callback); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page index 3b67a00..d6fdd17 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_size - - + gsize regress_test_size (gsize in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gsize regress_test_size (gsize in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page index 321d087..ad415bc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,25 +17,18 @@ callback - regress_test_skip_unannotated_callback - - + void regress_test_skip_unannotated_callback (RegressTestCallback callback); - - - -

Should not emit a warning: + +

Should not emit a warning: https://bugzilla.gnome.org/show_bug.cgi?id=685399

- - - - + <code>callback</code> -

No annotation here

+

No annotation here

 <code>Returns</code> @@ -44,6 +36,4 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page index d11446e..6afb6be 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ssize - - + gssize regress_test_ssize (gssize in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gssize regress_test_ssize (gssize in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page index 3f9ca2a..bbaae44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ arr - regress_test_strv_in - - + gboolean regress_test_strv_in (char** arr); - + + - - - - - - <code>arr</code> @@ -43,6 +35,4 @@ gboolean regress_test_strv_in (char** arr); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page index 44b0c6c..3cdc304 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_strv_in_gvalue - regress_test_strv_in_gvalue - - + GValue* regress_test_strv_in_gvalue (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ GValue* regress_test_strv_in_gvalue (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page index 207e69f..f884be5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_strv_out - regress_test_strv_out - - + char** regress_test_strv_out (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ char** regress_test_strv_out (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page index 582ab10..28c1efe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_strv_out_c - regress_test_strv_out_c - - + const char* const* regress_test_strv_out_c (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ const char* const* regress_test_strv_out_c (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page index 0515bce..3e27a2e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,20 +13,13 @@ regress_test_strv_out_container - regress_test_strv_out_container - - + char** regress_test_strv_out_container (void); - + + - - - - - - <code>Returns</code> @@ -35,6 +27,4 @@ char** regress_test_strv_out_container (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page index a105b5b..07c00b1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ retp - regress_test_strv_outarg - - + void regress_test_strv_outarg (char*** retp); - + + - - - - - - <code>retp</code> @@ -43,6 +35,4 @@ void regress_test_strv_outarg (char*** retp); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page index acada71..fdf552c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_timet - - + time_t regress_test_timet (time_t in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ time_t regress_test_timet (time_t in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page index 3d4c18c..bf164c1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -38,25 +37,18 @@ m - regress_test_torture_signature_0 - - + void regress_test_torture_signature_0 (int x, double* y, int* z, const char* foo, int* q, guint m); - + + - - - - - - <code>x</code> @@ -88,6 +80,4 @@ void regress_test_torture_signature_0 (int x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page index 7568989..6f5a925 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -38,25 +37,18 @@ m - regress_test_torture_signature_1 - - + gboolean regress_test_torture_signature_1 (int x, double* y, int* z, const char* foo, int* q, guint m); - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>x</code> @@ -88,6 +80,4 @@ gboolean regress_test_torture_signature_1 (int x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page index eb615c3..3339a62 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -50,11 +49,9 @@ m - regress_test_torture_signature_2 - - + void regress_test_torture_signature_2 (int x, RegressTestCallbackUserData callback, gpointer user_data, @@ -64,14 +61,9 @@ void regress_test_torture_signature_2 (int x, const char* foo, int* q, guint m); - + + - - - - - - <code>x</code> @@ -115,6 +107,4 @@ void regress_test_torture_signature_2 (int x, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page index 1651512..dc8aea4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_uint - - + guint regress_test_uint (guint in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ guint regress_test_uint (guint in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page index 2af7ee4..0266295 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_uint16 - - + guint16 regress_test_uint16 (guint16 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ guint16 regress_test_uint16 (guint16 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page index 7ccdde7..50b6a2e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_uint32 - - + guint32 regress_test_uint32 (guint32 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ guint32 regress_test_uint32 (guint32 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page index 24a9256..84aa11d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_uint64 - - + guint64 regress_test_uint64 (guint64 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ guint64 regress_test_uint64 (guint64 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page index 7222e74..d6bc24d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_uint8 - - + guint8 regress_test_uint8 (guint8 in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ guint8 regress_test_uint8 (guint8 in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page index 8095370..011bfd3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ulong - - + gulong regress_test_ulong (gulong in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gulong regress_test_ulong (gulong in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page index 0349472..4ee1c44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_unichar - - + gunichar regress_test_unichar (gunichar in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gunichar regress_test_unichar (gunichar in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page index 642e75a..81c8e16 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ e - regress_test_unsigned_enum_param - - + const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); - + + - - - - - - <code>e</code> @@ -43,6 +35,4 @@ const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page index 2b50e72..d06bb4e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_ushort - - + gushort regress_test_ushort (gushort in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ gushort regress_test_ushort (gushort in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page index eaafeae..af18ce2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_utf8_const_in - - + void regress_test_utf8_const_in (const char* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_utf8_const_in (const char* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page index 6bcb786..8f70ef6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_utf8_const_return - regress_test_utf8_const_return - - + const char* regress_test_utf8_const_return (void); - + + - - - - - - <code>Returns</code> -

UTF-8 string

+

UTF-8 string

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page index ce0a884..7e04703 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ inout - regress_test_utf8_inout - - + void regress_test_utf8_inout (char** inout); - + + - - - - - - <code>inout</code> @@ -43,6 +35,4 @@ void regress_test_utf8_inout (char** inout); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page index aa921b0..6cd2b2d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,27 +13,18 @@ regress_test_utf8_nonconst_return - regress_test_utf8_nonconst_return - - + char* regress_test_utf8_nonconst_return (void); - + + - - - - - - <code>Returns</code> -

UTF-8 string

+

UTF-8 string

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page index 9b19637..2a7dd03 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ in - regress_test_utf8_null_in - - + void regress_test_utf8_null_in (char* in); - + + - - - - - - <code>in</code> @@ -43,6 +35,4 @@ void regress_test_utf8_null_in (char* in); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page index 6d4c455..66df917 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ char_out - regress_test_utf8_null_out - - + void regress_test_utf8_null_out (char** char_out); - + + - - - - - - <code>char_out</code> @@ -43,6 +35,4 @@ void regress_test_utf8_null_out (char** char_out); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page index 5084da3..5766637 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ out - regress_test_utf8_out - - + void regress_test_utf8_out (char** out); - + + - - - - - - <code>out</code> @@ -43,6 +35,4 @@ void regress_test_utf8_out (char** out); - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page index 65b2a8a..15b0d3a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ out - regress_test_utf8_out_nonconst_return - - + char* regress_test_utf8_out_nonconst_return (char** out); - + + - - - - - - <code>out</code> -

a copy of "second"

+

a copy of "second"

 <code>Returns</code> -

a copy of "first"

+

a copy of "first"

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page index e377199..3038870 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,29 +21,22 @@ out1 - regress_test_utf8_out_out - - + void regress_test_utf8_out_out (char** out0, char** out1); - + + - - - - - - <code>out0</code> -

a copy of "first"

+

a copy of "first"

 <code>out1</code> -

a copy of "second"

+

a copy of "second"

 <code>Returns</code> @@ -52,6 +44,4 @@ void regress_test_utf8_out_out (char** out0, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page index 3435610..6259abf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,20 +17,13 @@ value - regress_test_value_get_fundamental_object - - + RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const GValue* value); - + + - - - - - - <code>value</code> @@ -43,6 +35,4 @@ RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const G - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page index 2edb30a..25d1f71 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ i - regress_test_value_return - - + const GValue* regress_test_value_return (int i); - + + - - - - - - <code>i</code> -

an int

+

an int

 <code>Returns</code> -

the int wrapped in a GValue.

+

the int wrapped in a GValue.

 - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page index ba1822e..db1b327 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,21 +21,14 @@ fundamental_object - regress_test_value_set_fundamental_object - - + void regress_test_value_set_fundamental_object (GValue* value, RegressTestFundamentalObject* fundamental_object); - + + - - - - - - <code>value</code> @@ -52,6 +44,4 @@ void regress_test_value_set_fundamental_object (GValue* value, - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page index a389bda..cc5ef0e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,21 +13,13 @@ regress_test_versioning - regress_test_versioning - - + void regress_test_versioning (void); - + - - - - -

Since 1.32.1

- - +

Since 1.32.1

<code>Returns</code> @@ -36,6 +27,4 @@ void regress_test_versioning (void); - - diff --git a/tests/scanner/Regress-1.0-C-expected/index.page b/tests/scanner/Regress-1.0-C-expected/index.page index a5426d8..426ebed 100644 --- a/tests/scanner/Regress-1.0-C-expected/index.page +++ b/tests/scanner/Regress-1.0-C-expected/index.page @@ -5,21 +5,9 @@ xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - - - Index - - - - - - - - - - + + Regress + Classes diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 0000000..55a4b6d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_DEFINE + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 0000000..c8887ff --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE +

Constant to define a calculated large value

+

Since 1.4

+ diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 0000000..08eda31 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV +

Constant to define a calculated large value

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page index 9ac6820..377a063 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page @@ -1,24 +1,16 @@ - - - + Regress.ATestError - - - - - - - - + + <code>ATestError.CODE0</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page index 9490e4a..097c37b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AliasedTestBoxed - - - -

Typedef TestBoxed to test caller-allocates correctness

- - - - - - - +

Typedef TestBoxed to test caller-allocates correctness

+ diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page new file mode 100644 index 0000000..71177e3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page @@ -0,0 +1,18 @@ + + + + + x + + Regress.AnAnonymousUnion.x + +AnAnonymousUnion.x: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.page index 2556fed..ff0853e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.page @@ -1,25 +1,42 @@ - - - + Regress.AnAnonymousUnion - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let anAnonymousUnion = new Regress.AnAnonymousUnion({ + x: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page index 4e19ef9..355066b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page @@ -1,25 +1,29 @@ - - - + Regress.AnnotationBitfield - - - - - - - - - - - + + + + +<code>AnnotationBitfield.FOO</code> + + + +<code>AnnotationBitfield.BAR</code> + + + + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page index 9a652d8..4c40231 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page @@ -1,25 +1,29 @@ - - - + Regress.AnnotationCallback - - - -

This is a callback.

- - - - - - - + +function onAnnotationCallback(in: Number(gint)): Number(gint) { +} + +

This is a callback.

+ + + +<code>in</code> +

array of ints

+ + +<code>Returns</code> +

array of ints

+ + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page new file mode 100644 index 0000000..a95e09d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page @@ -0,0 +1,18 @@ + + + + + arr + + Regress.AnnotationFields.arr + +AnnotationFields.arr: ByteArray (Read / Write) + +

an array of length @len

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page new file mode 100644 index 0000000..aa029db --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page @@ -0,0 +1,18 @@ + + + + + field1 + + Regress.AnnotationFields.field1 + +AnnotationFields.field1: Number(gint) (Read / Write) + +

Some documentation

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page new file mode 100644 index 0000000..5fb363c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page @@ -0,0 +1,18 @@ + + + + + len + + Regress.AnnotationFields.len + +AnnotationFields.len: Number(gulong) (Read / Write) + +

the length of array

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields.page index 5323454..585a97c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields.page @@ -1,25 +1,44 @@ - - - + Regress.AnnotationFields - - - -

This is a struct for testing field documentation and annotations

- - - - - - - + +const Regress = imports.gi.Regress; + +let annotationFields = new Regress.AnnotationFields({ + field1: value + arr: value + len: value +}); + +

This is a struct for testing field documentation and annotations

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page index db77a11..cf16fa3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page @@ -1,25 +1,29 @@ - - - + Regress.AnnotationForeachFunc - - - - - - - - - - - + +function onAnnotationForeachFunc(object: Regress.AnnotationObject, item: String): void { +} + + + + + +<code>object</code> + + + +<code>item</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page index 79844c6..e66cdef 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page @@ -1,25 +1,29 @@ - - - + Regress.AnnotationListCallback - - - -

This is a callback taking a list.

- - - - - - - + +function onAnnotationListCallback(in: Array(String)): Array(String) { +} + +

This is a callback taking a list.

+ + + +<code>in</code> +

list of strings

+ + +<code>Returns</code> +

list of strings

+ + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page index 17c8029..665fd2a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page @@ -1,26 +1,22 @@ - - - + Regress.AnnotationNotifyFunc - - - -

This is a callback with a 'closure' argument that is not named + +function onAnnotationNotifyFunc(): void { +} + +

This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated.

- - - - - - - + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index c30c337..d57d251 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -6,42 +6,32 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - attribute-signal - Regress.AnnotationObject::attribute-signal - - -function callback(annotation_object, arg1:String, arg2:String, ):String; - + +connect('attribute-signal', function (annotationObject, arg1: String, arg2: String, ): String); + +

This signal tests a signal with attributes.

- -

This signal tests a signal with attributes.

- - - - -<code>annotation_object</code> +<code>annotationObject</code>

instance of that is emitting the signal

 <code>arg1</code> -

a value

+

a value

 <code>arg2</code> -

another value

+

another value

 <code>Returns</code> -

the return value

+

the return value

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 6102591..0bcbbbc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -6,26 +6,18 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - doc-empty-arg-parsing - Regress.AnnotationObject::doc-empty-arg-parsing - - -function callback(annotation_object, arg1:gpointer, ):void; - + +connect('doc-empty-arg-parsing', function (annotationObject, arg1: void, ): void); + +

This signal tests an empty document argument (arg1)

- -

This signal tests an empty document argument (arg1)

- - - - -<code>annotation_object</code> +<code>annotationObject</code>

instance of that is emitting the signal

 @@ -34,6 +26,4 @@ function callback(annotation_object, arg1:gpointer, ):void; - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page index d9d8b55..148081a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - function-property - - Regress.AnnotationObject:function-property - - -"function-property" Regress.AnnotationCallback : Read / Write / Construct - + Regress.AnnotationObject.function_property + +AnnotationObject.function_property: Regress.AnnotationCallback (Read / Write / Construct) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index 4e2044d..c94b525 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -6,35 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-signal - Regress.AnnotationObject::list-signal - - -function callback(annotation_object, list:[String], ):void; - - - -

This is a signal which takes a list of strings, but it's not + +connect('list-signal', function (annotationObject, list: Array(String), ): void); + +

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

- - - - + -<code>annotation_object</code> +<code>annotationObject</code>

instance of that is emitting the signal

 <code>list</code> -

a list of strings

+

a list of strings

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page index eba5cef..2eff716 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page @@ -6,25 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-property - - Regress.AnnotationObject:string-property - - -"string-property" String : Read / Write / Construct - - - -

This is a property which is a string

- - -

Since 1.0

- - - - - + Regress.AnnotationObject.string_property + +AnnotationObject.string_property: String (Read / Write / Construct) + +

This is a property which is a string

+

Since 1.0

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index 59408b4..9c16d75 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -6,36 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-signal - Regress.AnnotationObject::string-signal - - -function callback(annotation_object, string:String, ):void; - - - -

This is a signal which has a broken signal handler, + +connect('string-signal', function (annotationObject, string: String, ): void); + +

This is a signal which has a broken signal handler, it says it's pointer but it's actually a string.

- - -

Since 1.0

- - +

Since 1.0

-<code>annotation_object</code> +<code>annotationObject</code>

instance of that is emitting the signal

 <code>string</code> -

a string

+

a string

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page index c2444fa..d943cf4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page @@ -6,26 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - tab-property - - Regress.AnnotationObject:tab-property - - -"tab-property" String : Read / Write / Construct - - - -

This is a property annotation intentionally indented with a mix + Regress.AnnotationObject.tab_property + +AnnotationObject.tab_property: String (Read / Write / Construct) + +

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

- - - - - +

Since 1.2

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page index 414f5c6..9a4cc08 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ somearg - Regress.AnnotationObject.prototype.allow_none - - -function allow_none(somearg:String):GObject.Object { + +function allow_none(somearg: String): GObject.Object { // Gjs wrapper for regress_annotation_object_allow_none() } - + + - - - - - - <code>somearg</code> @@ -41,10 +33,8 @@ function allow_none(somearg:String):GObject.Object { <code>Returns</code> -

null always

+

null always

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page index 8dd15f1..0e458c4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page @@ -6,37 +6,31 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_calleeowns - Regress.AnnotationObject.prototype.calleeowns - - -function calleeowns():Number { + +function calleeowns(): [return_value: Number(gint), toown: GObject.Object] { // Gjs wrapper for regress_annotation_object_calleeowns() } - + +

This is a test for out arguments; GObject defaults to transfer

- -

This is a test for out arguments; GObject defaults to transfer

- - - - -<code>Returns</code> -

an int

+<code>return_value</code> +

an int

+ + +<code>toown</code> +

a GObject.Object

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page index a12be35..401fcb0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page @@ -6,37 +6,35 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_calleesowns - Regress.AnnotationObject.prototype.calleesowns - - -function calleesowns():Number { + +function calleesowns(): [return_value: Number(gint), toown1: GObject.Object, toown2: GObject.Object] { // Gjs wrapper for regress_annotation_object_calleesowns() } - + +

This is a test for out arguments, one transferred, other not

- -

This is a test for out arguments, one transferred, other not

- - - - -<code>Returns</code> -

an int

+<code>return_value</code> +

an int

+ + +<code>toown1</code> +

a GObject.Object

+ + +<code>toown2</code> +

a GObject.Object

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page index d7e6784..fd3e794 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_object_compute_sum - [Number] + Array(Number(gint)) nums - Regress.AnnotationObject.prototype.compute_sum - - -function compute_sum(nums:[Number]):void { + +function compute_sum(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum() } - + +

Test taking a zero-terminated array

- -

Test taking a zero-terminated array

- - - - <code>nums</code> -

Sequence of numbers

+

Sequence of numbers

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page index 932b192..331214b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,34 +13,25 @@ regress_annotation_object_compute_sum_n - [Number] + Array(Number(gint)) nums - Regress.AnnotationObject.prototype.compute_sum_n - - -function compute_sum_n(nums:[Number]):void { + +function compute_sum_n(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum_n() } - + +

Test taking an array with length parameter

- -

Test taking an array with length parameter

- - - - <code>nums</code> -

Sequence of +

Sequence of numbers that are zero-terminated

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page index 3891049..754a37f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,34 +13,25 @@ regress_annotation_object_compute_sum_nz - [Number] + Array(Number(gint)) nums - Regress.AnnotationObject.prototype.compute_sum_nz - - -function compute_sum_nz(nums:[Number]):void { + +function compute_sum_nz(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum_nz() } - + +

Test taking a zero-terminated array with length parameter

- -

Test taking a zero-terminated array with length parameter

- - - - <code>nums</code> -

Sequence of numbers that +

Sequence of numbers that are zero-terminated

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page index 03ceac1..c659864 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_annotation_object_create_object - Regress.AnnotationObject.prototype.create_object - - -function create_object():GObject.Object { + +function create_object(): GObject.Object { // Gjs wrapper for regress_annotation_object_create_object() } - + +

Test returning a caller-owned object

- -

Test returning a caller-owned object

- - - - <code>Returns</code> -

The object

+

The object

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page index e89c8fe..07a0ed8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_annotation_object_do_not_use - Regress.AnnotationObject.prototype.do_not_use - - -function do_not_use():GObject.Object { + +function do_not_use(): GObject.Object { // Gjs wrapper for regress_annotation_object_do_not_use() } - + + - - - - - - <code>Returns</code> -

null always

+

null always

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page index cd58eed..af1d729 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_annotation_object_extra_annos - Regress.AnnotationObject.prototype.extra_annos - - -function extra_annos():void { + +function extra_annos(): void { // Gjs wrapper for regress_annotation_object_extra_annos() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page index e4cc4c0..8152aa8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,20 @@ func - Regress.AnnotationObject.prototype.foreach - - -function foreach(func:Regress.AnnotationForeachFunc):void { + +function foreach(func: Regress.AnnotationForeachFunc): void { // Gjs wrapper for regress_annotation_object_foreach() } - + +

Test taking a call-scoped callback

- -

Test taking a call-scoped callback

- - - - <code>func</code> -

Callback to invoke

+

Callback to invoke

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page index 2e6ca61..ec29a8a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,21 @@ regress_annotation_object_get_hash - Regress.AnnotationObject.prototype.get_hash - - -function get_hash():{String: GObject.Object} { + +function get_hash(): {String: GObject.Object} { // Gjs wrapper for regress_annotation_object_get_hash() } - - - -

This is a test for returning a hash table mapping strings to + +

This is a test for returning a hash table mapping strings to objects.

- - - - + <code>Returns</code> -

hash table

+

hash table

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page index c0350d7..38e3d46 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -6,39 +6,29 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [Regress.AnnotationObject] + Array(Regress.AnnotationObject) regress_annotation_object_get_objects - Regress.AnnotationObject.prototype.get_objects - - -function get_objects():[Regress.AnnotationObject] { + +function get_objects(): Array(Regress.AnnotationObject) { // Gjs wrapper for regress_annotation_object_get_objects() } - - - -

This is a test for returning a list of objects. + +

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

- - - - + <code>Returns</code> -

list of objects

+

list of objects

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page index e36d25a..03fece1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -6,38 +6,28 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_annotation_object_get_strings - Regress.AnnotationObject.prototype.get_strings - - -function get_strings():[String] { + +function get_strings(): Array(String) { // Gjs wrapper for regress_annotation_object_get_strings() } - - - -

This is a test for returning a list of strings, where + +

This is a test for returning a list of strings, where each string needs to be freed.

- - - - + <code>Returns</code> -

list of strings

+

list of strings

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page index 945acf0..814248f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_annotation_object_hidden_self - Regress.AnnotationObject.prototype.hidden_self - - -function hidden_self():void { + +function hidden_self(): void { // Gjs wrapper for regress_annotation_object_hidden_self() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page index 226b2b9..892eb42 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page @@ -6,45 +6,35 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_in - Number + Number(gint) inarg - Regress.AnnotationObject.prototype.in - - -function in(inarg:Number):Number { + +function in(inarg: Number(gint)): Number(gint) { // Gjs wrapper for regress_annotation_object_in() } - + +

This is a test for in arguments

- -

This is a test for in arguments

- - - - <code>inarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page index 885412f..5d2eaa5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page @@ -6,45 +6,39 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_inout - Number + Number(gint) inoutarg - Regress.AnnotationObject.prototype.inout - - -function inout(inoutarg:Number):Number { + +function inout(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout() } - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - <code>inoutarg</code> -

This is an argument test

+

This is an argument test

+ + +<code>return_value</code> +

an int

 -<code>Returns</code> -

an int

+<code>inoutarg (out)</code> +

This is an argument test

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page index 34406b7..06c0a83 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page @@ -6,45 +6,39 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_inout2 - Number + Number(gint) inoutarg - Regress.AnnotationObject.prototype.inout2 - - -function inout2(inoutarg:Number):Number { + +function inout2(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout2() } - + +

This is a second test for out arguments

- -

This is a second test for out arguments

- - - - <code>inoutarg</code> -

This is an argument test

+

This is an argument test

+ + +<code>return_value</code> +

an int

 -<code>Returns</code> -

an int

+<code>inoutarg (out)</code> +

This is an argument test

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page index 2828964..e20f1f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page @@ -6,45 +6,39 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_inout3 - Number + Number(gint) inoutarg - Regress.AnnotationObject.prototype.inout3 - - -function inout3(inoutarg:Number):Number { + +function inout3(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout3() } - + +

This is a 3th test for out arguments

- -

This is a 3th test for out arguments

- - - - <code>inoutarg</code> -

This is an argument test

+

This is an argument test

+ + +<code>return_value</code> +

an int

 -<code>Returns</code> -

an int

+<code>inoutarg (out)</code> +

This is an argument test

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page index 49d937a..e94067c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_method - Regress.AnnotationObject.prototype.method - - -function method():Number { + +function method(): Number(gint) { // Gjs wrapper for regress_annotation_object_method() } - + + - - - - - - <code>Returns</code> -

an int

+

an int

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page index 0424719..97d302b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_annotation_object_notrans - Regress.AnnotationObject.prototype.notrans - - -function notrans():GObject.Object { + +function notrans(): GObject.Object { // Gjs wrapper for regress_annotation_object_notrans() } - + + - - - - - - <code>Returns</code> -

An object, not referenced

+

An object, not referenced

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page index 5120baf..e9cb17b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page @@ -6,37 +6,31 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_object_out - Regress.AnnotationObject.prototype.out - - -function out():Number { + +function out(): [return_value: Number(gint), outarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_out() } - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - -<code>Returns</code> -

an int

+<code>return_value</code> +

an int

+ + +<code>outarg</code> +

This is an argument test

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index f4f0130..cca4c5d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AnnotationObject - const Regress = imports.gi.Regress; -let annotation_object = new Regress.AnnotationObject({ +let annotationObject = new Regress.AnnotationObject({ function_property: value, string_property: value, tab_property: value, }); +

This is an object used to test annotations.

- -

This is an object used to test annotations.

- - - - Hierarchy @@ -39,8 +31,11 @@ let annotation_object = new Regress.AnnotationObject({ - - + + Constructors + @@ -49,7 +44,7 @@ let annotation_object = new Regress.AnnotationObject({ - Functions + Static Functions Properties @@ -60,8 +55,10 @@ let annotation_object = new Regress.AnnotationObject({ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page index 8476fd8..8bc6913 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,28 @@ regress_annotation_object_parse_args - [String] + Array(String) argv - Regress.AnnotationObject.prototype.parse_args - - -function parse_args(argv:[String]):void { + +function parse_args(argv: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_object_parse_args() } - + +

Test taking a zero-terminated array with length parameter

- -

Test taking a zero-terminated array with length parameter

- - - - -<code>argv</code> -

Argument vector

+<code>Returns</code> +

Argument vector

+ + +<code>Returns (out)</code> +

Argument vector

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page index a5dafb9..1114cea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_object_set_data - [guint8] + ByteArray data - Regress.AnnotationObject.prototype.set_data - - -function set_data(data:[guint8]):void { + +function set_data(data: ByteArray): void { // Gjs wrapper for regress_annotation_object_set_data() } - + +

Test taking a guchar * with a length.

- -

Test taking a guchar * with a length.

- - - - <code>data</code> -

The data

+

The data

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page index 3fcd818..83a2349 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_object_set_data2 - [gint8] + ByteArray data - Regress.AnnotationObject.prototype.set_data2 - - -function set_data2(data:[gint8]):void { + +function set_data2(data: ByteArray): void { // Gjs wrapper for regress_annotation_object_set_data2() } - + +

Test taking a gchar * with a length.

- -

Test taking a gchar * with a length.

- - - - <code>data</code> -

The data

+

The data

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page index 22fb98d..ffef4ec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,34 +13,25 @@ regress_annotation_object_set_data3 - [guint8] + ByteArray data - Regress.AnnotationObject.prototype.set_data3 - - -function set_data3(data:[guint8]):void { + +function set_data3(data: ByteArray): void { // Gjs wrapper for regress_annotation_object_set_data3() } - - - -

Test taking a gchar * with a length, overriding the array element + +

Test taking a gchar * with a length, overriding the array element type.

- - - - + <code>data</code> -

The data

+

The data

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page index 4d6029a..9df3a2a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,24 @@ regress_annotation_object_string_out - Regress.AnnotationObject.prototype.string_out - - -function string_out():Boolean { + +function string_out(): [ok: Boolean, str_out: String] { // Gjs wrapper for regress_annotation_object_string_out() } - + +

Test returning a string as an out parameter

- -

Test returning a string as an out parameter

- - - - -<code>Returns</code> -

some boolean

+<code>ok</code> +

some boolean

+ + +<code>str_out</code> +

string return value

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page index c602a89..5f45283 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_annotation_object_use_buffer - guint8 + Number(guint8) bytes - Regress.AnnotationObject.prototype.use_buffer - - -function use_buffer(bytes:guint8):void { + +function use_buffer(bytes: Number(guint8)): void { // Gjs wrapper for regress_annotation_object_use_buffer() } - + + - - - - - - <code>bytes</code> @@ -41,6 +33,4 @@ function use_buffer(bytes:guint8):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page similarity index 68% rename from tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page rename to tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page index 99bfaf1..70963d4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page @@ -1,12 +1,11 @@ - - @@ -18,29 +17,20 @@ func - - Regress.AnnotationObject.prototype.watch_full - - -function watch_full(func:Regress.AnnotationForeachFunc):void { + Regress.AnnotationObject.prototype.watch + +function watch(func: Regress.AnnotationForeachFunc): void { // Gjs wrapper for regress_annotation_object_watch_full() } - + +

Test overriding via the "Rename To" annotation.

- -

Test overriding via the "Rename To" annotation.

- - - - <code>func</code> -

The callback

+

The callback

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page index 6daccb5..b78d7bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_object_with_voidp - gpointer + void data - Regress.AnnotationObject.prototype.with_voidp - - -function with_voidp(data:gpointer):void { + +function with_voidp(data: void): void { // Gjs wrapper for regress_annotation_object_with_voidp() } - + + - - - - - - <code>data</code> -

Opaque pointer handle

+

Opaque pointer handle

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page new file mode 100644 index 0000000..e1e85f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page @@ -0,0 +1,18 @@ + + + + + objects + + Regress.AnnotationStruct.objects + +AnnotationStruct.objects: Array(Regress.AnnotationObject) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page index e210042..cdb5585 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page @@ -1,25 +1,42 @@ - - - + Regress.AnnotationStruct - - - -

This is a test of an array of object in an field of a struct.

- - - - - - - + +const Regress = imports.gi.Regress; + +let annotationStruct = new Regress.AnnotationStruct({ + objects: value +}); + +

This is a test of an array of object in an field of a struct.

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page new file mode 100644 index 0000000..e65594f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.BOOL_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 0000000..bbc2a03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.DOUBLE_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 0000000..09b1561 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_DEFINE_SHOULD_BE_EXPOSED + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 0000000..132f508 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_PIE_IS_TASTY + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 0000000..58650ec --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,14 @@ + + + + + + Regress.FOO_SUCCESS_INT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page index 09cd98f..ee97008 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page @@ -1,31 +1,25 @@ - - - + Regress.FooASingle - - - - - - - - + + <code>FooASingle.FOO_SOME_SINGLE_ENUM</code> - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page index 008a8f3..16ee99d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page @@ -1,24 +1,16 @@ - - - + Regress.FooAddressType - - - - - - - - + + <code>FooAddressType.INVALID</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page new file mode 100644 index 0000000..3bb9c25 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page @@ -0,0 +1,18 @@ + + + + + x + + Regress.FooBRect.x + +FooBRect.x: Number(gdouble) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page new file mode 100644 index 0000000..6a233fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page @@ -0,0 +1,18 @@ + + + + + y + + Regress.FooBRect.y + +FooBRect.y: Number(gdouble) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page index 9091617..7e5ba37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ b2 - Regress.FooBRect.prototype.add - - -function add(b2:Regress.FooBRect):void { + +function add(b2: Regress.FooBRect): void { // Gjs wrapper for regress_foo_brect_add() } - + + - - - - - - <code>b2</code> @@ -41,6 +33,4 @@ function add(b2:Regress.FooBRect):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page index 2d2b574..f09ba87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,23 @@ regress_foo_brect_new - Number + Number(gdouble) x - Number + Number(gdouble) y - Regress.FooBRect.new - - -function new(x:Number, y:Number):Regress.FooBRect { + +function new(x: Number(gdouble), y: Number(gdouble)): Regress.FooBRect { // Gjs wrapper for regress_foo_brect_new() } - + + - - - - - - <code>x</code> @@ -53,6 +45,4 @@ function new(x:Number, y:Number):Regress.FooBRect { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page index fd1e9d6..81db692 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page @@ -1,25 +1,43 @@ - - - + Regress.FooBRect - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooBRect = new Regress.FooBRect({ + x: value + y: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page index 7d82f4f..33ec70a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_foo_bunion_get_contained_type - Regress.FooBUnion.prototype.get_contained_type - - -function get_contained_type():Number { + +function get_contained_type(): Number(gint) { // Gjs wrapper for regress_foo_bunion_get_contained_type() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function get_contained_type():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page index e16397c..da064a6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_bunion_new - Regress.FooBUnion.new - - -function new():Regress.FooBUnion { + +function new(): Regress.FooBUnion { // Gjs wrapper for regress_foo_bunion_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.FooBUnion { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page index 8644d96..a5ef038 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page @@ -1,25 +1,40 @@ - - - + Regress.FooBUnion - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooBUnion = new Regress.FooBUnion(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page index 896d02a..c5d4dac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_foo_boxed_method - Regress.FooBoxed.prototype.method - - -function method():void { + +function method(): void { // Gjs wrapper for regress_foo_boxed_method() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page index 67b1c4f..ab3a533 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_boxed_new - Regress.FooBoxed.new - - -function new():Regress.FooBoxed { + +function new(): Regress.FooBoxed { // Gjs wrapper for regress_foo_boxed_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.FooBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page index bca1f99..d7e24e2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page @@ -1,25 +1,40 @@ - - - + Regress.FooBoxed - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooBoxed = new Regress.FooBoxed(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page index 0b4f9e5..6e28c73 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooBuffer - const Regress = imports.gi.Regress; -let foo_buffer = new Regress.FooBuffer(); +let fooBuffer = new Regress.FooBuffer(); - - - - - - + Hierarchy @@ -38,8 +30,11 @@ let foo_buffer = new Regress.FooBuffer(); - - + + Constructors + @@ -48,7 +43,7 @@ let foo_buffer = new Regress.FooBuffer(); - Functions + Static Functions Properties @@ -59,8 +54,10 @@ let foo_buffer = new Regress.FooBuffer(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page index 871ec7a..273d069 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_foo_buffer_some_method - Regress.FooBuffer.prototype.some_method - - -function some_method():void { + +function some_method(): void { // Gjs wrapper for regress_foo_buffer_some_method() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page index 52feda2..697eab7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page @@ -1,25 +1,37 @@ - - - + Regress.FooCallback - - - - - - - - - - - + +function onFooCallback(regress_foo: Regress.FooObject, b: Boolean, data: void): Boolean { +} + + + + + +<code>regress_foo</code> + + + +<code>b</code> + + + +<code>data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page index 0b1b6b8..734f2ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_foo_dbus_data_method - Regress.FooDBusData.prototype.method - - -function method():void { + +function method(): void { // Gjs wrapper for regress_foo_dbus_data_method() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page index b4eaead..60ef872 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page @@ -1,25 +1,40 @@ - - - + Regress.FooDBusData - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooDBusData = new Regress.FooDBusData(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page index 00169aa..2d36462 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page @@ -1,24 +1,16 @@ - - - + Regress.FooEnumFullname - - - - - - - - + + <code>FooEnumFullname.ONE</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page index d2b41e6..fb10ef7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page @@ -1,24 +1,16 @@ - - - + Regress.FooEnumNoType - - - - - - - - + + <code>FooEnumNoType.UN</code> @@ -37,7 +29,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page index e3240c1..c5c166d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + - Number + Number(gint) regress_foo_enum_type_method @@ -18,22 +17,15 @@ regress_foo_enum - - method - - -function method(regress_foo_enum:Regress.FooEnumType):Number { + Regress.FooEnumType.method + +function method(regress_foo_enum: Regress.FooEnumType): Number(gint) { // Gjs wrapper for regress_foo_enum_type_method() } - + + - - - - - - <code>regress_foo_enum</code> @@ -45,6 +37,4 @@ function method(regress_foo_enum:Regress.FooEnumType):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page index c3ff89b..1a92059 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page @@ -1,24 +1,16 @@ - - - + Regress.FooEnumType - - - - - - - - + + <code>FooEnumType.ALPHA</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page index 4e42fde..d5c274b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + Regress.FooEnumType regress_foo_enum_type_returnv - Number + Number(gint) x - - returnv - - -function returnv(x:Number):Regress.FooEnumType { + Regress.FooEnumType.returnv + +function returnv(x: Number(gint)): Regress.FooEnumType { // Gjs wrapper for regress_foo_enum_type_returnv() } - + + - - - - - - <code>x</code> @@ -45,6 +37,4 @@ function returnv(x:Number):Regress.FooEnumType { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page index 8c0b6a2..ef47486 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page @@ -1,24 +1,16 @@ - - - + Regress.FooError - - - - - - - - + + <code>FooError.GOOD</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page index ed02376..794fbb5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_foo_error_quark - - quark - - -function quark():GLib.Quark { + Regress.FooError.quark + +function quark(): GLib.Quark { // Gjs wrapper for regress_foo_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page index ce36830..8bd91a3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page @@ -1,25 +1,40 @@ - - - + Regress.FooEvent - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooEvent = new Regress.FooEvent(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page new file mode 100644 index 0000000..e6cba87 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page @@ -0,0 +1,18 @@ + + + + + send_event + + Regress.FooEventAny.send_event + +FooEventAny.send_event: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page index 562ec03..110f36d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page @@ -1,25 +1,42 @@ - - - + Regress.FooEventAny - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooEventAny = new Regress.FooEventAny({ + send_event: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page new file mode 100644 index 0000000..d8ef3dc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page @@ -0,0 +1,18 @@ + + + + + count + + Regress.FooEventExpose.count + +FooEventExpose.count: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page new file mode 100644 index 0000000..19d36c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page @@ -0,0 +1,18 @@ + + + + + send_event + + Regress.FooEventExpose.send_event + +FooEventExpose.send_event: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page index 0000add..4e6d7f0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page @@ -1,25 +1,43 @@ - - - + Regress.FooEventExpose - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooEventExpose = new Regress.FooEventExpose({ + send_event: value + count: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page index 53539d4..d9b2cc7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page @@ -1,25 +1,33 @@ - - - + Regress.FooFlagsNoType - - - - - - - - - - - + + + + +<code>FooFlagsNoType.ETT</code> + + + +<code>FooFlagsNoType.TVA</code> + + + +<code>FooFlagsNoType.FYRA</code> + + + + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page index 2b4afeb..ec6f34c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page @@ -1,25 +1,33 @@ - - - + Regress.FooFlagsType - - - - - - - - - - - + + + + +<code>FooFlagsType.FIRST</code> + + + +<code>FooFlagsType.SECOND</code> + + + +<code>FooFlagsType.THIRD</code> + + + + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page new file mode 100644 index 0000000..f50e634 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page @@ -0,0 +1,18 @@ + + + + + regress_foo + + Regress.FooForeignStruct.regress_foo + +FooForeignStruct.regress_foo: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page index 1a61cfb..313f3ec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_foreign_struct_copy - Regress.FooForeignStruct.prototype.copy - - -function copy():Regress.FooForeignStruct { + +function copy(): Regress.FooForeignStruct { // Gjs wrapper for regress_foo_foreign_struct_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.FooForeignStruct { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page index 814eef3..7040d19 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_foreign_struct_new - Regress.FooForeignStruct.new - - -function new():Regress.FooForeignStruct { + +function new(): Regress.FooForeignStruct { // Gjs wrapper for regress_foo_foreign_struct_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.FooForeignStruct { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page index 312994a..8689226 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page @@ -1,25 +1,42 @@ - - - + Regress.FooForeignStruct - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooForeignStruct = new Regress.FooForeignStruct({ + regress_foo: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page index 17f6ec9..25f1709 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooInterface::do_regress_foo - - -function vfunc_do_regress_foo(x:Number):void { + +function vfunc_do_regress_foo(x: Number(gint)): void { } - + + - - - - - - <code>x</code> @@ -30,6 +22,4 @@ function vfunc_do_regress_foo(x:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page index 993998e..4fda50e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_interface_do_regress_foo - Number + Number(gint) x - Regress.FooInterface.prototype.do_regress_foo - - -function do_regress_foo(x:Number):void { + +function do_regress_foo(x: Number(gint)): void { // Gjs wrapper for regress_foo_interface_do_regress_foo() } - + + - - - - - - <code>x</code> @@ -41,6 +33,4 @@ function do_regress_foo(x:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page index 83ae1d0..d5db2a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -1,39 +1,34 @@ - - - + Regress.FooInterface - const Regress = imports.gi.Regress; let foo_interface = new Regress.FooInterface(); - - - - - - + - Hierarchy - - - Regress.FooInterface - - + Prerequisites +

FooInterface requires GObject.Object

+ + + Known Implementations +

FooInterface is implemented by FooBuffer, FooObject and FooSubobject

 - - + + Constructors + @@ -42,7 +37,7 @@ let foo_interface = new Regress.FooInterface(); - Functions + Static Functions Properties @@ -53,8 +48,10 @@ let foo_interface = new Regress.FooInterface(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page index d38a448..6915fcc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_interface_static_method - Number + Number(gint) x - - static_method - - -function static_method(x:Number):void { + Regress.FooInterface.static_method + +function static_method(x: Number(gint)): void { // Gjs wrapper for regress_foo_interface_static_method() } - + + - - - - - - <code>x</code> @@ -41,6 +33,4 @@ function static_method(x:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page index 4bdaf37..7c05893 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page @@ -6,34 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObject::read_fn - - -function vfunc_read_fn(offset:Number, length:Number):void { + +function vfunc_read_fn(offset: Number(gint), length: Number(gint)): void { } - + +

Read some stuff.

- -

Read some stuff.

- - - - <code>offset</code> -

offset

+

offset

 <code>length</code> -

length

+

length

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index 6e5657d..92f2c60 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -6,26 +6,18 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - signal - Regress.FooObject::signal - - -function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; - + +connect('signal', function (fooObject, object: GObject.Object, p0: void, ): String); + + - - - - - - -<code>foo_object</code> +<code>fooObject</code>

instance of that is emitting the signal

 @@ -42,6 +34,4 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page index a738fdd..47e9002 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string - - Regress.FooObject:string - - -"string" String : Read / Write / Construct - + Regress.FooObject.string + +FooObject.string: String (Read / Write / Construct) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page index d2ccd86..327a02d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObject::virtual_method - - -function vfunc_virtual_method(first_param:Number):Boolean { + +function vfunc_virtual_method(first_param: Number(gint)): Boolean { } - + + - - - - - - <code>first_param</code> @@ -34,6 +26,4 @@ function vfunc_virtual_method(first_param:Number):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page index 83fec18..ba829fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ obj - - a_global_method - - -function a_global_method(obj:Utility.Object):void { + Regress.FooObject.a_global_method + +function a_global_method(obj: Utility.Object): void { // Gjs wrapper for regress_foo_object_a_global_method() } - + + - - - - - - <code>obj</code> @@ -41,6 +33,4 @@ function a_global_method(obj:Utility.Object):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page index f1bfd92..9aa82be 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_object_append_new_stack_layer - Number + Number(gint) x - Regress.FooObject.prototype.append_new_stack_layer - - -function append_new_stack_layer(x:Number):Regress.FooOtherObject { + +function append_new_stack_layer(x: Number(gint)): Regress.FooOtherObject { // Gjs wrapper for regress_foo_object_append_new_stack_layer() } - + +

This shouldn't be scanned as a constructor.

- -

This shouldn't be scanned as a constructor.

- - - - <code>x</code> @@ -45,6 +37,4 @@ function append_new_stack_layer(x:Number):Regress.FooOtherObject { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page index d74f95b..83aa735 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_object_dup_name - Regress.FooObject.prototype.dup_name - - -function dup_name():String { + +function dup_name(): String { // Gjs wrapper for regress_foo_object_dup_name() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function dup_name():String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page index 7da1b86..bd806bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_foo_object_external_type - Regress.FooObject.prototype.external_type - - -function external_type():Utility.Object { + +function external_type(): Utility.Object { // Gjs wrapper for regress_foo_object_external_type() } - + + - - - - - - <code>Returns</code> -

null always

+

null always

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page index 8ab8654..63fa575 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,21 @@ regress_foo_object_get_default - - get_default - - -function get_default():Regress.FooSubobject { + Regress.FooObject.get_default + +function get_default(): Regress.FooSubobject { // Gjs wrapper for regress_foo_object_get_default() } - - - -

This function is intended to match clutter_stage_get_default which + +

This function is intended to match clutter_stage_get_default which uses a C sugar return type.

- - - - + <code>Returns</code> -

The global

+

The global

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page index b9c69d2..00b4445 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_object_get_name - Regress.FooObject.prototype.get_name - - -function get_name():String { + +function get_name(): String { // Gjs wrapper for regress_foo_object_get_name() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function get_name():String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page index 3209f20..a5cad51 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ glyph - Regress.FooObject.prototype.handle_glyph - - -function handle_glyph(glyph:Utility.Glyph):void { + +function handle_glyph(glyph: Utility.Glyph): void { // Gjs wrapper for regress_foo_object_handle_glyph() } - + + - - - - - - <code>glyph</code> @@ -41,6 +33,4 @@ function handle_glyph(glyph:Utility.Glyph):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page index f42e16b..61c1a7f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_object_is_it_time_yet - Number + Number(glong) time - Regress.FooObject.prototype.is_it_time_yet - - -function is_it_time_yet(time:Number):void { + +function is_it_time_yet(time: Number(glong)): void { // Gjs wrapper for regress_foo_object_is_it_time_yet() } - + + - - - - - - <code>time</code> @@ -41,6 +33,4 @@ function is_it_time_yet(time:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page index fa40bfc..5411fde 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_object_new - Regress.FooObject.new - - -function new():Regress.FooObject { + +function new(): Regress.FooObject { // Gjs wrapper for regress_foo_object_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.FooObject { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page index 0323a1b..7cc20b9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_object_new_as_super - Regress.FooObject.new_as_super - - -function new_as_super():GObject.Object { + +function new_as_super(): GObject.Object { // Gjs wrapper for regress_foo_object_new_as_super() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new_as_super():GObject.Object { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page index 1cbea89..723e8e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObject - const Regress = imports.gi.Regress; -let foo_object = new Regress.FooObject({ +let fooObject = new Regress.FooObject({ hidden: value, string: value, }); - - - - - - + Hierarchy @@ -38,8 +30,11 @@ let foo_object = new Regress.FooObject({ - - + + Constructors + @@ -48,7 +43,7 @@ let foo_object = new Regress.FooObject({ - Functions + Static Functions Properties @@ -59,8 +54,10 @@ let foo_object = new Regress.FooObject({ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page index 78bdb64..f4224db 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,41 +13,32 @@ regress_foo_object_read - Number + Number(gint) offset - Number + Number(gint) length - Regress.FooObject.prototype.read - - -function read(offset:Number, length:Number):void { + +function read(offset: Number(gint), length: Number(gint)): void { // Gjs wrapper for regress_foo_object_read() } - + +

Read some stuff.

- -

Read some stuff.

- - - - <code>offset</code> -

offset

+

offset

 <code>length</code> -

length

+

length

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page index c4c1045..fe9c952 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_foo_object_static_meth - - static_meth - - -function static_meth():Number { + Regress.FooObject.static_meth + +function static_meth(): Number(gint) { // Gjs wrapper for regress_foo_object_static_meth() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function static_meth():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page index 1f50921..f16c04d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,23 @@ regress_foo_object_various - gpointer + void data - GType + GObject.Type some_type - Regress.FooObject.prototype.various - - -function various(data:gpointer, some_type:GType):void { + +function various(data: void, some_type: GObject.Type): void { // Gjs wrapper for regress_foo_object_various() } - + + - - - - - - <code>data</code> @@ -49,6 +41,4 @@ function various(data:gpointer, some_type:GType):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page index 3467ca2..8a60024 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_object_virtual_method - Number + Number(gint) first_param - Regress.FooObject.prototype.virtual_method - - -function virtual_method(first_param:Number):Boolean { + +function virtual_method(first_param: Number(gint)): Boolean { // Gjs wrapper for regress_foo_object_virtual_method() } - + + - - - - - - <code>first_param</code> @@ -45,6 +37,4 @@ function virtual_method(first_param:Number):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page index 44a63ab..fecc554 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObjectCookie - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page index 0916a44..524f761 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooOtherObject - const Regress = imports.gi.Regress; -let foo_other_object = new Regress.FooOtherObject(); +let fooOtherObject = new Regress.FooOtherObject(); - - - - - - + Hierarchy @@ -35,8 +27,11 @@ let foo_other_object = new Regress.FooOtherObject(); - - + + Constructors + @@ -45,7 +40,7 @@ let foo_other_object = new Regress.FooOtherObject(); - Functions + Static Functions Properties @@ -56,8 +51,10 @@ let foo_other_object = new Regress.FooOtherObject(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page new file mode 100644 index 0000000..bd583c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page @@ -0,0 +1,18 @@ + + + + + height + + Regress.FooRectangle.height + +FooRectangle.height: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page new file mode 100644 index 0000000..bc3d3de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page @@ -0,0 +1,18 @@ + + + + + width + + Regress.FooRectangle.width + +FooRectangle.width: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page new file mode 100644 index 0000000..5e2c251 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page @@ -0,0 +1,18 @@ + + + + + x + + Regress.FooRectangle.x + +FooRectangle.x: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page new file mode 100644 index 0000000..5096547 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page @@ -0,0 +1,18 @@ + + + + + y + + Regress.FooRectangle.y + +FooRectangle.y: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page index 276450e..a3978c4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,20 @@ r2 - Regress.FooRectangle.prototype.add - - -function add(r2:Regress.FooRectangle):void { + +function add(r2: Regress.FooRectangle): void { // Gjs wrapper for regress_foo_rectangle_add() } - + + - - - - - - <code>r2</code> -

source rectangle

+

source rectangle

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page index 0cfef62..0b6e46d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page @@ -1,25 +1,45 @@ - - - + Regress.FooRectangle - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooRectangle = new Regress.FooRectangle({ + x: value + y: value + width: value + height: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page index 8a08c9a..711561c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page @@ -1,24 +1,16 @@ - - - + Regress.FooStackLayer - - - - - - - - + + <code>FooStackLayer.DESKTOP</code> @@ -57,7 +49,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page new file mode 100644 index 0000000..5a2946e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page @@ -0,0 +1,18 @@ + + + + + member + + Regress.FooStruct.member + +FooStruct.member: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page new file mode 100644 index 0000000..665bf16 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page @@ -0,0 +1,18 @@ + + + + + priv + + Regress.FooStruct.priv + +FooStruct.priv: Regress.FooStructPrivate (Read) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page index 84f5d19..0571517 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page @@ -1,25 +1,42 @@ - - - + Regress.FooStruct - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooStruct = new Regress.FooStruct({ + member: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index 961a22e..7f3f1f8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - destroy-event - Regress.FooSubInterface::destroy-event - - -function callback(foo_sub_interface, ):void; - + +connect('destroy-event', function (fooSubInterface, ): void); + + - - - - - - -<code>foo_sub_interface</code> +<code>fooSubInterface</code>

instance of that is emitting the signal

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page index 5abc585..0433a7f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page @@ -6,26 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::destroy_event - - -function vfunc_destroy_event():void { + +function vfunc_destroy_event(): void { } - + + - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page index 8164924..90b6bf4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page @@ -6,26 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::do_bar - - -function vfunc_do_bar():void { + +function vfunc_do_bar(): void { } - + + - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page index 4945c89..5bc8639 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::do_baz - - -function vfunc_do_baz(callback:GObject.Callback):void { + +function vfunc_do_baz(callback: GObject.Callback): void { } - + + - - - - - - <code>callback</code> @@ -30,6 +22,4 @@ function vfunc_do_baz(callback:GObject.Callback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page index a258a3e..aad9cf4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_foo_sub_interface_do_bar - Regress.FooSubInterface.prototype.do_bar - - -function do_bar():void { + +function do_bar(): void { // Gjs wrapper for regress_foo_sub_interface_do_bar() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page index b55a8d7..44cc71b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - Regress.FooSubInterface.prototype.do_baz - - -function do_baz(callback:GObject.Callback):void { + +function do_baz(callback: GObject.Callback): void { // Gjs wrapper for regress_foo_sub_interface_do_baz() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function do_baz(callback:GObject.Callback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page index 0694e3d..eae9fbd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -1,39 +1,34 @@ - - - + Regress.FooSubInterface - const Regress = imports.gi.Regress; let foo_sub_interface = new Regress.FooSubInterface(); - - - - - - + - Hierarchy - - - Regress.FooSubInterface - - + Prerequisites +

FooSubInterface requires Regress.FooInterface

+ + + Known Implementations +

None

 - - + + Constructors + @@ -42,7 +37,7 @@ let foo_sub_interface = new Regress.FooSubInterface(); - Functions + Static Functions Properties @@ -53,8 +48,10 @@ let foo_sub_interface = new Regress.FooSubInterface(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page index 08cb116..0e39571 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_subobject_new - Regress.FooSubobject.new - - -function new():Regress.FooSubobject { + +function new(): Regress.FooSubobject { // Gjs wrapper for regress_foo_subobject_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.FooSubobject { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page index f9cac64..3936b17 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubobject - const Regress = imports.gi.Regress; -let foo_subobject = new Regress.FooSubobject(); +let fooSubobject = new Regress.FooSubobject(); - - - - - - + Hierarchy @@ -38,8 +30,11 @@ let foo_subobject = new Regress.FooSubobject(); - - + + Constructors + @@ -48,7 +43,7 @@ let foo_subobject = new Regress.FooSubobject(); - Functions + Static Functions Properties @@ -59,8 +54,10 @@ let foo_subobject = new Regress.FooSubobject(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page new file mode 100644 index 0000000..ba23b2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page @@ -0,0 +1,18 @@ + + + + + data + + Regress.FooThingWithArray.data + +FooThingWithArray.data: Number(guint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page new file mode 100644 index 0000000..0ff4621 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page @@ -0,0 +1,18 @@ + + + + + lines + + Regress.FooThingWithArray.lines + +FooThingWithArray.lines: Array(Number(gchar)) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page new file mode 100644 index 0000000..bae7f5a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page @@ -0,0 +1,18 @@ + + + + + x + + Regress.FooThingWithArray.x + +FooThingWithArray.x: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page new file mode 100644 index 0000000..c1812ca --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page @@ -0,0 +1,18 @@ + + + + + y + + Regress.FooThingWithArray.y + +FooThingWithArray.y: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page index 430dce7..2254edc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page @@ -1,25 +1,45 @@ - - - + Regress.FooThingWithArray - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooThingWithArray = new Regress.FooThingWithArray({ + x: value + y: value + lines: value + data: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page index 9746f17..a824d6f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page @@ -1,25 +1,40 @@ - - - + Regress.FooUnion - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooUnion = new Regress.FooUnion(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page new file mode 100644 index 0000000..325c7ec --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page @@ -0,0 +1,18 @@ + + + + + bar + + Regress.FooUtilityStruct.bar + +FooUtilityStruct.bar: Utility.Struct (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page index 2b94f69..6d6b633 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page @@ -1,25 +1,42 @@ - - - + Regress.FooUtilityStruct - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let fooUtilityStruct = new Regress.FooUtilityStruct({ + bar: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page index c389ef0..19bee42 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooXEvent - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page new file mode 100644 index 0000000..e9876e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_ELSE + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page new file mode 100644 index 0000000..bfef183 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_IFDEF + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 0000000..8c16dd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 0000000..3b0d6f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANTA + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 0000000..cdce607 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.G_GINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page new file mode 100644 index 0000000..e0512ab --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 0000000..85fe96e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.LONG_STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page new file mode 100644 index 0000000..1a9e2de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page @@ -0,0 +1,20 @@ + + + + + attributes + + Regress.LikeGnomeKeyringPasswordSchema.attributes + +LikeGnomeKeyringPasswordSchema.attributes: Array(void) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page new file mode 100644 index 0000000..bcca817 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page @@ -0,0 +1,20 @@ + + + + + dummy + + Regress.LikeGnomeKeyringPasswordSchema.dummy + +LikeGnomeKeyringPasswordSchema.dummy: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page new file mode 100644 index 0000000..4d64ad8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page @@ -0,0 +1,20 @@ + + + + + dummy2 + + Regress.LikeGnomeKeyringPasswordSchema.dummy2 + +LikeGnomeKeyringPasswordSchema.dummy2: Number(gdouble) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 44a946e..fc44fcc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -1,25 +1,44 @@ - - - + Regress.LikeGnomeKeyringPasswordSchema - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let likeGnomeKeyringPasswordSchema = new Regress.LikeGnomeKeyringPasswordSchema({ + dummy: value + attributes: value + dummy2: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page new file mode 100644 index 0000000..bf777c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page @@ -0,0 +1,18 @@ + + + + + name + + Regress.LikeXklConfigItem.name + +LikeXklConfigItem.name: Array(Number(gchar)) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page index fb4831f..5399d10 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page @@ -1,25 +1,42 @@ - - - + Regress.LikeXklConfigItem - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let likeXklConfigItem = new Regress.LikeXklConfigItem({ + name: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page index f81bc5d..2e0b9e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ name - Regress.LikeXklConfigItem.prototype.set_name - - -function set_name(name:String):void { + +function set_name(name: String): void { // Gjs wrapper for regress_like_xkl_config_item_set_name() } - + + - - - - - - <code>name</code> @@ -41,6 +33,4 @@ function set_name(name:String):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page new file mode 100644 index 0000000..91d7ce5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MAXUINT64 + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page new file mode 100644 index 0000000..1531540 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MININT64 + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 0000000..29e7314 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,14 @@ + + + + + + Regress.Mixed_Case_Constant + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 0000000..a0aad76 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page index f66aee4..1acd4d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.PtrArrayAlias - - - -

Typedef'd GPtrArray for some reason

- - - - - - - +

Typedef'd GPtrArray for some reason

+ diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 0000000..be1d6e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page index f31b58e..18c41d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page @@ -1,24 +1,16 @@ - - - + Regress.TestABCError - - - - - - - - + + <code>TestABCError.CODE1</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page index 72f9adc..1701f5a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_abc_error_quark - - quark - - -function quark():GLib.Quark { + Regress.TestABCError.quark + +function quark(): GLib.Quark { // Gjs wrapper for regress_test_abc_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page new file mode 100644 index 0000000..856aa6f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page @@ -0,0 +1,18 @@ + + + + + nested_a + + Regress.TestBoxed.nested_a + +TestBoxed.nested_a: Regress.TestSimpleBoxedA (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page new file mode 100644 index 0000000..54bf659 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page @@ -0,0 +1,18 @@ + + + + + priv + + Regress.TestBoxed.priv + +TestBoxed.priv: Regress.TestBoxedPrivate (Read) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page new file mode 100644 index 0000000..226cf95 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestBoxed.some_int8 + +TestBoxed.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page index 751ce88..0aee5d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_boxed_copy - Regress.TestBoxed.prototype.copy - - -function copy():Regress.TestBoxed { + +function copy(): Regress.TestBoxed { // Gjs wrapper for regress_test_boxed_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page index 5c23da2..257a9f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ other - Regress.TestBoxed.prototype.equals - - -function equals(other:Regress.TestBoxed):Boolean { + +function equals(other: Regress.TestBoxed): Boolean { // Gjs wrapper for regress_test_boxed_equals() } - + + - - - - - - <code>other</code> @@ -45,6 +37,4 @@ function equals(other:Regress.TestBoxed):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page index 88e33de..d93d80d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_boxed_new - Regress.TestBoxed.new - - -function new():Regress.TestBoxed { + +function new(): Regress.TestBoxed { // Gjs wrapper for regress_test_boxed_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.TestBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page index 801bad2..baf1bd7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_boxed_new_alternative_constructor1 - Number + Number(gint) i - Regress.TestBoxed.new_alternative_constructor1 - - -function new_alternative_constructor1(i:Number):Regress.TestBoxed { + +function new_alternative_constructor1(i: Number(gint)): Regress.TestBoxed { // Gjs wrapper for regress_test_boxed_new_alternative_constructor1() } - + + - - - - - - <code>i</code> @@ -45,6 +37,4 @@ function new_alternative_constructor1(i:Number):Regress.TestBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page index 23fa672..eeb5c3c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,23 @@ regress_test_boxed_new_alternative_constructor2 - Number + Number(gint) i - Number + Number(gint) j - Regress.TestBoxed.new_alternative_constructor2 - - -function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { + +function new_alternative_constructor2(i: Number(gint), j: Number(gint)): Regress.TestBoxed { // Gjs wrapper for regress_test_boxed_new_alternative_constructor2() } - + + - - - - - - <code>i</code> @@ -53,6 +45,4 @@ function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page index 8f0c2d2..55b17a5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ s - Regress.TestBoxed.new_alternative_constructor3 - - -function new_alternative_constructor3(s:String):Regress.TestBoxed { + +function new_alternative_constructor3(s: String): Regress.TestBoxed { // Gjs wrapper for regress_test_boxed_new_alternative_constructor3() } - + + - - - - - - <code>s</code> @@ -45,6 +37,4 @@ function new_alternative_constructor3(s:String):Regress.TestBoxed { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page index baa423f..d3e41a6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page @@ -1,25 +1,43 @@ - - - + Regress.TestBoxed - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testBoxed = new Regress.TestBoxed({ + some_int8: value + nested_a: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page new file mode 100644 index 0000000..ff167f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestBoxedB.some_int8 + +TestBoxedB.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page new file mode 100644 index 0000000..8d48a34 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page @@ -0,0 +1,18 @@ + + + + + some_long + + Regress.TestBoxedB.some_long + +TestBoxedB.some_long: Number(glong) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page index 06bccc8..ecf95e3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_boxed_b_copy - Regress.TestBoxedB.prototype.copy - - -function copy():Regress.TestBoxedB { + +function copy(): Regress.TestBoxedB { // Gjs wrapper for regress_test_boxed_b_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxedB { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page index e71147a..3295300 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,30 +13,23 @@ regress_test_boxed_b_new - gint8 + Number(gint8) some_int8 - Number + Number(glong) some_long - Regress.TestBoxedB.new - - -function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { + +function new(some_int8: Number(gint8), some_long: Number(glong)): Regress.TestBoxedB { // Gjs wrapper for regress_test_boxed_b_new() } - + + - - - - - - <code>some_int8</code> @@ -53,6 +45,4 @@ function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page index 0e39780..a8a1240 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page @@ -1,25 +1,43 @@ - - - + Regress.TestBoxedB - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testBoxedB = new Regress.TestBoxedB({ + some_int8: value + some_long: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page new file mode 100644 index 0000000..1fdb39b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page @@ -0,0 +1,18 @@ + + + + + another_thing + + Regress.TestBoxedC.another_thing + +TestBoxedC.another_thing: Number(guint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page new file mode 100644 index 0000000..b78ee29 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page @@ -0,0 +1,18 @@ + + + + + refcount + + Regress.TestBoxedC.refcount + +TestBoxedC.refcount: Number(guint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page index 542c93e..62b63cd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_boxed_c_new - Regress.TestBoxedC.new - - -function new():Regress.TestBoxedC { + +function new(): Regress.TestBoxedC { // Gjs wrapper for regress_test_boxed_c_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.TestBoxedC { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page index 18b77d9..82d4fcd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page @@ -1,25 +1,43 @@ - - - + Regress.TestBoxedC - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testBoxedC = new Regress.TestBoxedC({ + refcount: value + another_thing: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page index 7b51fd5..519d154 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_boxed_d_copy - Regress.TestBoxedD.prototype.copy - - -function copy():Regress.TestBoxedD { + +function copy(): Regress.TestBoxedD { // Gjs wrapper for regress_test_boxed_d_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxedD { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page index 82df904..fd4fb6f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_boxed_d_free - Regress.TestBoxedD.prototype.free - - -function free():void { + +function free(): void { // Gjs wrapper for regress_test_boxed_d_free() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page index 0f7923e..37d6d01 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_boxed_d_get_magic - Regress.TestBoxedD.prototype.get_magic - - -function get_magic():Number { + +function get_magic(): Number(gint) { // Gjs wrapper for regress_test_boxed_d_get_magic() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function get_magic():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page index cfd50c5..eecc4d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,26 +17,19 @@ a_string - Number + Number(gint) a_int - Regress.TestBoxedD.new - - -function new(a_string:String, a_int:Number):Regress.TestBoxedD { + +function new(a_string: String, a_int: Number(gint)): Regress.TestBoxedD { // Gjs wrapper for regress_test_boxed_d_new() } - + + - - - - - - <code>a_string</code> @@ -53,6 +45,4 @@ function new(a_string:String, a_int:Number):Regress.TestBoxedD { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page index 995e80d..60b0362 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page @@ -1,25 +1,40 @@ - - - + Regress.TestBoxedD - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testBoxedD = new Regress.TestBoxedD(a_string: String, a_int: Number(gint)); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page index bed84d5..13e80ca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallback - - - - - - - - - - - + +function onTestCallback(): Number(gint) { +} + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page index 7d3f7b8..56e48b1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page @@ -1,25 +1,33 @@ - - - + Regress.TestCallbackArray - - - - - - - - - - - + +function onTestCallbackArray(one: Array(Number(gint)), two: Array(String)): Number(gint) { +} + + + + + +<code>one</code> + + + +<code>two</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page index 0b8fca1..edd33f3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page @@ -1,25 +1,37 @@ - - - + Regress.TestCallbackFull - - - - - - - - - - - + +function onTestCallbackFull(foo: Number(gint), bar: Number(gdouble), path: String): Number(gint) { +} + + + + + +<code>foo</code> +

the investment rate

+ + +<code>bar</code> +

how much money

+ + +<code>path</code> +

Path to file

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page index 804382f..a5a59cc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallbackGError - - - - - - - - - - - + +function onTestCallbackGError(error: GLib.Error): void { +} + + + + + +<code>error</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page index 06ebb70..8f93a2a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallbackHashtable - - - - - - - - - - - + +function onTestCallbackHashtable(data: {String: Number(gint)}): void { +} + + + + + +<code>data</code> +

a hash table; will be modified

+ + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page index 28b21ea..0df5092 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallbackOwnedGError - - - - - - - - - - - + +function onTestCallbackOwnedGError(error: GLib.Error): void { +} + + + + + +<code>error</code> +

GError instance; must be freed by the callback

+ + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page index 286c830..469aa40 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallbackUserData - - - - - - - - - - - + +function onTestCallbackUserData(): Number(gint) { +} + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page index 589059d..1451c6d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page @@ -1,24 +1,16 @@ - - - + Regress.TestDEFError - - - - - - - - + + <code>TestDEFError.CODE0</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page index 814b474..d7ac407 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page @@ -1,32 +1,24 @@ - - - + Regress.TestEnum - - - -

By purpose, not all members have documentation

- - - - +

By purpose, not all members have documentation

+ <code>TestEnum.VALUE1</code> -

value 1

+

value 1

 <code>TestEnum.VALUE2</code> -

value 2

+

value 2

 <code>TestEnum.VALUE3</code> @@ -37,7 +29,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page index b4dfb29..34e512d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page @@ -6,8 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + String @@ -18,22 +17,15 @@ e - - param - - -function param(e:Regress.TestEnum):String { + Regress.TestEnum.param + +function param(e: Regress.TestEnum): String { // Gjs wrapper for regress_test_enum_param() } - + + - - - - - - <code>e</code> @@ -45,6 +37,4 @@ function param(e:Regress.TestEnum):String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page index 5c0c559..ff5505c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page @@ -1,24 +1,16 @@ - - - + Regress.TestEnumNoGEnum - - - - - - - - + + <code>TestEnumNoGEnum.EVALUE1</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page index df3cfa1..75da794 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page @@ -1,24 +1,16 @@ - - - + Regress.TestEnumUnsigned - - - - - - - - + + <code>TestEnumUnsigned.VALUE1</code> @@ -29,7 +21,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page index d6a6ebb..0e6c781 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page @@ -1,24 +1,16 @@ - - - + Regress.TestError - - - - - - - - + + <code>TestError.CODE1</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page index f849bfe..d143125 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_error_quark - - quark - - -function quark():GLib.Quark { + Regress.TestError.quark + +function quark(): GLib.Quark { // Gjs wrapper for regress_test_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page new file mode 100644 index 0000000..f9d241c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestExternallyDefinedCallback.page @@ -0,0 +1,29 @@ + + + + + + Regress.TestExternallyDefinedCallback + +function onTestExternallyDefinedCallback(obj: Regress.TestObj, someint: Number(gint)): void { +} + + + + + +<code>obj</code> + + + +<code>someint</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page index d5bfeeb..f962b6a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page @@ -1,25 +1,33 @@ - - - + Regress.TestFlags - - - - - - - - - - - + + + + +<code>TestFlags.FLAG1</code> + + + +<code>TestFlags.FLAG2</code> + + + +<code>TestFlags.FLAG3</code> + + + + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page index 94c80cf..e12720e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_floating_new - Regress.TestFloating.new - - -function new():Regress.TestFloating { + +function new(): Regress.TestFloating { // Gjs wrapper for regress_test_floating_new() } - + + - - - - - - <code>Returns</code> -

A new floating

+

A new floating

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page index 07ef3f2..d9918cc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFloating - const Regress = imports.gi.Regress; -let test_floating = new Regress.TestFloating(); +let testFloating = new Regress.TestFloating(); - - - - - - + Hierarchy @@ -38,8 +30,11 @@ let test_floating = new Regress.TestFloating(); - - + + Constructors + @@ -48,7 +43,7 @@ let test_floating = new Regress.TestFloating(); - Functions + Static Functions Properties @@ -59,8 +54,10 @@ let test_floating = new Regress.TestFloating(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page new file mode 100644 index 0000000..53d28b7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page @@ -0,0 +1,25 @@ + + + + + + Regress.TestFundamentalObject::copy + +function vfunc_copy(): Regress.TestFundamentalObject { +} + + + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page new file mode 100644 index 0000000..efe549b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page @@ -0,0 +1,21 @@ + + + + + + Regress.TestFundamentalObject::finalize + +function vfunc_finalize(): void { +} + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page index a8cb35a..8534fc4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalObject - const Regress = imports.gi.Regress; -let test_fundamental_object = new Regress.TestFundamentalObject(); +let testFundamentalObject = new Regress.TestFundamentalObject(); - - - - - - + Hierarchy @@ -32,8 +24,11 @@ let test_fundamental_object = new Regress.TestFundamentalObject(); - - + + Constructors + @@ -42,7 +37,7 @@ let test_fundamental_object = new Regress.TestFundamentalObject(); - Functions + Static Functions Properties @@ -53,8 +48,10 @@ let test_fundamental_object = new Regress.TestFundamentalObject(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page index b1c37ef..4dd081a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_fundamental_object_ref - Regress.TestFundamentalObject.prototype.ref - - -function ref():Regress.TestFundamentalObject { + +function ref(): Regress.TestFundamentalObject { // Gjs wrapper for regress_test_fundamental_object_ref() } - + + - - - - - - <code>Returns</code> -

A new

+

A new

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page index 758a30d..ba365e5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_fundamental_object_unref - Regress.TestFundamentalObject.prototype.unref - - -function unref():void { + +function unref(): void { // Gjs wrapper for regress_test_fundamental_object_unref() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page index 73a3328..c853dbb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -1,25 +1,29 @@ - - - + Regress.TestFundamentalObjectCopyFunction - - - - - - - - - - - + +function onTestFundamentalObjectCopyFunction(obj: Regress.TestFundamentalObject): Regress.TestFundamentalObject { +} + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page index df0e8fb..dc9edd7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -1,25 +1,25 @@ - - - + Regress.TestFundamentalObjectFinalizeFunction - - - - - - - - - - - + +function onTestFundamentalObjectFinalizeFunction(obj: Regress.TestFundamentalObject): void { +} + + + + + +<code>obj</code> + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page index c6a31f9..8a43ee2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -20,22 +19,15 @@ data - Regress.TestFundamentalSubObject.new - - -function new(data:String):Regress.TestFundamentalSubObject { + +function new(data: String): Regress.TestFundamentalSubObject { // Gjs wrapper for regress_test_fundamental_sub_object_new() } - + + - - - - - - <code>data</code> @@ -47,6 +39,4 @@ function new(data:String):Regress.TestFundamentalSubObject { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page index 619eb30..8de3d7c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalSubObject - const Regress = imports.gi.Regress; -let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); +let testFundamentalSubObject = new Regress.TestFundamentalSubObject(); - - - - - - + Hierarchy @@ -35,8 +27,11 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); - - + + Constructors + @@ -45,7 +40,7 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); - Functions + Static Functions Properties @@ -56,8 +51,10 @@ let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page index 176211b..86af902 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_inherit_drawable_do_foo - Number + Number(gint) x - Regress.TestInheritDrawable.prototype.do_foo - - -function do_foo(x:Number):void { + +function do_foo(x: Number(gint)): void { // Gjs wrapper for regress_test_inherit_drawable_do_foo() } - + + - - - - - - <code>x</code> @@ -41,6 +33,4 @@ function do_foo(x:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 038b73f..7dfeba5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_inherit_drawable_do_foo_maybe_throw - Number + Number(gint) x - Regress.TestInheritDrawable.prototype.do_foo_maybe_throw - - -function do_foo_maybe_throw(x:Number):void { + +function do_foo_maybe_throw(x: Number(gint)): void { // Gjs wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() } - + + - - - - - - <code>x</code> @@ -41,6 +33,4 @@ function do_foo_maybe_throw(x:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page index 9dd2cba..9a11c9e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,24 @@ regress_test_inherit_drawable_get_origin - Regress.TestInheritDrawable.prototype.get_origin - - -function get_origin():void { + +function get_origin(): [x: Number(gint), y: Number(gint)] { // Gjs wrapper for regress_test_inherit_drawable_get_origin() } - + + - - - - - - + +<code>x</code> + + + +<code>y</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page index 669ab1c..c4b6f95 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,24 @@ regress_test_inherit_drawable_get_size - Regress.TestInheritDrawable.prototype.get_size - - -function get_size():void { + +function get_size(): [width: Number(guint), height: Number(guint)] { // Gjs wrapper for regress_test_inherit_drawable_get_size() } - + + - - - - - - + +<code>width</code> + + + +<code>height</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page index 02fa064..27cb118 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestInheritDrawable - const Regress = imports.gi.Regress; -let test_inherit_drawable = new Regress.TestInheritDrawable(); +let testInheritDrawable = new Regress.TestInheritDrawable(); - - - - - - + Hierarchy @@ -35,8 +27,11 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); - - + + Constructors + @@ -45,7 +40,7 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); - Functions + Static Functions Properties @@ -56,8 +51,10 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page new file mode 100644 index 0000000..f5e3f31 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page @@ -0,0 +1,18 @@ + + + + + parent_class + + Regress.TestInheritPixmapObjectClass.parent_class + +TestInheritPixmapObjectClass.parent_class: Regress.TestInheritDrawableClass (Read) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page index 0df0396..5c17e82 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page @@ -1,25 +1,40 @@ - - - + Regress.TestInheritPixmapObjectClass - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testInheritPixmapObjectClass = new Regress.TestInheritPixmapObjectClass(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page index 4f39890..5fb58df 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -1,39 +1,34 @@ - - - + Regress.TestInterface - const Regress = imports.gi.Regress; let test_interface = new Regress.TestInterface(); - - - - - - + - Hierarchy - - - Regress.TestInterface - - + Prerequisites +

TestInterface requires GObject.Object

+ + + Known Implementations +

None

 - - + + Constructors + @@ -42,7 +37,7 @@ let test_interface = new Regress.TestInterface(); - Functions + Static Functions Properties @@ -53,8 +48,10 @@ let test_interface = new Regress.TestInterface(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index c2d87a4..0bdbbc0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - all - Regress.TestObj::all - - -function callback(test_obj, ):void; - + +connect('all', function (testObj, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page index 3febd77..5a1830e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj::allow_none_vfunc - - -function vfunc_allow_none_vfunc(two:Regress.TestObj):void { + +function vfunc_allow_none_vfunc(two: Regress.TestObj): void { } - + + - - - - - - <code>two</code> -

Another object

+

Another object

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page index f1f1b52..b279e01 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - bare - - Regress.TestObj:bare - - -"bare" GObject.Object : Read / Write - + Regress.TestObj.bare + +TestObj.bare: GObject.Object (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page index a392a77..411d2b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - boxed - - Regress.TestObj:boxed - - -"boxed" Regress.TestBoxed : Read / Write - + Regress.TestObj.boxed + +TestObj.boxed: Regress.TestBoxed (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index 8e5e2bf..9985e1d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - cleanup - Regress.TestObj::cleanup - - -function callback(test_obj, ):void; - + +connect('cleanup', function (testObj, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page new file mode 100644 index 0000000..682d7f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-complex_vfunc.page @@ -0,0 +1,25 @@ + + + + + + Regress.TestObj::complex_vfunc + +function vfunc_complex_vfunc(someint: Number(gint)): void { +} + + + + + +<code>someint</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page index 5e2df6b..0aafd80 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - double - - Regress.TestObj:double - - -"double" Number : Read / Write - + Regress.TestObj.double + +TestObj.double: Number(gdouble) (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index d0294e9..82850d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - first - Regress.TestObj::first - - -function callback(test_obj, ):void; - + +connect('first', function (testObj, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page index 0554ba8..9a320ed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - float - - Regress.TestObj:float - - -"float" Number : Read / Write - + Regress.TestObj.float + +TestObj.float: Number(gfloat) (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page index 6b222e4..82f59fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - gtype - - Regress.TestObj:gtype - - -"gtype" GType : Read / Write - + Regress.TestObj.gtype + +TestObj.gtype: GObject.Type (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page index 1d3c3c2..ed4abee 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table-old - - Regress.TestObj:hash-table-old - - -"hash-table-old" {String: gint8} : Read / Write - + Regress.TestObj.hash_table_old + +TestObj.hash_table_old: {String: Number(gint8)} (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page index f8d3441..e4f3a37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table - - Regress.TestObj:hash-table - - -"hash-table" {String: gint8} : Read / Write - + Regress.TestObj.hash_table + +TestObj.hash_table: {String: Number(gint8)} (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page index 0c3f4cc..04ef887 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - int - - Regress.TestObj:int - - -"int" Number : Read / Write - + Regress.TestObj.int + +TestObj.int: Number(gint) (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page index 9d8ea91..937dd7a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-old - - Regress.TestObj:list-old - - -"list-old" [String] : Read / Write - + Regress.TestObj.list_old + +TestObj.list_old: Array(String) (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page index 02638e9..49c1ec2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list - - Regress.TestObj:list - - -"list" [String] : Read / Write - + Regress.TestObj.list + +TestObj.list: Array(String) (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page index 1d83217..3c6cc7d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page @@ -6,29 +6,21 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj::matrix - - -function vfunc_matrix(somestr:String):Number { + +function vfunc_matrix(somestr: String): Number(gint) { } - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -36,6 +28,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page index c359b13..6af8b35 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -6,34 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-len-prop - Regress.TestObj::sig-with-array-len-prop - - -function callback(test_obj, arr:[Number], ):void; - + +connect('sig-with-array-len-prop', function (testObj, arr: Array(Number(guint)), ): void); + +

This test signal similar to GSettings::change-event

- -

This test signal similar to GSettings::change-event

- - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>arr</code> -

numbers, or null

+

numbers, or null

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index b1919f9..e3b1de6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -6,35 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-prop - Regress.TestObj::sig-with-array-prop - - -function callback(test_obj, arr:[Number], ):void; - - - -

This test signal is like TelepathyGlib's + +connect('sig-with-array-prop', function (testObj, arr: Array(Number(guint)), ): void); + +

This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed:

- - - - + -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>arr</code> -

numbers

+

numbers

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index 31b8ca3..42194fa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -6,34 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-foreign-struct - Regress.TestObj::sig-with-foreign-struct - - -function callback(test_obj, cr:cairo.Context, ):void; - + +connect('sig-with-foreign-struct', function (testObj, cr: cairo.Context, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>cr</code> -

A cairo context.

+

A cairo context.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index 137a413..14f7b2f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-hash-prop - Regress.TestObj::sig-with-hash-prop - - -function callback(test_obj, hash:{String: GObject.Value}, ):void; - - - -

This test signal is like TelepathyGlib's + +connect('sig-with-hash-prop', function (testObj, hash: {String: Any}, ): void); + +

This test signal is like TelepathyGlib's TpAccount::status-changed

- - - - + -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 @@ -35,6 +27,4 @@ function callback(test_obj, hash:{String: GObject.Value}, ):void; - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index 6c528c0..4743d22 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -6,32 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-int64-prop - Regress.TestObj::sig-with-int64-prop - - -function callback(test_obj, i:Number, ):Number; - - - -

You can use this with regress_test_obj_emit_sig_with_int64, or raise from + +connect('sig-with-int64-prop', function (testObj, i: Number(gint64), ): Number(gint64)); + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage.

- - - - + -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>i</code> -

an integer

+

an integer

 <code>Returns</code> @@ -39,6 +31,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index f724bcb..cc187f7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -6,34 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-intarray-ret - Regress.TestObj::sig-with-intarray-ret - - -function callback(test_obj, i:Number, ):[Number]; - + +connect('sig-with-intarray-ret', function (testObj, i: Number(gint), ): Array(Number(gint))); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>i</code> -

an integer

+

an integer

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index d7e15e0..5d230bd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -6,35 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-obj - Regress.TestObj::sig-with-obj - - -function callback(test_obj, obj:GObject.Object, ):void; - - - -

Test transfer none GObject as a param (tests refcounting). + +connect('sig-with-obj', function (testObj, obj: GObject.Object, ): void); + +

Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj

- - - - + -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>obj</code> -

A newly created RegressTestObj

+

A newly created RegressTestObj

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index a63e207..4a116ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -6,34 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-strv - Regress.TestObj::sig-with-strv - - -function callback(test_obj, strs:[String], ):void; - + +connect('sig-with-strv', function (testObj, strs: Array(String), ): void); + +

Test GStrv as a param.

- -

Test GStrv as a param.

- - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>strs</code> -

strings

+

strings

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 6fbf7a0..459ab4e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -6,32 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-uint64-prop - Regress.TestObj::sig-with-uint64-prop - - -function callback(test_obj, i:Number, ):Number; - - - -

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + +connect('sig-with-uint64-prop', function (testObj, i: Number(guint64), ): Number(guint64)); + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage.

- - - - + -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 <code>i</code> -

an integer

+

an integer

 <code>Returns</code> @@ -39,6 +31,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page index 2e91097..aaad476 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string - - Regress.TestObj:string - - -"string" String : Read / Write - + Regress.TestObj.string + +TestObj.string: String (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index b19711f..0b940b1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -6,26 +6,18 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test-with-static-scope-arg - Regress.TestObj::test-with-static-scope-arg - - -function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; - + +connect('test-with-static-scope-arg', function (testObj, object: Regress.TestSimpleBoxedA, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 @@ -34,6 +26,4 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index 9700cef..1133b31 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -6,30 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test - Regress.TestObj::test - - -function callback(test_obj, ):void; - + +connect('test', function (testObj, ): void); + + - - - - - - -<code>test_obj</code> +<code>testObj</code>

instance of that is emitting the signal

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page index 4f2183d..177defd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_constructor - Regress.TestObj.constructor - - -function constructor():Regress.TestObj { + +function constructor(): Regress.TestObj { // Gjs wrapper for regress_constructor() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function constructor():Regress.TestObj { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page index 0770d0d..f3629e2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_obj_do_matrix @@ -18,28 +17,21 @@ somestr - Regress.TestObj.prototype.do_matrix - - -function do_matrix(somestr:String):Number { + +function do_matrix(somestr: String): Number(gint) { // Gjs wrapper for regress_test_obj_do_matrix() } - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -47,6 +39,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 5e71948..80b60d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_obj_emit_sig_with_foreign_struct - Regress.TestObj.prototype.emit_sig_with_foreign_struct - - -function emit_sig_with_foreign_struct():void { + +function emit_sig_with_foreign_struct(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_foreign_struct() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page index 1c46dfb..843c89d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_obj_emit_sig_with_int64 - Regress.TestObj.prototype.emit_sig_with_int64 - - -function emit_sig_with_int64():void { + +function emit_sig_with_int64(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_int64() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page index ea33a82..cfd7dd2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_obj_emit_sig_with_obj - Regress.TestObj.prototype.emit_sig_with_obj - - -function emit_sig_with_obj():void { + +function emit_sig_with_obj(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_obj() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page index 35c0678..004df97 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_obj_emit_sig_with_uint64 - Regress.TestObj.prototype.emit_sig_with_uint64 - - -function emit_sig_with_uint64():void { + +function emit_sig_with_uint64(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_uint64() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page index b3ff3bf..126b739 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_forced_method - Regress.TestObj.prototype.forced_method - - -function forced_method():void { + +function forced_method(): void { // Gjs wrapper for regress_forced_method() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page new file mode 100644 index 0000000..d9f3754 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.function_ptr.page @@ -0,0 +1,19 @@ + + + + + + Regress.TestObj.function_ptr + +function onfunction_ptr(): void { +} + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page index 9ee8768..d193fc9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_obj_instance_method - Regress.TestObj.prototype.instance_method - - -function instance_method():Number { + +function instance_method(): Number(gint) { // Gjs wrapper for regress_test_obj_instance_method() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function instance_method():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page index fe26069..73d8e53 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - Regress.TestObj.prototype.instance_method_callback - - -function instance_method_callback(callback:Regress.TestCallback):void { + +function instance_method_callback(callback: Regress.TestCallback): void { // Gjs wrapper for regress_test_obj_instance_method_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function instance_method_callback(callback:Regress.TestCallback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page index 024db93..8be6b74 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,26 +17,19 @@ obj - Regress.TestObj.new - - -function new(obj:Regress.TestObj):Regress.TestObj { + +function new(obj: Regress.TestObj): Regress.TestObj { // Gjs wrapper for regress_test_obj_new() } - + + - - - - - - <code>obj</code> -

A

+

A

<code>Returns</code> @@ -45,6 +37,4 @@ function new(obj:Regress.TestObj):Regress.TestObj { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page index 4eaa036..0e735d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - Regress.TestObj.new_callback - - -function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { + +function new_callback(callback: Regress.TestCallbackUserData): Regress.TestObj { // Gjs wrapper for regress_test_obj_new_callback() } - + + - - - - - - <code>callback</code> @@ -45,6 +37,4 @@ function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page index c54fa62..2b83a34 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ x - Regress.TestObj.new_from_file - - -function new_from_file(x:String):Regress.TestObj { + +function new_from_file(x: String): Regress.TestObj { // Gjs wrapper for regress_test_obj_new_from_file() } - + + - - - - - - <code>x</code> @@ -45,6 +37,4 @@ function new_from_file(x:String):Regress.TestObj { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page index dfc9ef0..1237d49 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_obj_null_out - - null_out - - -function null_out():void { + Regress.TestObj.null_out + +function null_out(): Regress.TestObj { // Gjs wrapper for regress_test_obj_null_out() } - + + - - - - - - + +<code>Returns</code> +

A

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page index b842894..4b43596 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page @@ -6,36 +6,17 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj - const Regress = imports.gi.Regress; -let test_obj = new Regress.TestObj({ - bare: value, - boxed: value, - double: value, - float: value, - gtype: value, - hash_table: value, - hash_table_old: value, - int: value, - list: value, - list_old: value, - string: value, +let testObj = new Regress.TestObj({ }); - - - - - - + Hierarchy @@ -47,8 +28,11 @@ let test_obj = new Regress.TestObj({ - - + + Constructors + @@ -57,7 +41,7 @@ let test_obj = new Regress.TestObj({ - Functions + Static Functions Properties @@ -68,8 +52,10 @@ let test_obj = new Regress.TestObj({ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page index dca89e8..2e5d07f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ bare - Regress.TestObj.prototype.set_bare - - -function set_bare(bare:GObject.Object):void { + +function set_bare(bare: GObject.Object): void { // Gjs wrapper for regress_test_obj_set_bare() } - + + - - - - - - <code>bare</code> @@ -41,6 +33,4 @@ function set_bare(bare:GObject.Object):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page index aee3f2c..f253cce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,69 +13,72 @@ regress_test_obj_skip_inout_param - Number + Number(gint) a - Number + Number(gdouble) c - Number + Number(gint) inout_d - Number + Number(gint) num1 - Number + Number(gint) num2 - Regress.TestObj.prototype.skip_inout_param - - -function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + +function skip_inout_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] { // Gjs wrapper for regress_test_obj_skip_inout_param() } - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>a</code> -

Parameter.

+

Parameter.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

+ + +<code>ok</code> +

true if the call succeeds, false if @error is set.

+ + +<code>out_b</code> +

Return value.

+ + +<code>inout_d (out)</code> +

Will be incremented.

 -<code>Returns</code> -

true if the call succeeds, false if @error is set.

+<code>out_sum</code> +

Return value.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page index 75b7bb2..2f27e86 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,69 +13,72 @@ regress_test_obj_skip_out_param - Number + Number(gint) a - Number + Number(gdouble) c - Number + Number(gint) inout_d - Number + Number(gint) num1 - Number + Number(gint) num2 - Regress.TestObj.prototype.skip_out_param - - -function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + +function skip_out_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] { // Gjs wrapper for regress_test_obj_skip_out_param() } - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>a</code> -

Parameter.

+

Parameter.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

+ + +<code>ok</code> +

true if the call succeeds, false if @error is set.

+ + +<code>out_b</code> +

Return value.

+ + +<code>inout_d (out)</code> +

Will be incremented.

 -<code>Returns</code> -

true if the call succeeds, false if @error is set.

+<code>out_sum</code> +

Return value.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page index cd2081f..bd193a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,69 +13,72 @@ regress_test_obj_skip_param - Number + Number(gint) a - Number + Number(gdouble) c - Number + Number(gint) inout_d - Number + Number(gint) num1 - Number + Number(gint) num2 - Regress.TestObj.prototype.skip_param - - -function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + +function skip_param(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] { // Gjs wrapper for regress_test_obj_skip_param() } - + +

Check that a parameter is skipped

- -

Check that a parameter is skipped

- - - - <code>a</code> -

Parameter.

+

Parameter.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

+ + +<code>ok</code> +

true if the call succeeds, false if @error is set.

+ + +<code>out_b</code> +

Return value.

+ + +<code>inout_d (out)</code> +

Will be incremented.

 -<code>Returns</code> -

true if the call succeeds, false if @error is set.

+<code>out_sum</code> +

Return value.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page index 22ec572..b7a3a87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,69 +13,72 @@ regress_test_obj_skip_return_val - Number + Number(gint) a - Number + Number(gdouble) c - Number + Number(gint) inout_d - Number + Number(gint) num1 - Number + Number(gint) num2 - Regress.TestObj.prototype.skip_return_val - - -function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + +function skip_return_val(a: Number(gint), c: Number(gdouble), inout_d: Number(gint), num1: Number(gint), num2: Number(gint)): [ok: Boolean, out_b: Number(gint), inout_d: Number(gint), out_sum: Number(gint)] { // Gjs wrapper for regress_test_obj_skip_return_val() } - + +

Check that the return value is skipped

- -

Check that the return value is skipped

- - - - <code>a</code> -

Parameter.

+

Parameter.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

+ + +<code>ok</code> +

true if the call succeeds, false if @error is set.

+ + +<code>out_b</code> +

A return value.

+ + +<code>inout_d (out)</code> +

Will be incremented.

 -<code>Returns</code> -

true if the call succeeds, false if @error is set.

+<code>out_sum</code> +

Return value.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page index 74701f7..2558aa7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,38 +13,29 @@ regress_test_obj_skip_return_val_no_out - Number + Number(gint) a - Regress.TestObj.prototype.skip_return_val_no_out - - -function skip_return_val_no_out(a:Number):Boolean { + +function skip_return_val_no_out(a: Number(gint)): Boolean { // Gjs wrapper for regress_test_obj_skip_return_val_no_out() } - - - -

Check that the return value is skipped. Succeed if a is nonzero, otherwise + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.

- - - - + <code>a</code> -

Parameter.

+

Parameter.

 <code>Returns</code> -

true if the call succeeds, false if @error is set.

+

true if the call succeeds, false if @error is set.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page index d1f2e59..a2256ce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gdouble) regress_test_obj_static_method - Number + Number(gint) x - - static_method - - -function static_method(x:Number):Number { + Regress.TestObj.static_method + +function static_method(x: Number(gint)): Number(gdouble) { // Gjs wrapper for regress_test_obj_static_method() } - + + - - - - - - <code>x</code> @@ -45,6 +37,4 @@ function static_method(x:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page index 13e917e..57371f2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - static_method_callback - - -function static_method_callback(callback:Regress.TestCallback):void { + Regress.TestObj.static_method_callback + +function static_method_callback(callback: Regress.TestCallback): void { // Gjs wrapper for regress_test_obj_static_method_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function static_method_callback(callback:Regress.TestCallback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page index 78bf63b..050a326 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_obj_torture_signature_0 - Number + Number(gint) x @@ -22,26 +21,19 @@ foo - Number + Number(guint) m - Regress.TestObj.prototype.torture_signature_0 - - -function torture_signature_0(x:Number, foo:String, m:Number):void { + +function torture_signature_0(x: Number(gint), foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_obj_torture_signature_0() } - - - - - - - - + + + <code>x</code> @@ -55,8 +47,18 @@ function torture_signature_0(x:Number, foo:String, m:Number):void { <code>m</code> + +<code>y</code> + + + +<code>z</code> + + + +<code>q</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page index 553ddd2..378efdc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_obj_torture_signature_1 - Number + Number(gint) x @@ -22,26 +21,19 @@ foo - Number + Number(guint) m - Regress.TestObj.prototype.torture_signature_1 - - -function torture_signature_1(x:Number, foo:String, m:Number):Boolean { + +function torture_signature_1(x: Number(gint), foo: String, m: Number(guint)): [ok: Boolean, y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_obj_torture_signature_1() } - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>x</code> @@ -56,11 +48,21 @@ function torture_signature_1(x:Number, foo:String, m:Number):Boolean { -<code>Returns</code> +<code>ok</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>q</code> - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page index 858e58a..da0844e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page @@ -1,24 +1,16 @@ - - - + Regress.TestOtherError - - - - - - - - + + <code>TestOtherError.CODE1</code> @@ -33,7 +25,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page index d75b6aa..98efd78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_unconventional_error_quark - - quark - - -function quark():GLib.Quark { + Regress.TestOtherError.quark + +function quark(): GLib.Quark { // Gjs wrapper for regress_test_unconventional_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page index 66b477d..b4cf900 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page @@ -1,25 +1,29 @@ - - - + Regress.TestPrivateEnum - - - - - - - - - - - + + + + +<code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code> + + + +<code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code> + + + + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page new file mode 100644 index 0000000..812c2f9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page @@ -0,0 +1,18 @@ + + + + + this_is_public_after + + Regress.TestPrivateStruct.this_is_public_after + +TestPrivateStruct.this_is_public_after: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page new file mode 100644 index 0000000..465be84 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page @@ -0,0 +1,18 @@ + + + + + this_is_public_before + + Regress.TestPrivateStruct.this_is_public_before + +TestPrivateStruct.this_is_public_before: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page index 7b1309d..7ce2a7c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page @@ -1,25 +1,43 @@ - - - + Regress.TestPrivateStruct - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testPrivateStruct = new Regress.TestPrivateStruct({ + this_is_public_before: value + this_is_public_after: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page index 2c8b1ab..2394ff1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page @@ -1,24 +1,16 @@ - - - + Regress.TestReferenceEnum - - - - - - - - + + <code>TestReferenceEnum.0</code> @@ -45,7 +37,9 @@ - - - + + Functions + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page new file mode 100644 index 0000000..bbbc3a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page @@ -0,0 +1,18 @@ + + + + + some_double + + Regress.TestSimpleBoxedA.some_double + +TestSimpleBoxedA.some_double: Number(gdouble) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page new file mode 100644 index 0000000..770423f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page @@ -0,0 +1,18 @@ + + + + + some_enum + + Regress.TestSimpleBoxedA.some_enum + +TestSimpleBoxedA.some_enum: Regress.TestEnum (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page new file mode 100644 index 0000000..03d94f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page @@ -0,0 +1,18 @@ + + + + + some_int + + Regress.TestSimpleBoxedA.some_int + +TestSimpleBoxedA.some_int: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page new file mode 100644 index 0000000..ec643f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestSimpleBoxedA.some_int8 + +TestSimpleBoxedA.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page index 7f5dfde..d096c27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_simple_boxed_a_const_return - - const_return - - -function const_return():Regress.TestSimpleBoxedA { + Regress.TestSimpleBoxedA.const_return + +function const_return(): Regress.TestSimpleBoxedA { // Gjs wrapper for regress_test_simple_boxed_a_const_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function const_return():Regress.TestSimpleBoxedA { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page index 6aa0974..c5d349b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_simple_boxed_a_copy - Regress.TestSimpleBoxedA.prototype.copy - - -function copy():Regress.TestSimpleBoxedA { + +function copy(): Regress.TestSimpleBoxedA { // Gjs wrapper for regress_test_simple_boxed_a_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedA { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page index 52e5877..7420b30 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ other_a - Regress.TestSimpleBoxedA.prototype.equals - - -function equals(other_a:Regress.TestSimpleBoxedA):Boolean { + +function equals(other_a: Regress.TestSimpleBoxedA): Boolean { // Gjs wrapper for regress_test_simple_boxed_a_equals() } - + + - - - - - - <code>other_a</code> @@ -45,6 +37,4 @@ function equals(other_a:Regress.TestSimpleBoxedA):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page index 9117ddb..1ba157a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page @@ -1,25 +1,45 @@ - - - + Regress.TestSimpleBoxedA - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testSimpleBoxedA = new Regress.TestSimpleBoxedA({ + some_int: value + some_int8: value + some_double: value + some_enum: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page new file mode 100644 index 0000000..932f958 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page @@ -0,0 +1,18 @@ + + + + + nested_a + + Regress.TestSimpleBoxedB.nested_a + +TestSimpleBoxedB.nested_a: Regress.TestSimpleBoxedA (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page new file mode 100644 index 0000000..9238e12 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestSimpleBoxedB.some_int8 + +TestSimpleBoxedB.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page index b1bd51a..7c6abac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_simple_boxed_b_copy - Regress.TestSimpleBoxedB.prototype.copy - - -function copy():Regress.TestSimpleBoxedB { + +function copy(): Regress.TestSimpleBoxedB { // Gjs wrapper for regress_test_simple_boxed_b_copy() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedB { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page index 7ecc623..34d830a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page @@ -1,25 +1,43 @@ - - - + Regress.TestSimpleBoxedB - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testSimpleBoxedB = new Regress.TestSimpleBoxedB({ + some_int8: value + nested_a: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page index f815782..6e31d3d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page @@ -1,25 +1,19 @@ - - - + Regress.TestSimpleCallback - - - - - - - - - - - + +function onTestSimpleCallback(): void { +} + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page new file mode 100644 index 0000000..d305919 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page @@ -0,0 +1,18 @@ + + + + + some_double + + Regress.TestStructA.some_double + +TestStructA.some_double: Number(gdouble) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page new file mode 100644 index 0000000..80dd331 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page @@ -0,0 +1,18 @@ + + + + + some_enum + + Regress.TestStructA.some_enum + +TestStructA.some_enum: Regress.TestEnum (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page new file mode 100644 index 0000000..ab7790d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page @@ -0,0 +1,18 @@ + + + + + some_int + + Regress.TestStructA.some_int + +TestStructA.some_int: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page new file mode 100644 index 0000000..0e1611e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestStructA.some_int8 + +TestStructA.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page index ded4a79..0be40a4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_struct_a_clone - Regress.TestStructA.prototype.clone - - -function clone():void { + +function clone(): Regress.TestStructA { // Gjs wrapper for regress_test_struct_a_clone() } - + +

Make a copy of a RegressTestStructA

- -

Make a copy of a RegressTestStructA

- - - - + +<code>Returns</code> +

the cloned structure

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page index a6a9817..3f27491 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page @@ -1,25 +1,45 @@ - - - + Regress.TestStructA - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructA = new Regress.TestStructA({ + some_int: value + some_int8: value + some_double: value + some_enum: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page index 38406e6..6904c43 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,24 @@ string - - parse - - -function parse(string:String):void { + Regress.TestStructA.parse + +function parse(string: String): Regress.TestStructA { // Gjs wrapper for regress_test_struct_a_parse() } - + + - - - - - - <code>string</code> -

ignored

+

ignored

+ + +<code>Returns</code> +

the structure that is to be filled

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page new file mode 100644 index 0000000..4f414af --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page @@ -0,0 +1,18 @@ + + + + + nested_a + + Regress.TestStructB.nested_a + +TestStructB.nested_a: Regress.TestStructA (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page new file mode 100644 index 0000000..ba646c6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page @@ -0,0 +1,18 @@ + + + + + some_int8 + + Regress.TestStructB.some_int8 + +TestStructB.some_int8: Number(gint8) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page index 20278cd..93b9d45 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_struct_b_clone - Regress.TestStructB.prototype.clone - - -function clone():void { + +function clone(): Regress.TestStructB { // Gjs wrapper for regress_test_struct_b_clone() } - + +

Make a copy of a RegressTestStructB

- -

Make a copy of a RegressTestStructB

- - - - + +<code>Returns</code> +

the cloned structure

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page index 21d8626..0fa28db 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page @@ -1,25 +1,43 @@ - - - + Regress.TestStructB - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructB = new Regress.TestStructB({ + some_int8: value + nested_a: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page new file mode 100644 index 0000000..b8f022f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page @@ -0,0 +1,18 @@ + + + + + another_int + + Regress.TestStructC.another_int + +TestStructC.another_int: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page new file mode 100644 index 0000000..1ead3fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page @@ -0,0 +1,18 @@ + + + + + obj + + Regress.TestStructC.obj + +TestStructC.obj: GObject.Object (Read) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page index 6bd5812..82e0ae4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page @@ -1,25 +1,42 @@ - - - + Regress.TestStructC - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructC = new Regress.TestStructC({ + another_int: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page new file mode 100644 index 0000000..d957af3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page @@ -0,0 +1,18 @@ + + + + + array1 + + Regress.TestStructD.array1 + +TestStructD.array1: Array(Regress.TestStructA) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page new file mode 100644 index 0000000..13d7e87 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page @@ -0,0 +1,18 @@ + + + + + array2 + + Regress.TestStructD.array2 + +TestStructD.array2: Array(Regress.TestObj) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page new file mode 100644 index 0000000..4797612 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page @@ -0,0 +1,18 @@ + + + + + field + + Regress.TestStructD.field + +TestStructD.field: Regress.TestObj (Read) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page new file mode 100644 index 0000000..1eca3f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page @@ -0,0 +1,18 @@ + + + + + garray + + Regress.TestStructD.garray + +TestStructD.garray: Array(Regress.TestObj) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page new file mode 100644 index 0000000..655b312 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page @@ -0,0 +1,18 @@ + + + + + list + + Regress.TestStructD.list + +TestStructD.list: Array(Regress.TestObj) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page index aa9f131..b8222c8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page @@ -1,25 +1,45 @@ - - - + Regress.TestStructD - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructD = new Regress.TestStructD({ + array1: value + array2: value + list: value + garray: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page new file mode 100644 index 0000000..74909cf --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page @@ -0,0 +1,18 @@ + + + + + some_type + + Regress.TestStructE.some_type + +TestStructE.some_type: GObject.Type (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page new file mode 100644 index 0000000..cafd678 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page @@ -0,0 +1,18 @@ + + + + + some_union + + Regress.TestStructE.some_union + +TestStructE.some_union: Array(Regress.TestStructE__some_union__union) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page index b931c36..788803f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page @@ -1,25 +1,43 @@ - - - + Regress.TestStructE - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructE = new Regress.TestStructE({ + some_type: value + some_union: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page index 3b81e62..493e96d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructE__some_union__union - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructE__some_union__union = new Regress.TestStructE__some_union__union(); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page new file mode 100644 index 0000000..8b5d725 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page @@ -0,0 +1,18 @@ + + + + + data1 + + Regress.TestStructF.data1 + +TestStructF.data1: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page new file mode 100644 index 0000000..0c49cda --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page @@ -0,0 +1,18 @@ + + + + + data2 + + Regress.TestStructF.data2 + +TestStructF.data2: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page new file mode 100644 index 0000000..7c14530 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page @@ -0,0 +1,18 @@ + + + + + data3 + + Regress.TestStructF.data3 + +TestStructF.data3: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page new file mode 100644 index 0000000..8783146 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page @@ -0,0 +1,18 @@ + + + + + data4 + + Regress.TestStructF.data4 + +TestStructF.data4: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page new file mode 100644 index 0000000..84f5878 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page @@ -0,0 +1,18 @@ + + + + + data5 + + Regress.TestStructF.data5 + +TestStructF.data5: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page new file mode 100644 index 0000000..6662c2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page @@ -0,0 +1,18 @@ + + + + + data6 + + Regress.TestStructF.data6 + +TestStructF.data6: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page new file mode 100644 index 0000000..85be6dd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page @@ -0,0 +1,18 @@ + + + + + ref_count + + Regress.TestStructF.ref_count + +TestStructF.ref_count: Number(gint) (Read / Write) + + + + 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 cfb434b..feae9a2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page @@ -1,25 +1,48 @@ - - - + Regress.TestStructF - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructF = new Regress.TestStructF({ + ref_count: value + data1: value + data2: value + data3: value + data4: value + data5: value + data6: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page new file mode 100644 index 0000000..b065f89 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page @@ -0,0 +1,18 @@ + + + + + array + + Regress.TestStructFixedArray.array + +TestStructFixedArray.array: Array(Number(gint)) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page new file mode 100644 index 0000000..75e1e60 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page @@ -0,0 +1,18 @@ + + + + + just_int + + Regress.TestStructFixedArray.just_int + +TestStructFixedArray.just_int: Number(gint) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page index f0edd05..4896e33 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_struct_fixed_array_frob - Regress.TestStructFixedArray.prototype.frob - - -function frob():void { + +function frob(): void { // Gjs wrapper for regress_test_struct_fixed_array_frob() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page index db6e789..12b81be 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page @@ -1,25 +1,43 @@ - - - + Regress.TestStructFixedArray - - - - - - - - - - - + +const Regress = imports.gi.Regress; + +let testStructFixedArray = new Regress.TestStructFixedArray({ + just_int: value + array: value +}); + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page index 26fc790..f2ff527 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_sub_obj_instance_method - Regress.TestSubObj.prototype.instance_method - - -function instance_method():Number { + +function instance_method(): Number(gint) { // Gjs wrapper for regress_test_sub_obj_instance_method() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function instance_method():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page index 31deab7..833ed23 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_sub_obj_new - Regress.TestSubObj.new - - -function new():Regress.TestObj { + +function new(): Regress.TestObj { // Gjs wrapper for regress_test_sub_obj_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.TestObj { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page index 7147da1..d9f0885 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestSubObj - const Regress = imports.gi.Regress; -let test_sub_obj = new Regress.TestSubObj(); +let testSubObj = new Regress.TestSubObj(); - - - - - - + Hierarchy @@ -38,8 +30,11 @@ let test_sub_obj = new Regress.TestSubObj(); - - + + Constructors + @@ -48,7 +43,7 @@ let test_sub_obj = new Regress.TestSubObj(); - Functions + Static Functions Properties @@ -59,8 +54,10 @@ let test_sub_obj = new Regress.TestSubObj(); Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page index a632f8f..c2f4aa7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_sub_obj_unset_bare - Regress.TestSubObj.prototype.unset_bare - - -function unset_bare():void { + +function unset_bare(): void { // Gjs wrapper for regress_test_sub_obj_unset_bare() } - + + - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page index e0a7bc0..fcb2f3b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestTypeGUInt64 - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page index 256dbb6..90d74f6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - testbool - - Regress.TestWi8021x:testbool - - -"testbool" Boolean : Read / Write - + Regress.TestWi8021x.testbool + +TestWi8021x.testbool: Boolean (Read / Write) + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page index e42b0d7..3d83f91 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_wi_802_1x_get_testbool - Regress.TestWi8021x.prototype.get_testbool - - -function get_testbool():Boolean { + +function get_testbool(): Boolean { // Gjs wrapper for regress_test_wi_802_1x_get_testbool() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function get_testbool():Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page index b8b162c..3d041a1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_wi_802_1x_new - Regress.TestWi8021x.new - - -function new():Regress.TestWi8021x { + +function new(): Regress.TestWi8021x { // Gjs wrapper for regress_test_wi_802_1x_new() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function new():Regress.TestWi8021x { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page index d69548f..eb70245 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page @@ -6,26 +6,17 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestWi8021x - const Regress = imports.gi.Regress; -let test_wi8021x = new Regress.TestWi8021x({ - testbool: value, +let testWi8021x = new Regress.TestWi8021x({ }); - - - - - - + Hierarchy @@ -37,8 +28,11 @@ let test_wi8021x = new Regress.TestWi8021x({ - - + + Constructors + @@ -47,7 +41,7 @@ let test_wi8021x = new Regress.TestWi8021x({ - Functions + Static Functions Properties @@ -58,8 +52,10 @@ let test_wi8021x = new Regress.TestWi8021x({ Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page index e052ed5..0c42f37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ v - Regress.TestWi8021x.prototype.set_testbool - - -function set_testbool(v:Boolean):void { + +function set_testbool(v: Boolean): void { // Gjs wrapper for regress_test_wi_802_1x_set_testbool() } - + + - - - - - - <code>v</code> @@ -41,6 +33,4 @@ function set_testbool(v:Boolean):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page index ccfe04c..1771833 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_wi_802_1x_static_method - Number + Number(gint) x - - static_method - - -function static_method(x:Number):Number { + Regress.TestWi8021x.static_method + +function static_method(x: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_wi_802_1x_static_method() } - + + - - - - - - <code>x</code> @@ -45,6 +37,4 @@ function static_method(x:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 0000000..343ad00 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.UTF8_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page index de2b93b..ebc301c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_aliased_caller_alloc - - aliased_caller_alloc - - -function aliased_caller_alloc():void { + Regress.aliased_caller_alloc + +function aliased_caller_alloc(): Regress.AliasedTestBoxed { // Gjs wrapper for regress_aliased_caller_alloc() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page index 8f00a10..da3a39c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_annotation_attribute_func @@ -22,37 +21,28 @@ data - - annotation_attribute_func - - -function annotation_attribute_func(object:Regress.AnnotationObject, data:String):Number { + Regress.annotation_attribute_func + +function annotation_attribute_func(object: Regress.AnnotationObject, data: String): Number(gint) { // Gjs wrapper for regress_annotation_attribute_func() } - + + - - - - - - <code>object</code> -

A .

+

A .

 <code>data</code> -

Some data.

+

Some data.

 <code>Returns</code> -

The return value.

+

The return value.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page index c3e9653..cf5bc93 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ callback - - annotation_custom_destroy - - -function annotation_custom_destroy(callback:Regress.AnnotationCallback):void { + Regress.annotation_custom_destroy + +function annotation_custom_destroy(callback: Regress.AnnotationCallback): void { // Gjs wrapper for regress_annotation_custom_destroy() } - - - -

Test messing up the heuristic of closure/destroy-notification + +

Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations.

- - - - + <code>callback</code> -

Destroy notification

+

Destroy notification

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page index 39f6c14..d86c65e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - filename + String regress_annotation_get_source_file - - annotation_get_source_file - - -function annotation_get_source_file():filename { + Regress.annotation_get_source_file + +function annotation_get_source_file(): String { // Gjs wrapper for regress_annotation_get_source_file() } - + + - - - - - - <code>Returns</code> -

Source file

+

Source file

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page index c75d9c2..2cd2a0e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,28 @@ regress_annotation_init - [String] + Array(String) argv - - annotation_init - - -function annotation_init(argv:[String]):void { + Regress.annotation_init + +function annotation_init(argv: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_init() } - + + - - - - - - -<code>argv</code> -

The arguments.

+<code>Returns</code> +

The arguments.

+ + +<code>Returns (out)</code> +

The arguments.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page index 1997a4d..08bf226 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_invalid_regress_annotation - Number + Number(gint) foo - - annotation_invalid_regress_annotation - - -function annotation_invalid_regress_annotation(foo:Number):void { + Regress.annotation_invalid_regress_annotation + +function annotation_invalid_regress_annotation(foo: Number(gint)): void { // Gjs wrapper for regress_annotation_invalid_regress_annotation() } - + + - - - - - - <code>foo</code> -

some text (e.g. example) or else

+

some text (e.g. example) or else

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page index 9bfb168..1d6d51e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_ptr_array - [GObject.Value] + Array(Any) array - - annotation_ptr_array - - -function annotation_ptr_array(array:[GObject.Value]):void { + Regress.annotation_ptr_array + +function annotation_ptr_array(array: Array(Any)): void { // Gjs wrapper for regress_annotation_ptr_array() } - + + - - - - - - <code>array</code> -

the array

+

the array

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page index 3f63c9a..0ca05e7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page @@ -6,37 +6,31 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_annotation_return_array - - annotation_return_array - - -function annotation_return_array():[String] { + Regress.annotation_return_array + +function annotation_return_array(): [return_value: Array(String), length: Number(gint)] { // Gjs wrapper for regress_annotation_return_array() } - + + - - - - - - -<code>Returns</code> -

The return value

+<code>return_value</code> +

The return value

+ + +<code>length</code> +

Number of return values

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page index 8641945..3cc04b9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - filename + String regress_annotation_return_filename - - annotation_return_filename - - -function annotation_return_filename():filename { + Regress.annotation_return_filename + +function annotation_return_filename(): String { // Gjs wrapper for regress_annotation_return_filename() } - + + - - - - - - <code>Returns</code> -

An annotated filename

+

An annotated filename

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page index a5977b8..a2705af 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,24 @@ regress_annotation_set_source_file - filename + String fname - - annotation_set_source_file - - -function annotation_set_source_file(fname:filename):void { + Regress.annotation_set_source_file + +function annotation_set_source_file(fname: String): void { // Gjs wrapper for regress_annotation_set_source_file() } - + + - - - - - - <code>fname</code> -

Source file

+

Source file

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page index 675e00d..094bef2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_annotation_space_after_comment_bug631690 - - annotation_space_after_comment_bug631690 - - -function annotation_space_after_comment_bug631690():void { + Regress.annotation_space_after_comment_bug631690 + +function annotation_space_after_comment_bug631690(): void { // Gjs wrapper for regress_annotation_space_after_comment_bug631690() } - + +

Explicitly test having a space after the ** here.

- -

Explicitly test having a space after the ** here.

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page index 347eb6d..07c6358 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_annotation_string_array_length - [String] + Array(String) properties - - annotation_string_array_length - - -function annotation_string_array_length(properties:[String]):void { + Regress.annotation_string_array_length + +function annotation_string_array_length(properties: Array(String)): void { // Gjs wrapper for regress_annotation_string_array_length() } - + + - - - - - - <code>properties</code> @@ -41,6 +33,4 @@ function annotation_string_array_length(properties:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page index 741447e..e27b53b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_annotation_string_zero_terminated - - annotation_string_zero_terminated - - -function annotation_string_zero_terminated():[String] { + Regress.annotation_string_zero_terminated + +function annotation_string_zero_terminated(): Array(String) { // Gjs wrapper for regress_annotation_string_zero_terminated() } - + + - - - - - - <code>Returns</code> -

The return value

+

The return value

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page index cd4d8be..00b2e39 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,28 @@ regress_annotation_string_zero_terminated_out - [String] + Array(String) out - - annotation_string_zero_terminated_out - - -function annotation_string_zero_terminated_out(out:[String]):void { + Regress.annotation_string_zero_terminated_out + +function annotation_string_zero_terminated_out(out: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_string_zero_terminated_out() } - + + - - - - - - -<code>out</code> +<code>Returns</code> + + + +<code>Returns (out)</code> - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page index edade5b..5ed7f14 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_annotation_test_parsing_bug630862 - - annotation_test_parsing_bug630862 - - -function annotation_test_parsing_bug630862():GObject.Object { + Regress.annotation_test_parsing_bug630862 + +function annotation_test_parsing_bug630862(): GObject.Object { // Gjs wrapper for regress_annotation_test_parsing_bug630862() } - + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- -

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- - - - <code>Returns</code> -

An object, note the colon:in here

+

An object, note the colon:in here

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page index a4fceaf..be5134b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_annotation_transfer_floating - - annotation_transfer_floating - - -function annotation_transfer_floating():GObject.Object { + Regress.annotation_transfer_floating + +function annotation_transfer_floating(): GObject.Object { // Gjs wrapper for regress_annotation_transfer_floating() } - + + - - - - - - <code>Returns</code> -

A floating object

+

A floating object

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page index f1d5700..52028b0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,14 @@ regress_annotation_versioned - - annotation_versioned - - -function annotation_versioned():void { + Regress.annotation_versioned + +function annotation_versioned(): void { // Gjs wrapper for regress_annotation_versioned() } - + - - - - -

Since 0.6

- - - - +

Since 0.6

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page index 3aade3c..2d81ed0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_atest_error_quark - - atest_error_quark - - -function atest_error_quark():GLib.Quark { + Regress.atest_error_quark + +function atest_error_quark(): GLib.Quark { // Gjs wrapper for regress_atest_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function atest_error_quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page index 980a930..d285f4e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,22 +21,15 @@ callback - - foo_async_ready_callback - - -function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.AsyncReadyCallback):void { + Regress.foo_async_ready_callback + +function foo_async_ready_callback(cancellable: Gio.Cancellable, callback: Gio.AsyncReadyCallback): void { // Gjs wrapper for regress_foo_async_ready_callback() } - + + - - - - - - <code>cancellable</code> @@ -49,6 +41,4 @@ function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.Asyn - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page index d5cff2a..3276082 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - foo_destroy_notify_callback - - -function foo_destroy_notify_callback(callback:Regress.FooCallback):void { + Regress.foo_destroy_notify_callback + +function foo_destroy_notify_callback(callback: Regress.FooCallback): void { // Gjs wrapper for regress_foo_destroy_notify_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function foo_destroy_notify_callback(callback:Regress.FooCallback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page index 20eb206..cfecea5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_foo_init - - foo_init - - -function foo_init():Number { + Regress.foo_init + +function foo_init(): Number(gint) { // Gjs wrapper for regress_foo_init() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function foo_init():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page index 10876aa..00ff1f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -30,22 +29,15 @@ s - - foo_method_external_references - - -function foo_method_external_references(object:Utility.Object, e:Utility.EnumType, f:Utility.FlagType, s:Utility.Struct):void { + Regress.foo_method_external_references + +function foo_method_external_references(object: Utility.Object, e: Utility.EnumType, f: Utility.FlagType, s: Utility.Struct): void { // Gjs wrapper for regress_foo_method_external_references() } - + + - - - - - - <code>object</code> @@ -65,6 +57,4 @@ function foo_method_external_references(object:Utility.Object, e:Utility.EnumTyp - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page index 31f881b..0ffa89c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,23 +13,16 @@ regress_foo_not_a_constructor_new - - foo_not_a_constructor_new - - -function foo_not_a_constructor_new():Regress.FooObject { + Regress.foo_not_a_constructor_new + +function foo_not_a_constructor_new(): Regress.FooObject { // Gjs wrapper for regress_foo_not_a_constructor_new() } - - - -

This should be scanned as a top-level function, and shouldn't cause + +

This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning.

- - - - + <code>Returns</code> @@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page index 989084b..3fbf325 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_foo_test_array - - foo_test_array - - -function foo_test_array():[String] { + Regress.foo_test_array + +function foo_test_array(): Array(String) { // Gjs wrapper for regress_foo_test_array() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function foo_test_array():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page index 4f09562..7b62728 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ param - - foo_test_const_char_param - - -function foo_test_const_char_param(param:String):void { + Regress.foo_test_const_char_param + +function foo_test_const_char_param(param: String): void { // Gjs wrapper for regress_foo_test_const_char_param() } - + + - - - - - - <code>param</code> @@ -41,6 +33,4 @@ function foo_test_const_char_param(param:String):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page index 3ff9265..79984f6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_test_const_char_retval - - foo_test_const_char_retval - - -function foo_test_const_char_retval():String { + Regress.foo_test_const_char_retval + +function foo_test_const_char_retval(): String { // Gjs wrapper for regress_foo_test_const_char_retval() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function foo_test_const_char_retval():String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page index da103fb..4965c70 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ param - - foo_test_const_struct_param - - -function foo_test_const_struct_param(param:Regress.FooStruct):void { + Regress.foo_test_const_struct_param + +function foo_test_const_struct_param(param: Regress.FooStruct): void { // Gjs wrapper for regress_foo_test_const_struct_param() } - + + - - - - - - <code>param</code> @@ -41,6 +33,4 @@ function foo_test_const_struct_param(param:Regress.FooStruct):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page index 9c7539c..1495882 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_test_const_struct_retval - - foo_test_const_struct_retval - - -function foo_test_const_struct_retval():Regress.FooStruct { + Regress.foo_test_const_struct_retval + +function foo_test_const_struct_retval(): Regress.FooStruct { // Gjs wrapper for regress_foo_test_const_struct_retval() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function foo_test_const_struct_retval():Regress.FooStruct { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page index fe3b85a..36a5f7c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_test_string_array - [String] + Array(String) array - - foo_test_string_array - - -function foo_test_string_array(array:[String]):void { + Regress.foo_test_string_array + +function foo_test_string_array(array: Array(String)): void { // Gjs wrapper for regress_foo_test_string_array() } - + + - - - - - - <code>array</code> @@ -41,6 +33,4 @@ function foo_test_string_array(array:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page index 8b5c901..daf7ac9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_test_string_array_with_g - [String] + Array(String) array - - foo_test_string_array_with_g - - -function foo_test_string_array_with_g(array:[String]):void { + Regress.foo_test_string_array_with_g + +function foo_test_string_array_with_g(array: Array(String)): void { // Gjs wrapper for regress_foo_test_string_array_with_g() } - + + - - - - - - <code>array</code> @@ -41,6 +33,4 @@ function foo_test_string_array_with_g(array:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page index c35d3e9..15ef4d5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_test_unsigned_qualifier - Number + Number(guint) unsigned_param - - foo_test_unsigned_qualifier - - -function foo_test_unsigned_qualifier(unsigned_param:Number):void { + Regress.foo_test_unsigned_qualifier + +function foo_test_unsigned_qualifier(unsigned_param: Number(guint)): void { // Gjs wrapper for regress_foo_test_unsigned_qualifier() } - + + - - - - - - <code>unsigned_param</code> @@ -41,6 +33,4 @@ function foo_test_unsigned_qualifier(unsigned_param:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page index 9f68b51..a09d4ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_foo_test_unsigned_type - Number + Number(guint) unsigned_param - - foo_test_unsigned_type - - -function foo_test_unsigned_type(unsigned_param:Number):void { + Regress.foo_test_unsigned_type + +function foo_test_unsigned_type(unsigned_param: Number(guint)): void { // Gjs wrapper for regress_foo_test_unsigned_type() } - + + - - - - - - <code>unsigned_param</code> @@ -41,6 +33,4 @@ function foo_test_unsigned_type(unsigned_param:Number):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page index 446001a..c149b29 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,20 @@ obj - - func_obj_null_in - - -function func_obj_null_in(obj:Regress.TestObj):void { + Regress.func_obj_null_in + +function func_obj_null_in(obj: Regress.TestObj): void { // Gjs wrapper for regress_func_obj_null_in() } - + + - - - - - - <code>obj</code> -

A

+

A

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page index bafa541..04ded51 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_global_get_flags_out - - global_get_flags_out - - -function global_get_flags_out():void { + Regress.global_get_flags_out + +function global_get_flags_out(): Regress.TestFlags { // Gjs wrapper for regress_global_get_flags_out() } - + + - - - - - - + +<code>Returns</code> +

A flags value

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page index d4f673d..bd6dbd7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,42 +13,33 @@ regress_has_parameter_named_attrs - Number + Number(gint) foo - [guint32] + Array(Number(guint32)) attributes - - has_parameter_named_attrs - - -function has_parameter_named_attrs(foo:Number, attributes:[guint32]):void { + Regress.has_parameter_named_attrs + +function has_parameter_named_attrs(foo: Number(gint), attributes: Array(Number(guint32))): void { // Gjs wrapper for regress_has_parameter_named_attrs() } - - - -

This test case mirrors GnomeKeyringPasswordSchema from + +

This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.

- - - - + <code>foo</code> -

some int

+

some int

 <code>attributes</code> -

list of attributes

+

list of attributes

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page index aa2baa6..486b889 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ data - - introspectable_via_alias - - -function introspectable_via_alias(data:Regress.PtrArrayAlias):void { + Regress.introspectable_via_alias + +function introspectable_via_alias(data: Regress.PtrArrayAlias): void { // Gjs wrapper for regress_introspectable_via_alias() } - + + - - - - - - <code>data</code> @@ -41,6 +33,4 @@ function introspectable_via_alias(data:Regress.PtrArrayAlias):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page index 9b300e1..e0fd8c0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ abort_on_error - - set_abort_on_error - - -function set_abort_on_error(abort_on_error:Boolean):void { + Regress.set_abort_on_error + +function set_abort_on_error(abort_on_error: Boolean): void { // Gjs wrapper for regress_set_abort_on_error() } - + + - - - - - - <code>abort_on_error</code> @@ -41,6 +33,4 @@ function set_abort_on_error(abort_on_error:Boolean):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page index 112cd23..e1b4e02 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_array_callback @@ -18,22 +17,15 @@ callback - - test_array_callback - - -function test_array_callback(callback:Regress.TestCallbackArray):Number { + Regress.test_array_callback + +function test_array_callback(callback: Regress.TestCallbackArray): Number(gint) { // Gjs wrapper for regress_test_array_callback() } - + + - - - - - - <code>callback</code> @@ -45,6 +37,4 @@ function test_array_callback(callback:Regress.TestCallbackArray):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page index 51026b5..21ae53e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_array_fixed_out_objects - - test_array_fixed_out_objects - - -function test_array_fixed_out_objects():void { + Regress.test_array_fixed_out_objects + +function test_array_fixed_out_objects(): Array(Regress.TestObj) { // Gjs wrapper for regress_test_array_fixed_out_objects() } - + + - - - - - - + +<code>Returns</code> +

An array of

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page index 14a6e66..22d6a35 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page @@ -6,45 +6,35 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_array_fixed_size_int_in - [Number] + Array(Number(gint)) ints - - test_array_fixed_size_int_in - - -function test_array_fixed_size_int_in(ints:[Number]):Number { + Regress.test_array_fixed_size_int_in + +function test_array_fixed_size_int_in(ints: Array(Number(gint))): Number(gint) { // Gjs wrapper for regress_test_array_fixed_size_int_in() } - + + - - - - - - <code>ints</code> -

a list of 5 integers

+

a list of 5 integers

 <code>Returns</code> -

the sum of the items in ints

+

the sum of the items in ints

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page index ce62153..ff1479a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_array_fixed_size_int_out - - test_array_fixed_size_int_out - - -function test_array_fixed_size_int_out():void { + Regress.test_array_fixed_size_int_out + +function test_array_fixed_size_int_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_fixed_size_int_out() } - + + - - - - - - + +<code>Returns</code> +

a list of 5 integers ranging from 0 to 4

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page index 1e2c678..d899ec2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [Number] + Array(Number(gint)) regress_test_array_fixed_size_int_return - - test_array_fixed_size_int_return - - -function test_array_fixed_size_int_return():[Number] { + Regress.test_array_fixed_size_int_return + +function test_array_fixed_size_int_return(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_fixed_size_int_return() } - + + - - - - - - <code>Returns</code> -

a list of 5 integers ranging from 0 to 4

+

a list of 5 integers ranging from 0 to 4

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page index e4b957e..a1d52a4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_array_gint16_in - [gint16] + Array(Number(gint16)) ints - - test_array_gint16_in - - -function test_array_gint16_in(ints:[gint16]):Number { + Regress.test_array_gint16_in + +function test_array_gint16_in(ints: Array(Number(gint16))): Number(gint) { // Gjs wrapper for regress_test_array_gint16_in() } - + + - - - - - - <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -45,6 +37,4 @@ function test_array_gint16_in(ints:[gint16]):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page index 171ad11..a578d56 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gint32 + Number(gint32) regress_test_array_gint32_in - [gint32] + Array(Number(gint32)) ints - - test_array_gint32_in - - -function test_array_gint32_in(ints:[gint32]):gint32 { + Regress.test_array_gint32_in + +function test_array_gint32_in(ints: Array(Number(gint32))): Number(gint32) { // Gjs wrapper for regress_test_array_gint32_in() } - + + - - - - - - <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -45,6 +37,4 @@ function test_array_gint32_in(ints:[gint32]):gint32 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page index a8b51a6..da730c8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint64) regress_test_array_gint64_in - [Number] + Array(Number(gint64)) ints - - test_array_gint64_in - - -function test_array_gint64_in(ints:[Number]):Number { + Regress.test_array_gint64_in + +function test_array_gint64_in(ints: Array(Number(gint64))): Number(gint64) { // Gjs wrapper for regress_test_array_gint64_in() } - + + - - - - - - <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -45,6 +37,4 @@ function test_array_gint64_in(ints:[Number]):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page index 16ddc7c..b60ee63 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_array_gint8_in - [gint8] + ByteArray ints - - test_array_gint8_in - - -function test_array_gint8_in(ints:[gint8]):Number { + Regress.test_array_gint8_in + +function test_array_gint8_in(ints: ByteArray): Number(gint) { // Gjs wrapper for regress_test_array_gint8_in() } - + + - - - - - - <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -45,6 +37,4 @@ function test_array_gint8_in(ints:[gint8]):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page index 61e1d0a..7f4e5ac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,37 +13,28 @@ regress_test_array_gtype_in - [GType] + Array(GObject.Type) types - - test_array_gtype_in - - -function test_array_gtype_in(types:[GType]):String { + Regress.test_array_gtype_in + +function test_array_gtype_in(types: Array(GObject.Type)): String { // Gjs wrapper for regress_test_array_gtype_in() } - + + - - - - - - <code>types</code> -

List of types

+

List of types

 <code>Returns</code> -

string representation of provided types

+

string representation of provided types

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page index 5f580ad..e526457 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page @@ -6,37 +6,31 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [Number] + Array(Number(gint)) regress_test_array_int_full_out - - test_array_int_full_out - - -function test_array_int_full_out():[Number] { + Regress.test_array_int_full_out + +function test_array_int_full_out(): [return_value: Array(Number(gint)), len: Number(gint)] { // Gjs wrapper for regress_test_array_int_full_out() } - + + - - - - - - -<code>Returns</code> -

a new array of integers.

+<code>return_value</code> +

a new array of integers.

+ + +<code>len</code> +

length of the returned array.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page index 3d41dca..af070d4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_array_int_in - [Number] + Array(Number(gint)) ints - - test_array_int_in - - -function test_array_int_in(ints:[Number]):Number { + Regress.test_array_int_in + +function test_array_int_in(ints: Array(Number(gint))): Number(gint) { // Gjs wrapper for regress_test_array_int_in() } - + + - - - - - - <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -45,6 +37,4 @@ function test_array_int_in(ints:[Number]):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page index b4094cd..a9ee022 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,28 @@ regress_test_array_int_inout - [Number] + Array(Number(gint)) ints - - test_array_int_inout - - -function test_array_int_inout(ints:[Number]):void { + Regress.test_array_int_inout + +function test_array_int_inout(ints: Array(Number(gint))): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_inout() } - + + - - - - - - -<code>ints</code> -

a list of integers whose items will be increased by 1, except the first that will be dropped

+<code>Returns</code> +

a list of integers whose items will be increased by 1, except the first that will be dropped

+ + +<code>Returns (out)</code> +

a list of integers whose items will be increased by 1, except the first that will be dropped

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page index ac10521..809e64e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page @@ -6,37 +6,31 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [Number] + Array(Number(gint)) regress_test_array_int_none_out - - test_array_int_none_out - - -function test_array_int_none_out():[Number] { + Regress.test_array_int_none_out + +function test_array_int_none_out(): [return_value: Array(Number(gint)), len: Number(gint)] { // Gjs wrapper for regress_test_array_int_none_out() } - + + - - - - - - -<code>Returns</code> -

a static array of integers.

+<code>return_value</code> +

a static array of integers.

+ + +<code>len</code> +

length of the returned array.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page index 33b27a0..05059f4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_array_int_null_in - [Number] + Array(Number(gint)) arr - - test_array_int_null_in - - -function test_array_int_null_in(arr:[Number]):void { + Regress.test_array_int_null_in + +function test_array_int_null_in(arr: Array(Number(gint))): void { // Gjs wrapper for regress_test_array_int_null_in() } - + + - - - - - - <code>arr</code> @@ -41,6 +33,4 @@ function test_array_int_null_in(arr:[Number]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page index 1e1a364..35368ec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_array_int_null_out - - test_array_int_null_out - - -function test_array_int_null_out():void { + Regress.test_array_int_null_out + +function test_array_int_null_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_null_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page index 78953ec..947f162 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_array_int_out - - test_array_int_out - - -function test_array_int_out():void { + Regress.test_array_int_out + +function test_array_int_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_out() } - + + - - - - - - + +<code>Returns</code> +

a list of 5 integers, from 0 to 4 in consecutive order

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page index 89d737c..00b92ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_async_ready_callback - - -function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { + Regress.test_async_ready_callback + +function test_async_ready_callback(callback: Gio.AsyncReadyCallback): void { // Gjs wrapper for regress_test_async_ready_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page index e165db2..cfa8f10 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_boolean - - -function test_boolean(in:Boolean):Boolean { + Regress.test_boolean + +function test_boolean(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_boolean(in:Boolean):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page index 21e169c..bc6d239 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_boolean_false - - -function test_boolean_false(in:Boolean):Boolean { + Regress.test_boolean_false + +function test_boolean_false(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean_false() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_boolean_false(in:Boolean):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page index e525a2f..b4b9f6f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_boolean_true - - -function test_boolean_true(in:Boolean):Boolean { + Regress.test_boolean_true + +function test_boolean_true(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean_true() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_boolean_true(in:Boolean):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page new file mode 100644 index 0000000..27bda3f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page @@ -0,0 +1,36 @@ + + + + + + + void + + regress_test_boxeds_not_a_method + + Regress.TestBoxed + boxed + + + + Regress.test_boxeds_not_a_method + +function test_boxeds_not_a_method(boxed: Regress.TestBoxed): void { + // Gjs wrapper for regress_test_boxeds_not_a_method() +} + + + + + +<code>boxed</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page new file mode 100644 index 0000000..2d7eb0b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page @@ -0,0 +1,26 @@ + + + + + + + void + + regress_test_boxeds_not_a_static + + + Regress.test_boxeds_not_a_static + +function test_boxeds_not_a_static(): void { + // Gjs wrapper for regress_test_boxeds_not_a_static() +} + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page index 1c222c6..d46fdff 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_context_full_return - - test_cairo_context_full_return - - -function test_cairo_context_full_return():cairo.Context { + Regress.test_cairo_context_full_return + +function test_cairo_context_full_return(): cairo.Context { // Gjs wrapper for regress_test_cairo_context_full_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_cairo_context_full_return():cairo.Context { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page index f710ac0..99dc4dc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ context - - test_cairo_context_none_in - - -function test_cairo_context_none_in(context:cairo.Context):void { + Regress.test_cairo_context_none_in + +function test_cairo_context_none_in(context: cairo.Context): void { // Gjs wrapper for regress_test_cairo_context_none_in() } - + + - - - - - - <code>context</code> @@ -41,6 +33,4 @@ function test_cairo_context_none_in(context:cairo.Context):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page index dcec607..8c2876a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_cairo_surface_full_out - - test_cairo_surface_full_out - - -function test_cairo_surface_full_out():void { + Regress.test_cairo_surface_full_out + +function test_cairo_surface_full_out(): cairo.Surface { // Gjs wrapper for regress_test_cairo_surface_full_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page index f1b0f96..54bd146 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_surface_full_return - - test_cairo_surface_full_return - - -function test_cairo_surface_full_return():cairo.Surface { + Regress.test_cairo_surface_full_return + +function test_cairo_surface_full_return(): cairo.Surface { // Gjs wrapper for regress_test_cairo_surface_full_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_cairo_surface_full_return():cairo.Surface { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page index 783576a..f61da52 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ surface - - test_cairo_surface_none_in - - -function test_cairo_surface_none_in(surface:cairo.Surface):void { + Regress.test_cairo_surface_none_in + +function test_cairo_surface_none_in(surface: cairo.Surface): void { // Gjs wrapper for regress_test_cairo_surface_none_in() } - + + - - - - - - <code>surface</code> @@ -41,6 +33,4 @@ function test_cairo_surface_none_in(surface:cairo.Surface):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page index 72e602e..81f9a55 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_surface_none_return - - test_cairo_surface_none_return - - -function test_cairo_surface_none_return():cairo.Surface { + Regress.test_cairo_surface_none_return + +function test_cairo_surface_none_return(): cairo.Surface { // Gjs wrapper for regress_test_cairo_surface_none_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_cairo_surface_none_return():cairo.Surface { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page index 869dd98..d63f467 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback @@ -18,22 +17,15 @@ callback - - test_callback - - -function test_callback(callback:Regress.TestCallback):Number { + Regress.test_callback + +function test_callback(callback: Regress.TestCallback): Number(gint) { // Gjs wrapper for regress_test_callback() } - + + - - - - - - <code>callback</code> @@ -45,6 +37,4 @@ function test_callback(callback:Regress.TestCallback):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page index 7b9ef5b..f4a3142 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_callback_async - - -function test_callback_async(callback:Regress.TestCallbackUserData):void { + Regress.test_callback_async + +function test_callback_async(callback: Regress.TestCallbackUserData): void { // Gjs wrapper for regress_test_callback_async() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_callback_async(callback:Regress.TestCallbackUserData):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page index d147c97..654a4c1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback_destroy_notify @@ -18,23 +17,16 @@ callback - - test_callback_destroy_notify - - -function test_callback_destroy_notify(callback:Regress.TestCallbackUserData):Number { + Regress.test_callback_destroy_notify + +function test_callback_destroy_notify(callback: Regress.TestCallbackUserData): Number(gint) { // Gjs wrapper for regress_test_callback_destroy_notify() } - - - -

Notified - callback persists until a DestroyNotify delegate + +

Notified - callback persists until a DestroyNotify delegate is invoked.

- - - - + <code>callback</code> @@ -46,6 +38,4 @@ is invoked.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page index 7fa31a3..c674140 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback_destroy_notify_no_user_data @@ -18,23 +17,16 @@ callback - - test_callback_destroy_notify_no_user_data - - -function test_callback_destroy_notify_no_user_data(callback:Regress.TestCallbackUserData):Number { + Regress.test_callback_destroy_notify_no_user_data + +function test_callback_destroy_notify_no_user_data(callback: Regress.TestCallbackUserData): Number(gint) { // Gjs wrapper for regress_test_callback_destroy_notify_no_user_data() } - - - -

Adds a scope notified callback with no user data. This can invoke an error + +

Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.

- - - - + <code>callback</code> @@ -46,6 +38,4 @@ condition in bindings which needs to be tested.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page index 66dec18..011b9e9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback_thaw_async - - test_callback_thaw_async - - -function test_callback_thaw_async():Number { + Regress.test_callback_thaw_async + +function test_callback_thaw_async(): Number(gint) { // Gjs wrapper for regress_test_callback_thaw_async() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_callback_thaw_async():Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page index 9a8b57e..a0b463a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page @@ -6,39 +6,29 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback_thaw_notifications - - test_callback_thaw_notifications - - -function test_callback_thaw_notifications():Number { + Regress.test_callback_thaw_notifications + +function test_callback_thaw_notifications(): Number(gint) { // Gjs wrapper for regress_test_callback_thaw_notifications() } - - - -

Invokes all callbacks installed by #test_callback_destroy_notify(), + +

Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.

- - - - + <code>Returns</code> -

Sum of the return values of the invoked callbacks.

+

Sum of the return values of the invoked callbacks.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page index dd9f597..bae0cbc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_callback_user_data @@ -18,23 +17,16 @@ callback - - test_callback_user_data - - -function test_callback_user_data(callback:Regress.TestCallbackUserData):Number { + Regress.test_callback_user_data + +function test_callback_user_data(callback: Regress.TestCallbackUserData): Number(gint) { // Gjs wrapper for regress_test_callback_user_data() } - - - -

Call - callback parameter persists for the duration of the method + +

Call - callback parameter persists for the duration of the method call and can be released on return.

- - - - + <code>callback</code> @@ -46,6 +38,4 @@ call and can be released on return.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page index a954544..df02862 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_closure - GObject.Closure + Function closure - - test_closure - - -function test_closure(closure:GObject.Closure):Number { + Regress.test_closure + +function test_closure(closure: Function): Number(gint) { // Gjs wrapper for regress_test_closure() } - + + - - - - - - <code>closure</code> @@ -45,6 +37,4 @@ function test_closure(closure:GObject.Closure):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page index 3c37f7a..86282fd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page @@ -6,38 +6,30 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_closure_one_arg - GObject.Closure + Function closure - Number + Number(gint) arg - - test_closure_one_arg - - -function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { + Regress.test_closure_one_arg + +function test_closure_one_arg(closure: Function, arg: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_closure_one_arg() } - + + - - - - - - <code>closure</code> @@ -53,6 +45,4 @@ function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page index 2bdbfe6..b226c3d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_closure_variant - GObject.Closure + Function closure @@ -22,37 +21,28 @@ arg - - test_closure_variant - - -function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Variant { + Regress.test_closure_variant + +function test_closure_variant(closure: Function, arg: GLib.Variant): GLib.Variant { // Gjs wrapper for regress_test_closure_variant() } - + + - - - - - - <code>closure</code> -

GClosure which takes one GVariant and returns a GVariant

+

GClosure which takes one GVariant and returns a GVariant

 <code>arg</code> -

a GVariant passed as argument to closure

+

a GVariant passed as argument to closure

 <code>Returns</code> -

the return value of closure

+

the return value of closure

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page index acb379e..3a2e342 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - GObject.Value + Any regress_test_date_in_gvalue - - test_date_in_gvalue - - -function test_date_in_gvalue():GObject.Value { + Regress.test_date_in_gvalue + +function test_date_in_gvalue(): Any { // Gjs wrapper for regress_test_date_in_gvalue() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_date_in_gvalue():GObject.Value { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page index 5a82a3f..055ea75 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_def_error_quark - - test_def_error_quark - - -function test_def_error_quark():GLib.Quark { + Regress.test_def_error_quark + +function test_def_error_quark(): GLib.Quark { // Gjs wrapper for regress_test_def_error_quark() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_def_error_quark():GLib.Quark { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page index 0ed75f6..6656080 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gdouble) regress_test_double - Number + Number(gdouble) in - - test_double - - -function test_double(in:Number):Number { + Regress.test_double + +function test_double(in: Number(gdouble)): Number(gdouble) { // Gjs wrapper for regress_test_double() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_double(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page index b26b613..7454760 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page @@ -6,37 +6,27 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [filename] + Array(String) regress_test_filename_return - - test_filename_return - - -function test_filename_return():[filename] { + Regress.test_filename_return + +function test_filename_return(): Array(String) { // Gjs wrapper for regress_test_filename_return() } - + + - - - - - - <code>Returns</code> -

list of strings

+

list of strings

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page index 30f2ef7..a9430d5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gfloat) regress_test_float - Number + Number(gfloat) in - - test_float - - -function test_float(in:Number):Number { + Regress.test_float + +function test_float(in: Number(gfloat)): Number(gfloat) { // Gjs wrapper for regress_test_float() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_float(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page index a419628..5c19831 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_garray_container_return - - test_garray_container_return - - -function test_garray_container_return():[String] { + Regress.test_garray_container_return + +function test_garray_container_return(): Array(String) { // Gjs wrapper for regress_test_garray_container_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_garray_container_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page index 86b1b78..eb46a61 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_garray_full_return - - test_garray_full_return - - -function test_garray_full_return():[String] { + Regress.test_garray_full_return + +function test_garray_full_return(): Array(String) { // Gjs wrapper for regress_test_garray_full_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_garray_full_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page index 31ab83c..d59da0f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_gerror_callback - - -function test_gerror_callback(callback:Regress.TestCallbackGError):void { + Regress.test_gerror_callback + +function test_gerror_callback(callback: Regress.TestCallbackGError): void { // Gjs wrapper for regress_test_gerror_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_gerror_callback(callback:Regress.TestCallbackGError):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page index b002deb..44e46f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_container_return - - test_ghash_container_return - - -function test_ghash_container_return():{String: String} { + Regress.test_ghash_container_return + +function test_ghash_container_return(): {String: String} { // Gjs wrapper for regress_test_ghash_container_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_container_return():{String: String} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page index 1c1a0a9..d12e41a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_everything_return - - test_ghash_everything_return - - -function test_ghash_everything_return():{String: String} { + Regress.test_ghash_everything_return + +function test_ghash_everything_return(): {String: String} { // Gjs wrapper for regress_test_ghash_everything_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_everything_return():{String: String} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page index b12b8f8..bebf0cc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,34 +13,25 @@ regress_test_ghash_gvalue_in - {String: GObject.Value} + {String: Any} hash - - test_ghash_gvalue_in - - -function test_ghash_gvalue_in(hash:{String: GObject.Value}):void { + Regress.test_ghash_gvalue_in + +function test_ghash_gvalue_in(hash: {String: Any}): void { // Gjs wrapper for regress_test_ghash_gvalue_in() } - + + - - - - - - <code>hash</code> -

the hash table returned by +

the hash table returned by .

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page index 08748ea..728f723 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - {String: GObject.Value} + {String: Any} regress_test_ghash_gvalue_return - - test_ghash_gvalue_return - - -function test_ghash_gvalue_return():{String: GObject.Value} { + Regress.test_ghash_gvalue_return + +function test_ghash_gvalue_return(): {String: Any} { // Gjs wrapper for regress_test_ghash_gvalue_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_gvalue_return():{String: GObject.Value} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page index 4dece43..b885843 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nested_everything_return - - test_ghash_nested_everything_return - - -function test_ghash_nested_everything_return():{String: {String: String}} { + Regress.test_ghash_nested_everything_return + +function test_ghash_nested_everything_return(): {String: {String: String}} { // Gjs wrapper for regress_test_ghash_nested_everything_return() } - + +

Specify nested parameterized types directly with the (type ) annotation.

- -

Specify nested parameterized types directly with the (type ) annotation.

- - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_nested_everything_return():{String: {String: String}} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page index 8aa4da3..e422fe5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,23 +13,16 @@ regress_test_ghash_nested_everything_return2 - - test_ghash_nested_everything_return2 - - -function test_ghash_nested_everything_return2():{String: {String: String}} { + Regress.test_ghash_nested_everything_return2 + +function test_ghash_nested_everything_return2(): {String: {String: String}} { // Gjs wrapper for regress_test_ghash_nested_everything_return2() } - - - -

Another way of specifying nested parameterized types: using the + +

Another way of specifying nested parameterized types: using the element-type annotation.

- - - - + <code>Returns</code> @@ -38,6 +30,4 @@ element-type annotation.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page index 62990fc..e1ced28 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_ghash_nothing_in - - -function test_ghash_nothing_in(in:{String: String}):void { + Regress.test_ghash_nothing_in + +function test_ghash_nothing_in(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_nothing_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_ghash_nothing_in(in:{String: String}):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page index 72d774d..15a291a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_ghash_nothing_in2 - - -function test_ghash_nothing_in2(in:{String: String}):void { + Regress.test_ghash_nothing_in2 + +function test_ghash_nothing_in2(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_nothing_in2() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_ghash_nothing_in2(in:{String: String}):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page index e3729a5..2f1e2f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nothing_return - - test_ghash_nothing_return - - -function test_ghash_nothing_return():{String: String} { + Regress.test_ghash_nothing_return + +function test_ghash_nothing_return(): {String: String} { // Gjs wrapper for regress_test_ghash_nothing_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_nothing_return():{String: String} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page index 7777ab4..e0319aa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nothing_return2 - - test_ghash_nothing_return2 - - -function test_ghash_nothing_return2():{String: String} { + Regress.test_ghash_nothing_return2 + +function test_ghash_nothing_return2(): {String: String} { // Gjs wrapper for regress_test_ghash_nothing_return2() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_nothing_return2():{String: String} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page index 413a75b..091d9e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_ghash_null_in - - -function test_ghash_null_in(in:{String: String}):void { + Regress.test_ghash_null_in + +function test_ghash_null_in(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_null_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_ghash_null_in(in:{String: String}):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page index 2c27253..c8585e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_ghash_null_out - - test_ghash_null_out - - -function test_ghash_null_out():void { + Regress.test_ghash_null_out + +function test_ghash_null_out(): {String: String} { // Gjs wrapper for regress_test_ghash_null_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page index df6d686..8f4de6e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_null_return - - test_ghash_null_return - - -function test_ghash_null_return():{String: String} { + Regress.test_ghash_null_return + +function test_ghash_null_return(): {String: String} { // Gjs wrapper for regress_test_ghash_null_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_ghash_null_return():{String: String} { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page index c3ac7cb..f6bc25a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_glist_container_return - - test_glist_container_return - - -function test_glist_container_return():[String] { + Regress.test_glist_container_return + +function test_glist_container_return(): Array(String) { // Gjs wrapper for regress_test_glist_container_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_glist_container_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page index fb31f77..e560ff0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_glist_everything_return - - test_glist_everything_return - - -function test_glist_everything_return():[String] { + Regress.test_glist_everything_return + +function test_glist_everything_return(): Array(String) { // Gjs wrapper for regress_test_glist_everything_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_glist_everything_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page index 3c85d19..952f527 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_glist_nothing_in - [String] + Array(String) in - - test_glist_nothing_in - - -function test_glist_nothing_in(in:[String]):void { + Regress.test_glist_nothing_in + +function test_glist_nothing_in(in: Array(String)): void { // Gjs wrapper for regress_test_glist_nothing_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_glist_nothing_in(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page index f160d12..ae7f182 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_glist_nothing_in2 - [String] + Array(String) in - - test_glist_nothing_in2 - - -function test_glist_nothing_in2(in:[String]):void { + Regress.test_glist_nothing_in2 + +function test_glist_nothing_in2(in: Array(String)): void { // Gjs wrapper for regress_test_glist_nothing_in2() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_glist_nothing_in2(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page index e741d90..65b4463 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_glist_nothing_return - - test_glist_nothing_return - - -function test_glist_nothing_return():[String] { + Regress.test_glist_nothing_return + +function test_glist_nothing_return(): Array(String) { // Gjs wrapper for regress_test_glist_nothing_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_glist_nothing_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page index 0fccdbb..8b91dc3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_glist_nothing_return2 - - test_glist_nothing_return2 - - -function test_glist_nothing_return2():[String] { + Regress.test_glist_nothing_return2 + +function test_glist_nothing_return2(): Array(String) { // Gjs wrapper for regress_test_glist_nothing_return2() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_glist_nothing_return2():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page index dfedc28..5725aea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_glist_null_in - [String] + Array(String) in - - test_glist_null_in - - -function test_glist_null_in(in:[String]):void { + Regress.test_glist_null_in + +function test_glist_null_in(in: Array(String)): void { // Gjs wrapper for regress_test_glist_null_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_glist_null_in(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page index a1c7c68..89ea91e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_glist_null_out - - test_glist_null_out - - -function test_glist_null_out():void { + Regress.test_glist_null_out + +function test_glist_null_out(): Array(String) { // Gjs wrapper for regress_test_glist_null_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page index 5133d11..1d53539 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_gslist_container_return - - test_gslist_container_return - - -function test_gslist_container_return():[String] { + Regress.test_gslist_container_return + +function test_gslist_container_return(): Array(String) { // Gjs wrapper for regress_test_gslist_container_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_gslist_container_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page index f82b1ce..159a968 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_gslist_everything_return - - test_gslist_everything_return - - -function test_gslist_everything_return():[String] { + Regress.test_gslist_everything_return + +function test_gslist_everything_return(): Array(String) { // Gjs wrapper for regress_test_gslist_everything_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_gslist_everything_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page index 3409619..fc97e1c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_gslist_nothing_in - [String] + Array(String) in - - test_gslist_nothing_in - - -function test_gslist_nothing_in(in:[String]):void { + Regress.test_gslist_nothing_in + +function test_gslist_nothing_in(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_nothing_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_gslist_nothing_in(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page index 05e0b56..2cf15e9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_gslist_nothing_in2 - [String] + Array(String) in - - test_gslist_nothing_in2 - - -function test_gslist_nothing_in2(in:[String]):void { + Regress.test_gslist_nothing_in2 + +function test_gslist_nothing_in2(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_nothing_in2() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_gslist_nothing_in2(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page index 03597fb..c85963a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_gslist_nothing_return - - test_gslist_nothing_return - - -function test_gslist_nothing_return():[String] { + Regress.test_gslist_nothing_return + +function test_gslist_nothing_return(): Array(String) { // Gjs wrapper for regress_test_gslist_nothing_return() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_gslist_nothing_return():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page index 0331f92..92c39d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_gslist_nothing_return2 - - test_gslist_nothing_return2 - - -function test_gslist_nothing_return2():[String] { + Regress.test_gslist_nothing_return2 + +function test_gslist_nothing_return2(): Array(String) { // Gjs wrapper for regress_test_gslist_nothing_return2() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_gslist_nothing_return2():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page index 34168c8..6942e10 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_gslist_null_in - [String] + Array(String) in - - test_gslist_null_in - - -function test_gslist_null_in(in:[String]):void { + Regress.test_gslist_null_in + +function test_gslist_null_in(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_null_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_gslist_null_in(in:[String]):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page index 4c9f3ca..e79e1ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_gslist_null_out - - test_gslist_null_out - - -function test_gslist_null_out():void { + Regress.test_gslist_null_out + +function test_gslist_null_out(): Array(String) { // Gjs wrapper for regress_test_gslist_null_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page index 824689a..ed44d94 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - GType + GObject.Type regress_test_gtype - GType + GObject.Type in - - test_gtype - - -function test_gtype(in:GType):GType { + Regress.test_gtype + +function test_gtype(in: GObject.Type): GObject.Type { // Gjs wrapper for regress_test_gtype() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_gtype(in:GType):GType { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page index 1eedc34..e838bdc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_gvariant_as - - test_gvariant_as - - -function test_gvariant_as():GLib.Variant { + Regress.test_gvariant_as + +function test_gvariant_as(): GLib.Variant { // Gjs wrapper for regress_test_gvariant_as() } - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page index a5709df..5079886 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_gvariant_asv - - test_gvariant_asv - - -function test_gvariant_asv():GLib.Variant { + Regress.test_gvariant_asv + +function test_gvariant_asv(): GLib.Variant { // Gjs wrapper for regress_test_gvariant_asv() } - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page index e1e7dc0..15bceed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_gvariant_i - - test_gvariant_i - - -function test_gvariant_i():GLib.Variant { + Regress.test_gvariant_i + +function test_gvariant_i(): GLib.Variant { // Gjs wrapper for regress_test_gvariant_i() } - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page index 139e0c6..5ece5f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_gvariant_s - - test_gvariant_s - - -function test_gvariant_s():GLib.Variant { + Regress.test_gvariant_s + +function test_gvariant_s(): GLib.Variant { // Gjs wrapper for regress_test_gvariant_s() } - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page index cec12de..e2eebbd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_gvariant_v - - test_gvariant_v - - -function test_gvariant_v():GLib.Variant { + Regress.test_gvariant_v + +function test_gvariant_v(): GLib.Variant { // Gjs wrapper for regress_test_gvariant_v() } - + + - - - - - - <code>Returns</code> -

New variant

+

New variant

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page index a49c65c..2ac3ba7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_hash_table_callback - {String: Number} + {String: Number(gint)} data @@ -22,26 +21,19 @@ callback - - test_hash_table_callback - - -function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCallbackHashtable):void { + Regress.test_hash_table_callback + +function test_hash_table_callback(data: {String: Number(gint)}, callback: Regress.TestCallbackHashtable): void { // Gjs wrapper for regress_test_hash_table_callback() } - + + - - - - - - <code>data</code> -

GHashTable that gets passed to callback

+

GHashTable that gets passed to callback

 <code>callback</code> @@ -49,6 +41,4 @@ function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCa - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page index 6193dd8..3bb1e7e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_int - Number + Number(gint) in - - test_int - - -function test_int(in:Number):Number { + Regress.test_int + +function test_int(in: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_int() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_int(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page index d8efb0b..d34ea70 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gint16 + Number(gint16) regress_test_int16 - gint16 + Number(gint16) in - - test_int16 - - -function test_int16(in:gint16):gint16 { + Regress.test_int16 + +function test_int16(in: Number(gint16)): Number(gint16) { // Gjs wrapper for regress_test_int16() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_int16(in:gint16):gint16 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page index 8015b37..044fa80 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gint32 + Number(gint32) regress_test_int32 - gint32 + Number(gint32) in - - test_int32 - - -function test_int32(in:gint32):gint32 { + Regress.test_int32 + +function test_int32(in: Number(gint32)): Number(gint32) { // Gjs wrapper for regress_test_int32() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_int32(in:gint32):gint32 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page index 24a69e9..79f3e63 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint64) regress_test_int64 - Number + Number(gint64) in - - test_int64 - - -function test_int64(in:Number):Number { + Regress.test_int64 + +function test_int64(in: Number(gint64)): Number(gint64) { // Gjs wrapper for regress_test_int64() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_int64(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page index ab573a0..0f18bca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gint8 + Number(gint8) regress_test_int8 - gint8 + Number(gint8) in - - test_int8 - - -function test_int8(in:gint8):gint8 { + Regress.test_int8 + +function test_int8(in: Number(gint8)): Number(gint8) { // Gjs wrapper for regress_test_int8() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_int8(in:gint8):gint8 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page index 020f9e2..534ea11 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,24 @@ in - - test_int_out_utf8 - - -function test_int_out_utf8(in:String):void { + Regress.test_int_out_utf8 + +function test_int_out_utf8(in: String): Number(gint) { // Gjs wrapper for regress_test_int_out_utf8() } - + + - - - - - - <code>in</code> + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page index cb84a3c..9caddd6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_int_value_arg - GObject.Value + Any v - - test_int_value_arg - - -function test_int_value_arg(v:GObject.Value):Number { + Regress.test_int_value_arg + +function test_int_value_arg(v: Any): Number(gint) { // Gjs wrapper for regress_test_int_value_arg() } - + + - - - - - - <code>v</code> @@ -45,6 +37,4 @@ function test_int_value_arg(v:GObject.Value):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page index 12bc1ae..d043206 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(glong) regress_test_long - Number + Number(glong) in - - test_long - - -function test_long(in:Number):Number { + Regress.test_long + +function test_long(in: Number(glong)): Number(glong) { // Gjs wrapper for regress_test_long() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_long(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page index ea0646f..18c89ee 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page @@ -6,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gint) regress_test_multi_callback @@ -18,22 +17,15 @@ callback - - test_multi_callback - - -function test_multi_callback(callback:Regress.TestCallback):Number { + Regress.test_multi_callback + +function test_multi_callback(callback: Regress.TestCallback): Number(gint) { // Gjs wrapper for regress_test_multi_callback() } - + + - - - - - - <code>callback</code> @@ -45,6 +37,4 @@ function test_multi_callback(callback:Regress.TestCallback):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page index 378ace7..c5d1f8c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,33 +13,32 @@ regress_test_multi_double_args - Number + Number(gdouble) in - - test_multi_double_args - - -function test_multi_double_args(in:Number):void { + Regress.test_multi_double_args + +function test_multi_double_args(in: Number(gdouble)): [one: Number(gdouble), two: Number(gdouble)] { // Gjs wrapper for regress_test_multi_double_args() } - + + - - - - - - <code>in</code> + +<code>one</code> + + + +<code>two</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page index 38a75e7..828f584 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,14 @@ regress_test_multiline_doc_comments - - test_multiline_doc_comments - - -function test_multiline_doc_comments():void { + Regress.test_multiline_doc_comments + +function test_multiline_doc_comments(): void { // Gjs wrapper for regress_test_multiline_doc_comments() } - + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- -

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page index 54bda89..a436fa7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,18 @@ regress_test_nested_parameter - Number + Number(gint) a - - test_nested_parameter - - -function test_nested_parameter(a:Number):void { + Regress.test_nested_parameter + +function test_nested_parameter(a: Number(gint)): void { // Gjs wrapper for regress_test_nested_parameter() } - - - -

<informaltable> + +

<informaltable> <tgroup cols="3"> <thead> <row> @@ -54,18 +49,13 @@ rgb(20%, 30%, 0%)</literallayout></entry> </row> </tbody> </tgroup> -</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

- - - - +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ <code>a</code> -

An integer

+

An integer

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page index 5af4d58..da0ee2b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_null_gerror_callback - - -function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { + Regress.test_null_gerror_callback + +function test_null_gerror_callback(callback: Regress.TestCallbackGError): void { // Gjs wrapper for regress_test_null_gerror_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page index 206ac21..00e7f0e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_owned_gerror_callback - - -function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):void { + Regress.test_owned_gerror_callback + +function test_owned_gerror_callback(callback: Regress.TestCallbackOwnedGError): void { // Gjs wrapper for regress_test_owned_gerror_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):vo - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page index 59381ae..55262c7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gshort + Number(gshort) regress_test_short - gshort + Number(gshort) in - - test_short - - -function test_short(in:gshort):gshort { + Regress.test_short + +function test_short(in: Number(gshort)): Number(gshort) { // Gjs wrapper for regress_test_short() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_short(in:gshort):gshort { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page index 9d8198f..741b80d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ callback - - test_simple_callback - - -function test_simple_callback(callback:Regress.TestSimpleCallback):void { + Regress.test_simple_callback + +function test_simple_callback(callback: Regress.TestSimpleCallback): void { // Gjs wrapper for regress_test_simple_callback() } - + + - - - - - - <code>callback</code> @@ -41,6 +33,4 @@ function test_simple_callback(callback:Regress.TestSimpleCallback):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page index bc6896d..75b7063 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gsize + Number(gsize) regress_test_size - gsize + Number(gsize) in - - test_size - - -function test_size(in:gsize):gsize { + Regress.test_size + +function test_size(in: Number(gsize)): Number(gsize) { // Gjs wrapper for regress_test_size() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_size(in:gsize):gsize { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page index ccc011d..bed4167 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - gssize + Number(gssize) regress_test_ssize - gssize + Number(gssize) in - - test_ssize - - -function test_ssize(in:gssize):gssize { + Regress.test_ssize + +function test_ssize(in: Number(gssize)): Number(gssize) { // Gjs wrapper for regress_test_ssize() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_ssize(in:gssize):gssize { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page index 7659a72..224203c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,19 @@ regress_test_strv_in - [String] + Array(String) arr - - test_strv_in - - -function test_strv_in(arr:[String]):Boolean { + Regress.test_strv_in + +function test_strv_in(arr: Array(String)): Boolean { // Gjs wrapper for regress_test_strv_in() } - + + - - - - - - <code>arr</code> @@ -45,6 +37,4 @@ function test_strv_in(arr:[String]):Boolean { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page index 20617c0..65e159f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - GObject.Value + Any regress_test_strv_in_gvalue - - test_strv_in_gvalue - - -function test_strv_in_gvalue():GObject.Value { + Regress.test_strv_in_gvalue + +function test_strv_in_gvalue(): Any { // Gjs wrapper for regress_test_strv_in_gvalue() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_strv_in_gvalue():GObject.Value { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page index 477a46f..3df6079 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_strv_out - - test_strv_out - - -function test_strv_out():[String] { + Regress.test_strv_out + +function test_strv_out(): Array(String) { // Gjs wrapper for regress_test_strv_out() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_strv_out():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page index d393946..824d190 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_strv_out_c - - test_strv_out_c - - -function test_strv_out_c():[String] { + Regress.test_strv_out_c + +function test_strv_out_c(): Array(String) { // Gjs wrapper for regress_test_strv_out_c() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_strv_out_c():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page index f9bec39..ba50c9f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - [String] + Array(String) regress_test_strv_out_container - - test_strv_out_container - - -function test_strv_out_container():[String] { + Regress.test_strv_out_container + +function test_strv_out_container(): Array(String) { // Gjs wrapper for regress_test_strv_out_container() } - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ function test_strv_out_container():[String] { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page index 01bcba4..0f2d143 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_strv_outarg - - test_strv_outarg - - -function test_strv_outarg():void { + Regress.test_strv_outarg + +function test_strv_outarg(): Array(String) { // Gjs wrapper for regress_test_strv_outarg() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page index 65ccab5..09aa430 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(glong) regress_test_timet - Number + Number(glong) in - - test_timet - - -function test_timet(in:Number):Number { + Regress.test_timet + +function test_timet(in: Number(glong)): Number(glong) { // Gjs wrapper for regress_test_timet() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_timet(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page index 1696583..f90dfca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_torture_signature_0 - Number + Number(gint) x @@ -22,26 +21,19 @@ foo - Number + Number(guint) m - - test_torture_signature_0 - - -function test_torture_signature_0(x:Number, foo:String, m:Number):void { + Regress.test_torture_signature_0 + +function test_torture_signature_0(x: Number(gint), foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_torture_signature_0() } - - - - - - - - + + + <code>x</code> @@ -55,8 +47,18 @@ function test_torture_signature_0(x:Number, foo:String, m:Number):void { <code>m</code> + +<code>y</code> + + + +<code>z</code> + + + +<code>q</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page index a10b0ab..a270b7e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_torture_signature_1 - Number + Number(gint) x @@ -22,26 +21,19 @@ foo - Number + Number(guint) m - - test_torture_signature_1 - - -function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { + Regress.test_torture_signature_1 + +function test_torture_signature_1(x: Number(gint), foo: String, m: Number(guint)): [ok: Boolean, y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_torture_signature_1() } - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>x</code> @@ -56,11 +48,21 @@ function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { -<code>Returns</code> +<code>ok</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>q</code> - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page index 3a3eb39..efc91d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,7 +13,7 @@ regress_test_torture_signature_2 - Number + Number(gint) x @@ -26,26 +25,19 @@ foo - Number + Number(guint) m - - test_torture_signature_2 - - -function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserData, foo:String, m:Number):void { + Regress.test_torture_signature_2 + +function test_torture_signature_2(x: Number(gint), callback: Regress.TestCallbackUserData, foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_torture_signature_2() } - + + - - - - - - <code>x</code> @@ -63,8 +55,18 @@ function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserDat <code>m</code> + +<code>y</code> + + + +<code>z</code> + + + +<code>q</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page index ac1653a..178bc03 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(guint) regress_test_uint - Number + Number(guint) in - - test_uint - - -function test_uint(in:Number):Number { + Regress.test_uint + +function test_uint(in: Number(guint)): Number(guint) { // Gjs wrapper for regress_test_uint() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_uint(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page index 93faff4..54c19af 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - guint16 + Number(guint16) regress_test_uint16 - guint16 + Number(guint16) in - - test_uint16 - - -function test_uint16(in:guint16):guint16 { + Regress.test_uint16 + +function test_uint16(in: Number(guint16)): Number(guint16) { // Gjs wrapper for regress_test_uint16() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_uint16(in:guint16):guint16 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page index ebab4d6..9d33d73 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - guint32 + Number(guint32) regress_test_uint32 - guint32 + Number(guint32) in - - test_uint32 - - -function test_uint32(in:guint32):guint32 { + Regress.test_uint32 + +function test_uint32(in: Number(guint32)): Number(guint32) { // Gjs wrapper for regress_test_uint32() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_uint32(in:guint32):guint32 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page index 942d786..3eb7a88 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(guint64) regress_test_uint64 - Number + Number(guint64) in - - test_uint64 - - -function test_uint64(in:Number):Number { + Regress.test_uint64 + +function test_uint64(in: Number(guint64)): Number(guint64) { // Gjs wrapper for regress_test_uint64() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_uint64(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page index f39dcc1..f7b8900 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - guint8 + Number(guint8) regress_test_uint8 - guint8 + Number(guint8) in - - test_uint8 - - -function test_uint8(in:guint8):guint8 { + Regress.test_uint8 + +function test_uint8(in: Number(guint8)): Number(guint8) { // Gjs wrapper for regress_test_uint8() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_uint8(in:guint8):guint8 { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page index 76f3310..7f345b1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - Number + Number(gulong) regress_test_ulong - Number + Number(gulong) in - - test_ulong - - -function test_ulong(in:Number):Number { + Regress.test_ulong + +function test_ulong(in: Number(gulong)): Number(gulong) { // Gjs wrapper for regress_test_ulong() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_ulong(in:Number):Number { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page index 25465b3..54d98f4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_unichar - - -function test_unichar(in:String):String { + Regress.test_unichar + +function test_unichar(in: String): String { // Gjs wrapper for regress_test_unichar() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_unichar(in:String):String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page index 8b7348e..f2701d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ e - - test_unsigned_enum_param - - -function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { + Regress.test_unsigned_enum_param + +function test_unsigned_enum_param(e: Regress.TestEnumUnsigned): String { // Gjs wrapper for regress_test_unsigned_enum_param() } - + + - - - - - - <code>e</code> @@ -45,6 +37,4 @@ function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page index 74ada4b..207181c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_ushort - - -function test_ushort(in:gushort):gushort { + Regress.test_ushort + +function test_ushort(in: gushort): gushort { // Gjs wrapper for regress_test_ushort() } - + + - - - - - - <code>in</code> @@ -45,6 +37,4 @@ function test_ushort(in:gushort):gushort { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page index 63fedb9..9d7f490 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_utf8_const_in - - -function test_utf8_const_in(in:String):void { + Regress.test_utf8_const_in + +function test_utf8_const_in(in: String): void { // Gjs wrapper for regress_test_utf8_const_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_utf8_const_in(in:String):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page index a63dc22..cf505ee 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_utf8_const_return - - test_utf8_const_return - - -function test_utf8_const_return():String { + Regress.test_utf8_const_return + +function test_utf8_const_return(): String { // Gjs wrapper for regress_test_utf8_const_return() } - + + - - - - - - <code>Returns</code> -

UTF-8 string

+

UTF-8 string

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page index 1f282c2..23364d7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,24 @@ inout - - test_utf8_inout - - -function test_utf8_inout(inout:String):void { + Regress.test_utf8_inout + +function test_utf8_inout(inout: String): String { // Gjs wrapper for regress_test_utf8_inout() } - + + - - - - - - -<code>inout</code> +<code>Returns</code> + + + +<code>Returns (out)</code> - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page index 2fec9e8..eef3daf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,20 @@ regress_test_utf8_nonconst_return - - test_utf8_nonconst_return - - -function test_utf8_nonconst_return():String { + Regress.test_utf8_nonconst_return + +function test_utf8_nonconst_return(): String { // Gjs wrapper for regress_test_utf8_nonconst_return() } - + + - - - - - - <code>Returns</code> -

UTF-8 string

+

UTF-8 string

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page index 14f3a55..bfcd72d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,22 +17,15 @@ in - - test_utf8_null_in - - -function test_utf8_null_in(in:String):void { + Regress.test_utf8_null_in + +function test_utf8_null_in(in: String): void { // Gjs wrapper for regress_test_utf8_null_in() } - + + - - - - - - <code>in</code> @@ -41,6 +33,4 @@ function test_utf8_null_in(in:String):void { - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page index 66632ff..db56a8b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_utf8_null_out - - test_utf8_null_out - - -function test_utf8_null_out():void { + Regress.test_utf8_null_out + +function test_utf8_null_out(): String { // Gjs wrapper for regress_test_utf8_null_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page index b1a4062..5162aba 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,20 @@ regress_test_utf8_out - - test_utf8_out - - -function test_utf8_out():void { + Regress.test_utf8_out + +function test_utf8_out(): String { // Gjs wrapper for regress_test_utf8_out() } - + + - - - - - - + +<code>Returns</code> + + - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page index e8a097e..9ae1e7c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,29 +13,24 @@ regress_test_utf8_out_nonconst_return - - test_utf8_out_nonconst_return - - -function test_utf8_out_nonconst_return():String { + Regress.test_utf8_out_nonconst_return + +function test_utf8_out_nonconst_return(): [return_value: String, out: String] { // Gjs wrapper for regress_test_utf8_out_nonconst_return() } - + + - - - - - - -<code>Returns</code> -

a copy of "first"

+<code>return_value</code> +

a copy of "first"

+ + +<code>out</code> +

a copy of "second"

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page index 07107ed..d250ca0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,24 @@ regress_test_utf8_out_out - - test_utf8_out_out - - -function test_utf8_out_out():void { + Regress.test_utf8_out_out + +function test_utf8_out_out(): [out0: String, out1: String] { // Gjs wrapper for regress_test_utf8_out_out() } - + + - - - - - - + +<code>out0</code> +

a copy of "first"

+ + +<code>out1</code> +

a copy of "second"

+ - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page index 59f03b7..d843d28 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page @@ -6,45 +6,35 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - GObject.Value + Any regress_test_value_return - Number + Number(gint) i - - test_value_return - - -function test_value_return(i:Number):GObject.Value { + Regress.test_value_return + +function test_value_return(i: Number(gint)): Any { // Gjs wrapper for regress_test_value_return() } - + + - - - - - - <code>i</code> -

an int

+

an int

 <code>Returns</code> -

the int wrapped in a GValue.

+

the int wrapped in a GValue.

 - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page index eb6ce0f..4cd4b2c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,14 @@ regress_test_versioning - - test_versioning - - -function test_versioning():void { + Regress.test_versioning + +function test_versioning(): void { // Gjs wrapper for regress_test_versioning() } - + - - - - -

Since 1.32.1

- - - - +

Since 1.32.1

- - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/index.page b/tests/scanner/Regress-1.0-Gjs-expected/index.page index a5426d8..426ebed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/index.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/index.page @@ -5,21 +5,9 @@ xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - - - Index - - - - - - - - - - + + Regress + Classes diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 0000000..55a4b6d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_DEFINE + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 0000000..c8887ff --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE +

Constant to define a calculated large value

+

Since 1.4

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 0000000..08eda31 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,14 @@ + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV +

Constant to define a calculated large value

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page index 9ac6820..f0b11e8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.ATestError - - - - - - - - + + <code>ATestError.CODE0</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page index 9490e4a..097c37b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AliasedTestBoxed - - - -

Typedef TestBoxed to test caller-allocates correctness

- - - - - - - +

Typedef TestBoxed to test caller-allocates correctness

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page new file mode 100644 index 0000000..bc24e5d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnAnonymousUnion->None + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page new file mode 100644 index 0000000..458ce06 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnAnonymousUnion->x + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page index 2556fed..86fafd9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page @@ -1,25 +1,40 @@ - - - + Regress.AnAnonymousUnion - - - - - - - - - - - + +from gi.repository import Regress + +an_anonymous_union = Regress.AnAnonymousUnion() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page index 4e19ef9..fa303bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page @@ -1,25 +1,25 @@ - - - + Regress.AnnotationBitfield - - - - - - - - - - - + + + + +<code>AnnotationBitfield.FOO</code> + + + +<code>AnnotationBitfield.BAR</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page index 9a652d8..53ba013 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page @@ -1,25 +1,30 @@ - - - + Regress.AnnotationCallback - - - -

This is a callback.

- - - - - - - + +@accepts(int) +@returns(int) +def on_AnnotationCallback(in): + +

This is a callback.

+ + + +<code>in</code> +

array of ints

+ + +<code>Returns</code> +

array of ints

+ + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page new file mode 100644 index 0000000..71a9afb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->arr +

an array of length @len

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page new file mode 100644 index 0000000..36204ad --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->field1 +

Some documentation

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page new file mode 100644 index 0000000..e56ec4f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationFields->len +

the length of array

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page index 5323454..c7d386b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page @@ -1,25 +1,40 @@ - - - + Regress.AnnotationFields - - - -

This is a struct for testing field documentation and annotations

- - - - - - - + +from gi.repository import Regress + +annotation_fields = Regress.AnnotationFields() + +

This is a struct for testing field documentation and annotations

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page index db77a11..5933656 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page @@ -1,25 +1,34 @@ - - - + Regress.AnnotationForeachFunc - - - - - - - - - - - + +@accepts(Regress.AnnotationObject, unicode, gpointer) +@returns(none) +def on_AnnotationForeachFunc(object, item, user_data): + + + + + +<code>object</code> + + + +<code>item</code> + + + +<code>user_data</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page index 79844c6..6d6b440 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page @@ -1,25 +1,30 @@ - - - + Regress.AnnotationListCallback - - - -

This is a callback taking a list.

- - - - - - - + +@accepts([unicode]) +@returns([unicode]) +def on_AnnotationListCallback(in): + +

This is a callback taking a list.

+ + + +<code>in</code> +

list of strings

+ + +<code>Returns</code> +

list of strings

+ + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page index 17c8029..1e2be6c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page @@ -1,26 +1,27 @@ - - - + Regress.AnnotationNotifyFunc - - - -

This is a callback with a 'closure' argument that is not named + +@accepts(gpointer) +@returns(none) +def on_AnnotationNotifyFunc(data): + +

This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated.

- - - - - - - + + + +<code>data</code> +

The user data

+ + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index 9ed31bc..afeaab0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - attribute-signal - Regress.AnnotationObject::attribute-signal - - + def callback(annotation_object, arg1, arg2, user_param1, ...) - + +

This signal tests a signal with attributes.

- -

This signal tests a signal with attributes.

- - - - <code>annotation_object</code> @@ -30,11 +22,11 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) <code>arg1</code> -

a value

+

a value

 <code>arg2</code> -

another value

+

another value

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -44,10 +36,8 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) <code>Returns</code> -

the return value

+

the return value

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 29eedcc..9dc3aad 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - doc-empty-arg-parsing - Regress.AnnotationObject::doc-empty-arg-parsing - - + def callback(annotation_object, arg1, user_param1, ...) - + +

This signal tests an empty document argument (arg1)

- -

This signal tests an empty document argument (arg1)

- - - - <code>annotation_object</code> @@ -40,6 +32,4 @@ def callback(annotation_object, arg1, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page index d9d8b55..ebbf691 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - function-property - Regress.AnnotationObject:function-property - - + "function-property" Regress.AnnotationCallback : Read / Write / Construct - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page index fdfa65f..62ade5a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-signal - Regress.AnnotationObject::list-signal - - + def callback(annotation_object, list, user_param1, ...) - - - -

This is a signal which takes a list of strings, but it's not + +

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

- - - - + <code>annotation_object</code> @@ -31,7 +23,7 @@ known by GObject as it's only marked as G_TYPE_POINTER

 <code>list</code> -

a list of strings

+

a list of strings

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -41,6 +33,4 @@ known by GObject as it's only marked as G_TYPE_POINTER

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page new file mode 100644 index 0000000..97f17cd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.AnnotationObject->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page index a3cb045..f62c198 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page @@ -6,25 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-property - Regress.AnnotationObject:string-property - - + "string-property" unicode : Read / Write / Construct - - - -

This is a property which is a string

- - -

Since 1.0

- - - - - + +

This is a property which is a string

+

Since 1.0

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page index 06e79aa..d52eb3f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -6,25 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string-signal - Regress.AnnotationObject::string-signal - - + def callback(annotation_object, string, user_param1, ...) - - - -

This is a signal which has a broken signal handler, + +

This is a signal which has a broken signal handler, it says it's pointer but it's actually a string.

- - -

Since 1.0

- - +

Since 1.0

<code>annotation_object</code> @@ -32,7 +23,7 @@ it says it's pointer but it's actually a string.

 <code>string</code> -

a string

+

a string

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -42,6 +33,4 @@ it says it's pointer but it's actually a string.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page index c417d1e..fc7cacd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -6,26 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - tab-property - Regress.AnnotationObject:tab-property - - + "tab-property" unicode : Read / Write / Construct - - - -

This is a property annotation intentionally indented with a mix + +

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

- - - - - +

Since 1.2

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page index a04abd7..0b18415 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,27 +21,20 @@ somearg - Regress.AnnotationObject.allow_none - - + @accepts(Regress.AnnotationObject, unicode) @returns(GObject.Object) def allow_none(self, somearg): # Python wrapper for regress_annotation_object_allow_none() - + + - - - - - - <code>self</code> -

a

+

a GObject.Object

 <code>somearg</code> @@ -54,6 +46,4 @@ def allow_none(self, somearg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page index bebf773..bab5a57 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ toown - Regress.AnnotationObject.calleeowns - - + @accepts(Regress.AnnotationObject, GObject.Object) @returns(int) def calleeowns(self, toown): # Python wrapper for regress_annotation_object_calleeowns() - + +

This is a test for out arguments; GObject defaults to transfer

- -

This is a test for out arguments; GObject defaults to transfer

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>toown</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -54,6 +46,4 @@ def calleeowns(self, toown): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page index ef9361f..eec4b16 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,35 +25,28 @@ toown2 - Regress.AnnotationObject.calleesowns - - + @accepts(Regress.AnnotationObject, GObject.Object, GObject.Object) @returns(int) def calleesowns(self, toown1, toown2): # Python wrapper for regress_annotation_object_calleesowns() - + +

This is a test for out arguments, one transferred, other not

- -

This is a test for out arguments, one transferred, other not

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>toown1</code> -

a

+

a GObject.Object

 <code>toown2</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -62,6 +54,4 @@ def calleesowns(self, toown1, toown2): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page index 4f58e6f..56d438e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ nums - Regress.AnnotationObject.compute_sum - - + @accepts(Regress.AnnotationObject, [int]) @returns(none) def compute_sum(self, nums): # Python wrapper for regress_annotation_object_compute_sum() - + +

Test taking a zero-terminated array

- -

Test taking a zero-terminated array

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>nums</code> -

Sequence of numbers

+

Sequence of numbers

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page index 33463c4..3845573 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,39 +25,30 @@ n_nums - Regress.AnnotationObject.compute_sum_n - - + @accepts(Regress.AnnotationObject, [int], int) @returns(none) def compute_sum_n(self, nums, n_nums): # Python wrapper for regress_annotation_object_compute_sum_n() - + +

Test taking an array with length parameter

- -

Test taking an array with length parameter

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>nums</code> -

Sequence of +

Sequence of numbers that are zero-terminated

 <code>n_nums</code> -

Length of number array

+

Length of number array

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page index b3beb69..8624f61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,39 +25,30 @@ n_nums - Regress.AnnotationObject.compute_sum_nz - - + @accepts(Regress.AnnotationObject, [int], int) @returns(none) def compute_sum_nz(self, nums, n_nums): # Python wrapper for regress_annotation_object_compute_sum_nz() - + +

Test taking a zero-terminated array with length parameter

- -

Test taking a zero-terminated array with length parameter

- - - - <code>self</code> -

a

+

a

<code>nums</code> -

Sequence of numbers that +

Sequence of numbers that are zero-terminated

 <code>n_nums</code> -

Length of number array

+

Length of number array

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page index 6498ac2..c4e6562 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ self - Regress.AnnotationObject.create_object - - + @accepts(Regress.AnnotationObject) @returns(GObject.Object) def create_object(self): # Python wrapper for regress_annotation_object_create_object() - + +

Test returning a caller-owned object

- -

Test returning a caller-owned object

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -46,6 +38,4 @@ def create_object(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page index fac9f16..d3aee4a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ self - Regress.AnnotationObject.do_not_use - - + @accepts(Regress.AnnotationObject) @returns(GObject.Object) def do_not_use(self): # Python wrapper for regress_annotation_object_do_not_use() - + + - - - - - - <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -46,6 +38,4 @@ def do_not_use(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page index 7e03266..050d292 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.AnnotationObject.extra_annos - - + @accepts(Regress.AnnotationObject) @returns(none) def extra_annos(self): # Python wrapper for regress_annotation_object_extra_annos() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def extra_annos(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page index 1010a01..4f30a04 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,38 +25,29 @@ user_data - Regress.AnnotationObject.foreach - - + @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) @returns(none) def foreach(self, func, user_data): # Python wrapper for regress_annotation_object_foreach() - + +

Test taking a call-scoped callback

- -

Test taking a call-scoped callback

- - - - <code>self</code> -

a

+

a

<code>func</code> -

Callback to invoke

+

Callback to invoke

 <code>user_data</code> -

Callback user data

+

Callback user data

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page index 8d658f5..f23a57d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,28 +17,21 @@ self - Regress.AnnotationObject.get_hash - - + @accepts(Regress.AnnotationObject) @returns({unicode: GObject.Object}) def get_hash(self): # Python wrapper for regress_annotation_object_get_hash() - - - -

This is a test for returning a hash table mapping strings to + +

This is a test for returning a hash table mapping strings to objects.

- - - - + <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -47,6 +39,4 @@ objects.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index ef231f5..957eb46 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,29 +17,22 @@ self - Regress.AnnotationObject.get_objects - - + @accepts(Regress.AnnotationObject) @returns([Regress.AnnotationObject]) def get_objects(self): # Python wrapper for regress_annotation_object_get_objects() - - - -

This is a test for returning a list of objects. + +

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

- - - - + <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -48,6 +40,4 @@ intentionally similar example to gtk_container_get_children

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 13570b6..fb4d16d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,28 +17,21 @@ self - Regress.AnnotationObject.get_strings - - + @accepts(Regress.AnnotationObject) @returns([unicode]) def get_strings(self): # Python wrapper for regress_annotation_object_get_strings() - - - -

This is a test for returning a list of strings, where + +

This is a test for returning a list of strings, where each string needs to be freed.

- - - - + <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -47,6 +39,4 @@ each string needs to be freed.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page index ce1111f..0e7df1b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ self - Regress.AnnotationObject.hidden_self - - + @accepts(Regress.AnnotationObject) @returns(none) def hidden_self(self): # Python wrapper for regress_annotation_object_hidden_self() - + + - - - - - - <code>self</code> -

A

+

A

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page index 0e77f85..4e983c1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ inarg - Regress.AnnotationObject.in - - + @accepts(Regress.AnnotationObject, int) @returns(int) def in(self, inarg): # Python wrapper for regress_annotation_object_in() - + +

This is a test for in arguments

- -

This is a test for in arguments

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>inarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> @@ -54,6 +46,4 @@ def in(self, inarg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page index 6816eaf..01aa1a3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ inoutarg - Regress.AnnotationObject.inout - - + @accepts(Regress.AnnotationObject, int) @returns(int) def inout(self, inoutarg): # Python wrapper for regress_annotation_object_inout() - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> @@ -54,6 +46,4 @@ def inout(self, inoutarg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page index aef9dec..f862c2f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ inoutarg - Regress.AnnotationObject.inout2 - - + @accepts(Regress.AnnotationObject, int) @returns(int) def inout2(self, inoutarg): # Python wrapper for regress_annotation_object_inout2() - + +

This is a second test for out arguments

- -

This is a second test for out arguments

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> @@ -54,6 +46,4 @@ def inout2(self, inoutarg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page index 4ba4bf6..a45c659 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ inoutarg - Regress.AnnotationObject.inout3 - - + @accepts(Regress.AnnotationObject, int) @returns(int) def inout3(self, inoutarg): # Python wrapper for regress_annotation_object_inout3() - + +

This is a 3th test for out arguments

- -

This is a 3th test for out arguments

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>inoutarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> @@ -54,6 +46,4 @@ def inout3(self, inoutarg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page index b6badcf..0716972 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ self - Regress.AnnotationObject.method - - + @accepts(Regress.AnnotationObject) @returns(int) def method(self): # Python wrapper for regress_annotation_object_method() - + + - - - - - - <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -46,6 +38,4 @@ def method(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page index aa50a26..a9d5df4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ self - Regress.AnnotationObject.notrans - - + @accepts(Regress.AnnotationObject) @returns(GObject.Object) def notrans(self): # Python wrapper for regress_annotation_object_notrans() - + + - - - - - - <code>self</code> -

a

+

a GObject.Object

 <code>Returns</code> @@ -46,6 +38,4 @@ def notrans(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page index 606b4a1..19b16d5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ outarg - Regress.AnnotationObject.out - - + @accepts(Regress.AnnotationObject, int) @returns(int) def out(self, outarg): # Python wrapper for regress_annotation_object_out() - + +

This is a test for out arguments

- -

This is a test for out arguments

- - - - <code>self</code> -

a

+

a GObject.Object

 <code>outarg</code> -

This is an argument test

+

This is an argument test

 <code>Returns</code> @@ -54,6 +46,4 @@ def out(self, outarg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page index 006766f..6c1c564 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.AnnotationObject - from gi.repository import Regress -annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) +annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) + +

This is an object used to test annotations.

- -

This is an object used to test annotations.

- - - - Hierarchy @@ -34,8 +27,11 @@ annotation_object = Regress.AnnotationObject( - Functions + Static Functions Properties @@ -55,8 +51,10 @@ annotation_object = Regress.AnnotationObject( - -

This shouldn't be scanned as a constructor.

- - - - <code>self</code> @@ -54,6 +46,4 @@ def append_new_stack_layer(self, x): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page index dcc20f6..a711dd3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.FooObject.dup_name - - + @accepts(Regress.FooObject) @returns(unicode) def dup_name(self): # Python wrapper for regress_foo_object_dup_name() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def dup_name(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page index 0b32bef..fc41e2b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ self - Regress.FooObject.external_type - - + @accepts(Regress.FooObject) @returns(Utility.Object) def external_type(self): # Python wrapper for regress_foo_object_external_type() - + + - - - - - - <code>self</code> -

a

+

a

<code>Returns</code> @@ -46,6 +38,4 @@ def external_type(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page index 826efd8..3876136 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,23 +13,16 @@ regress_foo_object_get_default - Regress.FooObject.get_default - - + @returns(Regress.FooSubobject) def get_default(): # Python wrapper for regress_foo_object_get_default() - - - -

This function is intended to match clutter_stage_get_default which + +

This function is intended to match clutter_stage_get_default which uses a C sugar return type.

- - - - + <code>Returns</code> @@ -38,6 +30,4 @@ uses a C sugar return type.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page index e66d493..64575f2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.FooObject.get_name - - + @accepts(Regress.FooObject) @returns(unicode) def get_name(self): # Python wrapper for regress_foo_object_get_name() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def get_name(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page index e171f82..236aeb6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ glyph - Regress.FooObject.handle_glyph - - + @accepts(Regress.FooObject, Utility.Glyph) @returns(none) def handle_glyph(self, glyph): # Python wrapper for regress_foo_object_handle_glyph() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def handle_glyph(self, glyph): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page index 1781562..62cc7f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ time - Regress.FooObject.is_it_time_yet - - + @accepts(Regress.FooObject, int) @returns(none) def is_it_time_yet(self, time): # Python wrapper for regress_foo_object_is_it_time_yet() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def is_it_time_yet(self, time): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page index 3265e6b..2670dd2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObject - from gi.repository import Regress -foo_object = Regress.FooObject(hidden=value, string=value) +foo_object = Regress.FooObject(hidden=value, string=value) + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ foo_object = Regress.FooObject(hidden - - + + Constructors + @@ -44,7 +40,7 @@ foo_object = Regress.FooObject(hidden - Functions + Static Functions Properties @@ -55,8 +51,10 @@ foo_object = Regress.FooObject(hidden Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page index 88dee52..d33dff9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,38 +25,29 @@ length - Regress.FooObject.read - - + @accepts(Regress.FooObject, int, int) @returns(none) def read(self, offset, length): # Python wrapper for regress_foo_object_read() - + +

Read some stuff.

- -

Read some stuff.

- - - - <code>self</code> -

obj

+

obj

 <code>offset</code> -

offset

+

offset

 <code>length</code> -

length

+

length

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page index c652a10..462e4b2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_object_static_meth - Regress.FooObject.static_meth - - + @returns(int) def static_meth(): # Python wrapper for regress_foo_object_static_meth() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def static_meth(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page index efdc5c4..50a7da6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ some_type - Regress.FooObject.various - - + @accepts(Regress.FooObject, gpointer, GType) @returns(none) def various(self, data, some_type): # Python wrapper for regress_foo_object_various() - + + - - - - - - <code>self</code> @@ -58,6 +50,4 @@ def various(self, data, some_type): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page index f4920be..fb77107 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ first_param - Regress.FooObject.virtual_method - - + @accepts(Regress.FooObject, int) @returns(bool) def virtual_method(self, first_param): # Python wrapper for regress_foo_object_virtual_method() - + + - - - - - - <code>self</code> @@ -54,6 +46,4 @@ def virtual_method(self, first_param): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page index 44a63ab..fecc554 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooObjectCookie - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page index dadf523..69a2798 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooOtherObject - from gi.repository import Regress -foo_other_object = Regress.FooOtherObject() +foo_other_object = Regress.FooOtherObject() + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ foo_other_object = Regress.FooOtherObject() - - + + Constructors + @@ -44,7 +40,7 @@ foo_other_object = Regress.FooOtherObject() - Functions + Static Functions Properties @@ -55,8 +51,10 @@ foo_other_object = Regress.FooOtherObject() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page new file mode 100644 index 0000000..f1da68f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->height + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page new file mode 100644 index 0000000..dd55384 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->width + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page new file mode 100644 index 0000000..2c4377b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->x + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page new file mode 100644 index 0000000..8b4a9a3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooRectangle->y + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page index fe924f4..3dce1cb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ r2 - Regress.FooRectangle.add - - + @accepts(Regress.FooRectangle, Regress.FooRectangle) @returns(none) def add(self, r2): # Python wrapper for regress_foo_rectangle_add() - + + - - - - - - <code>self</code> -

add to this rect

+

add to this rect

 <code>r2</code> -

source rectangle

+

source rectangle

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page index 0cfef62..3555480 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page @@ -1,25 +1,40 @@ - - - + Regress.FooRectangle - - - - - - - - - - - + +from gi.repository import Regress + +foo_rectangle = Regress.FooRectangle() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page index 8a08c9a..bb6bc51 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooStackLayer - - - - - - - - + + <code>FooStackLayer.DESKTOP</code> @@ -58,6 +50,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page new file mode 100644 index 0000000..655d65d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooStruct->member + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page new file mode 100644 index 0000000..a0d9891 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooStruct->priv + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page index 84f5d19..9e4a576 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page @@ -1,25 +1,40 @@ - - - + Regress.FooStruct - - - - - - - - - - - + +from gi.repository import Regress + +foo_struct = Regress.FooStruct() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page new file mode 100644 index 0000000..52a15b7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page @@ -0,0 +1,40 @@ + + + + + + Regress.FooStructPrivate + +from gi.repository import Regress + +foo_struct_private = Regress.FooStructPrivate() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page index a42bb17..3b323e1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - destroy-event - Regress.FooSubInterface::destroy-event - - + def callback(foo_sub_interface, user_param1, ...) - + + - - - - - - <code>foo_sub_interface</code> @@ -36,6 +28,4 @@ def callback(foo_sub_interface, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page index 82dbc62..dad4853 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::destroy_event - - + @accepts(Regress.FooSubInterface) @returns(none) def do_destroy_event(self): - + + - - - - - - <code>self</code> @@ -31,6 +23,4 @@ def do_destroy_event(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page index a035189..1ed2e3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::do_bar - - + @accepts(Regress.FooSubInterface) @returns(none) def do_do_bar(self): - + + - - - - - - <code>self</code> @@ -31,6 +23,4 @@ def do_do_bar(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page index 3b0404f..aa5a402 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubInterface::do_baz - - + @accepts(Regress.FooSubInterface, GObject.Callback, gpointer) @returns(none) def do_do_baz(self, callback, user_data): - + + - - - - - - <code>self</code> @@ -39,6 +31,4 @@ def do_do_baz(self, callback, user_data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page index 1ecac0d..495168a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.FooSubInterface.do_bar - - + @accepts(Regress.FooSubInterface) @returns(none) def do_bar(self): # Python wrapper for regress_foo_sub_interface_do_bar() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def do_bar(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page index 071fb0d..5b76e3f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ user_data - Regress.FooSubInterface.do_baz - - + @accepts(Regress.FooSubInterface, GObject.Callback, gpointer) @returns(none) def do_baz(self, callback, user_data): # Python wrapper for regress_foo_sub_interface_do_baz() - + + - - - - - - <code>self</code> @@ -58,6 +50,4 @@ def do_baz(self, callback, user_data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page index 81593d3..611edb1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page @@ -1,38 +1,33 @@ - - - + Regress.FooSubInterface - from gi.repository import Regress foo_sub_interface = Regress.FooSubInterface() - - - - - - + - Hierarchy - - - Regress.FooSubInterface - - + Prerequisites +

FooSubInterface requires Regress.FooInterface

+ + + Known Implementations +

None

 - - + + Constructors + @@ -41,7 +36,7 @@ foo_sub_interface = Regress.FooSubInterface() - Functions + Static Functions Properties @@ -52,8 +47,10 @@ foo_sub_interface = Regress.FooSubInterface() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page new file mode 100644 index 0000000..33994c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooSubobject->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page index fc7b5ad..9cc4d6b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooSubobject - from gi.repository import Regress -foo_subobject = Regress.FooSubobject() +foo_subobject = Regress.FooSubobject() + + - - - - - - Hierarchy @@ -37,8 +30,11 @@ foo_subobject = Regress.FooSubobject() - - + + Constructors + @@ -47,7 +43,7 @@ foo_subobject = Regress.FooSubobject() - Functions + Static Functions Properties @@ -58,8 +54,10 @@ foo_subobject = Regress.FooSubobject() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page new file mode 100644 index 0000000..cc40f8f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->data + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page new file mode 100644 index 0000000..6db4319 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->lines + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page new file mode 100644 index 0000000..c13779f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->x + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page new file mode 100644 index 0000000..df8f251 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooThingWithArray->y + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page index 430dce7..b5224c3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page @@ -1,25 +1,40 @@ - - - + Regress.FooThingWithArray - - - - - - - - - - - + +from gi.repository import Regress + +foo_thing_with_array = Regress.FooThingWithArray() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page new file mode 100644 index 0000000..6c180dd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooUnion->regress_foo + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page index 9746f17..84a0b44 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page @@ -1,25 +1,40 @@ - - - + Regress.FooUnion - - - - - - - - - - - + +from gi.repository import Regress + +foo_union = Regress.FooUnion() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page new file mode 100644 index 0000000..26d131c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page @@ -0,0 +1,14 @@ + + + + + + Regress.FooUtilityStruct->bar + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page index 2b94f69..7c2d3e6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page @@ -1,25 +1,40 @@ - - - + Regress.FooUtilityStruct - - - - - - - - - - - + +from gi.repository import Regress + +foo_utility_struct = Regress.FooUtilityStruct() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page index c389ef0..19bee42 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.FooXEvent - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page new file mode 100644 index 0000000..e9876e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_ELSE + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page new file mode 100644 index 0000000..bfef183 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page @@ -0,0 +1,14 @@ + + + + + + Regress.GI_SCANNER_IFDEF + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 0000000..8c16dd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 0000000..3b0d6f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,14 @@ + + + + + + Regress.GUINT64_CONSTANTA + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 0000000..cdce607 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.G_GINT64_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page new file mode 100644 index 0000000..e0512ab --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page new file mode 100644 index 0000000..030d15b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page @@ -0,0 +1,40 @@ + + + + + + Regress.Intset + +from gi.repository import Regress + +intset = Regress.Intset() + +

Like telepathy-glib's TpIntset.

+ + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 0000000..85fe96e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.LONG_STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page new file mode 100644 index 0000000..db51500 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->attributes + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page new file mode 100644 index 0000000..3bfbac1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->dummy + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page new file mode 100644 index 0000000..408ab29 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page @@ -0,0 +1,16 @@ + + + + + + Regress.LikeGnomeKeyringPasswordSchema->dummy2 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 44a946e..94945b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -1,25 +1,40 @@ - - - + Regress.LikeGnomeKeyringPasswordSchema - - - - - - - - - - - + +from gi.repository import Regress + +like_gnome_keyring_password_schema = Regress.LikeGnomeKeyringPasswordSchema() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page new file mode 100644 index 0000000..dbc8998 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page @@ -0,0 +1,14 @@ + + + + + + Regress.LikeXklConfigItem->name + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page index fb4831f..7e9839e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page @@ -1,25 +1,40 @@ - - - + Regress.LikeXklConfigItem - - - - - - - - - - - + +from gi.repository import Regress + +like_xkl_config_item = Regress.LikeXklConfigItem() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page index a6815c8..f84c257 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ name - Regress.LikeXklConfigItem.set_name - - + @accepts(Regress.LikeXklConfigItem, unicode) @returns(none) def set_name(self, name): # Python wrapper for regress_like_xkl_config_item_set_name() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def set_name(self, name): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page new file mode 100644 index 0000000..91d7ce5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MAXUINT64 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page new file mode 100644 index 0000000..1531540 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page @@ -0,0 +1,14 @@ + + + + + + Regress.MININT64 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 0000000..29e7314 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,14 @@ + + + + + + Regress.Mixed_Case_Constant + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 0000000..a0aad76 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page index f66aee4..1acd4d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.PtrArrayAlias - - - -

Typedef'd GPtrArray for some reason

- - - - - - - +

Typedef'd GPtrArray for some reason

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 0000000..be1d6e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.STRING_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page index f31b58e..9ab2189 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestABCError - - - - - - - - + + <code>TestABCError.CODE1</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page index 8a8114d..832a3df 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_abc_error_quark - - Index.quark - - + Regress.TestABCError.quark + @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_abc_error_quark() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def quark(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page new file mode 100644 index 0000000..d394f4d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->nested_a + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page new file mode 100644 index 0000000..3084c21 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->priv + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page new file mode 100644 index 0000000..36f6632 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxed->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page index 6e69b52..2bbe466 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestBoxed.copy - - + @accepts(Regress.TestBoxed) @returns(Regress.TestBoxed) def copy(self): # Python wrapper for regress_test_boxed_copy() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def copy(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page index b4e88aa..e15ba35 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ other - Regress.TestBoxed.equals - - + @accepts(Regress.TestBoxed, Regress.TestBoxed) @returns(bool) def equals(self, other): # Python wrapper for regress_test_boxed_equals() - + + - - - - - - <code>self</code> @@ -54,6 +46,4 @@ def equals(self, other): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page index baa423f..45b56f9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page @@ -1,25 +1,40 @@ - - - + Regress.TestBoxed - - - - - - - - - - - + +from gi.repository import Regress + +test_boxed = Regress.TestBoxed() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page new file mode 100644 index 0000000..c7666c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page new file mode 100644 index 0000000..a5f4a34 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedB->some_long + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page index 2629154..4885067 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestBoxedB.copy - - + @accepts(Regress.TestBoxedB) @returns(Regress.TestBoxedB) def copy(self): # Python wrapper for regress_test_boxed_b_copy() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def copy(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page index 0e39780..835e8d6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page @@ -1,25 +1,40 @@ - - - + Regress.TestBoxedB - - - - - - - - - - - + +from gi.repository import Regress + +test_boxed_b = Regress.TestBoxedB() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page new file mode 100644 index 0000000..a5d7c2b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedC->another_thing + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page new file mode 100644 index 0000000..0f755dd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestBoxedC->refcount + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page index 18b77d9..adc2dc8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page @@ -1,25 +1,40 @@ - - - + Regress.TestBoxedC - - - - - - - - - - - + +from gi.repository import Regress + +test_boxed_c = Regress.TestBoxedC() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page index 9910236..94c6fec 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestBoxedD.copy - - + @accepts(Regress.TestBoxedD) @returns(Regress.TestBoxedD) def copy(self): # Python wrapper for regress_test_boxed_d_copy() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def copy(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page index 9750cc3..377d841 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestBoxedD.free - - + @accepts(Regress.TestBoxedD) @returns(none) def free(self): # Python wrapper for regress_test_boxed_d_free() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def free(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page index f050eb6..d28544c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestBoxedD.get_magic - - + @accepts(Regress.TestBoxedD) @returns(int) def get_magic(self): # Python wrapper for regress_test_boxed_d_get_magic() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def get_magic(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page index 995e80d..ea57619 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page @@ -1,25 +1,40 @@ - - - + Regress.TestBoxedD - - - - - - - - - - - + +from gi.repository import Regress + +test_boxed_d = Regress.TestBoxedD() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page new file mode 100644 index 0000000..d47a18c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page @@ -0,0 +1,40 @@ + + + + + + Regress.TestBoxedPrivate + +from gi.repository import Regress + +test_boxed_private = Regress.TestBoxedPrivate() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page index bed84d5..89bde37 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page @@ -1,25 +1,25 @@ - - - + Regress.TestCallback - - - - - - - - - - - + +@returns(int) +def on_TestCallback(): + + + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page index 7d3f7b8..aa45b05 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page @@ -1,25 +1,42 @@ - - - + Regress.TestCallbackArray - - - - - - - - - - - + +@accepts([int], gsize, [unicode], int) +@returns(int) +def on_TestCallbackArray(one, one_length, two, two_length): + + + + + +<code>one</code> + + + +<code>one_length</code> + + + +<code>two</code> + + + +<code>two_length</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page index 0b8fca1..73a5992 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page @@ -1,25 +1,38 @@ - - - + Regress.TestCallbackFull - - - - - - - - - - - + +@accepts(int, float, filename) +@returns(int) +def on_TestCallbackFull(foo, bar, path): + + + + + +<code>foo</code> +

the investment rate

+ + +<code>bar</code> +

how much money

+ + +<code>path</code> +

Path to file

+ + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page index 804382f..e5da462 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page @@ -1,25 +1,26 @@ - - - + Regress.TestCallbackGError - - - - - - - - - - - + +@accepts(GLib.Error) +@returns(none) +def on_TestCallbackGError(error): + + + + + +<code>error</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page index 06ebb70..27918f6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page @@ -1,25 +1,26 @@ - - - + Regress.TestCallbackHashtable - - - - - - - - - - - + +@accepts({unicode: int}) +@returns(none) +def on_TestCallbackHashtable(data): + + + + + +<code>data</code> +

a hash table; will be modified

+ + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page index 28b21ea..e45a3f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page @@ -1,25 +1,26 @@ - - - + Regress.TestCallbackOwnedGError - - - - - - - - - - - + +@accepts(GLib.Error) +@returns(none) +def on_TestCallbackOwnedGError(error): + + + + + +<code>error</code> +

GError instance; must be freed by the callback

+ + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page index 286c830..b34f92a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page @@ -1,25 +1,30 @@ - - - + Regress.TestCallbackUserData - - - - - - - - - - - + +@accepts(gpointer) +@returns(int) +def on_TestCallbackUserData(user_data): + + + + + +<code>user_data</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page index 589059d..4ee8637 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestDEFError - - - - - - - - + + <code>TestDEFError.CODE0</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page index 814b474..10a6897 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnum - - - -

By purpose, not all members have documentation

- - - - +

By purpose, not all members have documentation

+ <code>TestEnum.VALUE1</code> -

value 1

+

value 1

 <code>TestEnum.VALUE2</code> -

value 2

+

value 2

 <code>TestEnum.VALUE3</code> @@ -38,6 +30,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page index 2468478..fd222a4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page @@ -6,8 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + unicode @@ -18,23 +17,16 @@ e - - Index.param - - + Regress.TestEnum.param + @accepts(Regress.TestEnum) @returns(unicode) def param(e): # Python wrapper for regress_test_enum_param() - + + - - - - - - <code>e</code> @@ -46,6 +38,4 @@ def param(e): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page index 5c0c559..34de1b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnumNoGEnum - - - - - - - - + + <code>TestEnumNoGEnum.EVALUE1</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page index df3cfa1..e6976c8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestEnumUnsigned - - - - - - - - + + <code>TestEnumUnsigned.VALUE1</code> @@ -30,6 +22,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page index d6a6ebb..15f5583 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestError - - - - - - - - + + <code>TestError.CODE1</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page index 07a91a3..379a1ff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_error_quark - - Index.quark - - + Regress.TestError.quark + @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_error_quark() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def quark(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page new file mode 100644 index 0000000..f53f37e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestExternallyDefinedCallback.page @@ -0,0 +1,30 @@ + + + + + + Regress.TestExternallyDefinedCallback + +@accepts(Regress.TestObj, int) +@returns(none) +def on_TestExternallyDefinedCallback(obj, someint): + + + + + +<code>obj</code> + + + +<code>someint</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page index d5bfeeb..19b28a6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page @@ -1,25 +1,29 @@ - - - + Regress.TestFlags - - - - - - - - - - - + + + + +<code>TestFlags.FLAG1</code> + + + +<code>TestFlags.FLAG2</code> + + + +<code>TestFlags.FLAG3</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page new file mode 100644 index 0000000..c546875 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFloating->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page index a2b80e1..e61af14 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFloating - from gi.repository import Regress -test_floating = Regress.TestFloating() +test_floating = Regress.TestFloating() + + - - - - - - Hierarchy @@ -37,8 +30,11 @@ test_floating = Regress.TestFloating() - - + + Constructors + @@ -47,7 +43,7 @@ test_floating = Regress.TestFloating() - Functions + Static Functions Properties @@ -58,8 +54,10 @@ test_floating = Regress.TestFloating() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page new file mode 100644 index 0000000..d80c40b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-copy.page @@ -0,0 +1,30 @@ + + + + + + Regress.TestFundamentalObject::copy + +@accepts(Regress.TestFundamentalObject) +@returns(Regress.TestFundamentalObject) +def do_copy(obj): + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page new file mode 100644 index 0000000..5ff38ee --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-finalize.page @@ -0,0 +1,26 @@ + + + + + + Regress.TestFundamentalObject::finalize + +@accepts(Regress.TestFundamentalObject) +@returns(none) +def do_finalize(obj): + + + + + +<code>obj</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page new file mode 100644 index 0000000..875ba30 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->flags + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page new file mode 100644 index 0000000..693df03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page new file mode 100644 index 0000000..3413765 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalObject->refcount + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page index 7035407..fe54afd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalObject - from gi.repository import Regress -test_fundamental_object = Regress.TestFundamentalObject() +test_fundamental_object = Regress.TestFundamentalObject() + + - - - - - - Hierarchy @@ -31,8 +24,11 @@ test_fundamental_object = Regress.TestFundamentalObject() - - + + Constructors + @@ -41,7 +37,7 @@ test_fundamental_object = Regress.TestFundamentalObject() - Functions + Static Functions Properties @@ -52,8 +48,10 @@ test_fundamental_object = Regress.TestFundamentalObject() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page index ed3159d..cbd364b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestFundamentalObject.ref - - + @accepts(Regress.TestFundamentalObject) @returns(Regress.TestFundamentalObject) def ref(self): # Python wrapper for regress_test_fundamental_object_ref() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def ref(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page index 1ecf6c1..a356238 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestFundamentalObject.unref - - + @accepts(Regress.TestFundamentalObject) @returns(none) def unref(self): # Python wrapper for regress_test_fundamental_object_unref() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def unref(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page index 73a3328..d776e83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -1,25 +1,30 @@ - - - + Regress.TestFundamentalObjectCopyFunction - - - - - - - - - - - + +@accepts(Regress.TestFundamentalObject) +@returns(Regress.TestFundamentalObject) +def on_TestFundamentalObjectCopyFunction(obj): + + + + + +<code>obj</code> + + + +<code>Returns</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page index df0e8fb..beaa9fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -1,25 +1,26 @@ - - - + Regress.TestFundamentalObjectFinalizeFunction - - - - - - - - - - - + +@accepts(Regress.TestFundamentalObject) +@returns(none) +def on_TestFundamentalObjectFinalizeFunction(obj): + + + + + +<code>obj</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page new file mode 100644 index 0000000..02269eb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalSubObject->data + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page new file mode 100644 index 0000000..27c5cf4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestFundamentalSubObject->fundamental_object + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page index 6b1e810..8a454a6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestFundamentalSubObject - from gi.repository import Regress -test_fundamental_sub_object = Regress.TestFundamentalSubObject() +test_fundamental_sub_object = Regress.TestFundamentalSubObject() + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() - - + + Constructors + @@ -44,7 +40,7 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() - Functions + Static Functions Properties @@ -55,8 +51,10 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page new file mode 100644 index 0000000..2295feb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInheritDrawable->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page index 1cfcfdc..c472c32 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ x - Regress.TestInheritDrawable.do_foo - - + @accepts(Regress.TestInheritDrawable, int) @returns(none) def do_foo(self, x): # Python wrapper for regress_test_inherit_drawable_do_foo() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def do_foo(self, x): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index e00b489..97ccc2b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ x - Regress.TestInheritDrawable.do_foo_maybe_throw - - + @accepts(Regress.TestInheritDrawable, int) @returns(none) def do_foo_maybe_throw(self, x): # Python wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def do_foo_maybe_throw(self, x): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page index 357d069..08044b3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ y - Regress.TestInheritDrawable.get_origin - - + @accepts(Regress.TestInheritDrawable, int, int) @returns(none) def get_origin(self, x, y): # Python wrapper for regress_test_inherit_drawable_get_origin() - + + - - - - - - <code>self</code> @@ -58,6 +50,4 @@ def get_origin(self, x, y): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page index 3bbdfed..95ecf36 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ height - Regress.TestInheritDrawable.get_size - - + @accepts(Regress.TestInheritDrawable, int, int) @returns(none) def get_size(self, width, height): # Python wrapper for regress_test_inherit_drawable_get_size() - + + - - - - - - <code>self</code> @@ -58,6 +50,4 @@ def get_size(self, width, height): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page index 1fdd2c8..7322be0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestInheritDrawable - from gi.repository import Regress -test_inherit_drawable = Regress.TestInheritDrawable() +test_inherit_drawable = Regress.TestInheritDrawable() + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ test_inherit_drawable = Regress.TestInheritDrawable() - - + + Constructors + @@ -44,7 +40,7 @@ test_inherit_drawable = Regress.TestInheritDrawable() - Functions + Static Functions Properties @@ -55,8 +51,10 @@ test_inherit_drawable = Regress.TestInheritDrawable() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page new file mode 100644 index 0000000..bf056d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestInheritPixmapObjectClass->parent_class + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page index 0df0396..14b0ab6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page @@ -1,25 +1,40 @@ - - - + Regress.TestInheritPixmapObjectClass - - - - - - - - - - - + +from gi.repository import Regress + +test_inherit_pixmap_object_class = Regress.TestInheritPixmapObjectClass() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page index 807e18a..7fb4c88 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page @@ -1,38 +1,33 @@ - - - + Regress.TestInterface - from gi.repository import Regress test_interface = Regress.TestInterface() - - - - - - + - Hierarchy - - - Regress.TestInterface - - + Prerequisites +

TestInterface requires GObject.Object

+ + + Known Implementations +

None

 - - + + Constructors + @@ -41,7 +36,7 @@ test_interface = Regress.TestInterface() - Functions + Static Functions Properties @@ -52,8 +47,10 @@ test_interface = Regress.TestInterface() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page index f8fb4a1..bf42080 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - all - Regress.TestObj::all - - + def callback(test_obj, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page index 7a3b9c9..adae8c0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj::allow_none_vfunc - - + @accepts(Regress.TestObj, Regress.TestObj) @returns(none) def do_allow_none_vfunc(obj, two): - + + - - - - - - <code>obj</code> @@ -31,10 +23,8 @@ def do_allow_none_vfunc(obj, two): <code>two</code> -

Another object

+

Another object

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page index f1f1b52..cb3eaf3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - bare - Regress.TestObj:bare - - + "bare" GObject.Object : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page index a392a77..8e97615 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - boxed - Regress.TestObj:boxed - - + "boxed" Regress.TestBoxed : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page index f35c031..1ef90a9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - cleanup - Regress.TestObj::cleanup - - + def callback(test_obj, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page new file mode 100644 index 0000000..c4d02b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-complex_vfunc.page @@ -0,0 +1,30 @@ + + + + + + Regress.TestObj::complex_vfunc + +@accepts(Regress.TestObj, int) +@returns(none) +def do_complex_vfunc(obj, someint): + + + + + +<code>obj</code> + + + +<code>someint</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page index 70fd579..1641a85 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - double - Regress.TestObj:double - - + "double" float : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page index b5bcd2c..e7515c9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - first - Regress.TestObj::first - - + def callback(test_obj, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page index 87be50f..7d05695 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - float - Regress.TestObj:float - - + "float" float : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page new file mode 100644 index 0000000..dca9a51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-function_ptr.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->function_ptr + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page index 6b222e4..e1da126 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - gtype - Regress.TestObj:gtype - - + "gtype" GType : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page index c796f36..4137113 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table-old - Regress.TestObj:hash-table-old - - + "hash-table-old" {unicode: gint8} : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page index c5d426c..5567b58 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - hash-table - Regress.TestObj:hash-table - - + "hash-table" {unicode: gint8} : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page new file mode 100644 index 0000000..40653a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->hash_table + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page index db7a89e..3830204 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - int - Regress.TestObj:int - - + "int" int : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page index 95367ec..eee06b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list-old - Regress.TestObj:list-old - - + "list-old" [unicode] : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page index aca148d..e23acdb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - list - Regress.TestObj:list - - + "list" [unicode] : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page index 742e6da..857ddb7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj::matrix - - + @accepts(Regress.TestObj, unicode) @returns(int) def do_matrix(obj, somestr): - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>obj</code> -

A

+

A

<code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -41,6 +33,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page new file mode 100644 index 0000000..52b356b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page index a228de1..2b38065 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-len-prop - Regress.TestObj::sig-with-array-len-prop - - + def callback(test_obj, arr, len, user_param1, ...) - + +

This test signal similar to GSettings::change-event

- -

This test signal similar to GSettings::change-event

- - - - <code>test_obj</code> @@ -30,11 +22,11 @@ def callback(test_obj, arr, len, user_param1, ...) <code>arr</code> -

numbers, or None

+

numbers, or None

 <code>len</code> -

length of arr, or 0

+

length of arr, or 0

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -44,6 +36,4 @@ def callback(test_obj, arr, len, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page index eb1b99f..e0a8849 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-array-prop - Regress.TestObj::sig-with-array-prop - - + def callback(test_obj, arr, user_param1, ...) - - - -

This test signal is like TelepathyGlib's + +

This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed:

- - - - + <code>test_obj</code> @@ -31,7 +23,7 @@ def callback(test_obj, arr, user_param1, ...) <code>arr</code> -

numbers

+

numbers

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -41,6 +33,4 @@ def callback(test_obj, arr, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page index 36a30d7..e4f05e6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-foreign-struct - Regress.TestObj::sig-with-foreign-struct - - + def callback(test_obj, cr, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -30,7 +22,7 @@ def callback(test_obj, cr, user_param1, ...) <code>cr</code> -

A cairo context.

+

A cairo context.

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -40,6 +32,4 @@ def callback(test_obj, cr, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page index 2048ad2..9308415 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-hash-prop - Regress.TestObj::sig-with-hash-prop - - + def callback(test_obj, hash, user_param1, ...) - - - -

This test signal is like TelepathyGlib's + +

This test signal is like TelepathyGlib's TpAccount::status-changed

- - - - + <code>test_obj</code> @@ -41,6 +33,4 @@ def callback(test_obj, hash, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index a782484..d1e8718 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-int64-prop - Regress.TestObj::sig-with-int64-prop - - + def callback(test_obj, i, user_param1, ...) - - - -

You can use this with regress_test_obj_emit_sig_with_int64, or raise from + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage.

- - - - + <code>test_obj</code> @@ -31,7 +23,7 @@ the introspection client langage.

 <code>i</code> -

an integer

+

an integer

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -45,6 +37,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page index d070f17..45964c9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-intarray-ret - Regress.TestObj::sig-with-intarray-ret - - + def callback(test_obj, i, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -30,7 +22,7 @@ def callback(test_obj, i, user_param1, ...) <code>i</code> -

an integer

+

an integer

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -40,6 +32,4 @@ def callback(test_obj, i, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page index d4814a8..0f21e17 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-obj - Regress.TestObj::sig-with-obj - - + def callback(test_obj, obj, user_param1, ...) - - - -

Test transfer none GObject as a param (tests refcounting). + +

Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj

- - - - + <code>test_obj</code> @@ -31,7 +23,7 @@ Use with regress_test_obj_emit_sig_with_obj

 <code>obj</code> -

A newly created RegressTestObj

+

A newly created RegressTestObj

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -41,6 +33,4 @@ Use with regress_test_obj_emit_sig_with_obj

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page index a7037a4..ae04a85 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-strv - Regress.TestObj::sig-with-strv - - + def callback(test_obj, strs, user_param1, ...) - + +

Test GStrv as a param.

- -

Test GStrv as a param.

- - - - <code>test_obj</code> @@ -30,7 +22,7 @@ def callback(test_obj, strs, user_param1, ...) <code>strs</code> -

strings

+

strings

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -40,6 +32,4 @@ def callback(test_obj, strs, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index c89d1d1..045bd4b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - sig-with-uint64-prop - Regress.TestObj::sig-with-uint64-prop - - + def callback(test_obj, i, user_param1, ...) - - - -

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage.

- - - - + <code>test_obj</code> @@ -31,7 +23,7 @@ the introspection client langage.

 <code>i</code> -

an integer

+

an integer

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

@@ -45,6 +37,4 @@ the introspection client langage.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page new file mode 100644 index 0000000..ffd77f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_double + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page new file mode 100644 index 0000000..0c22a20 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_float + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page new file mode 100644 index 0000000..8836889 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestObj->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page index fa49993..7d3a819 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - string - Regress.TestObj:string - - + "string" unicode : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page index 736814c..bbf8c29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test-with-static-scope-arg - Regress.TestObj::test-with-static-scope-arg - - + def callback(test_obj, object, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -40,6 +32,4 @@ def callback(test_obj, object, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page index e09f531..c2dbf6e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - test - Regress.TestObj::test - - + def callback(test_obj, user_param1, ...) - + + - - - - - - <code>test_obj</code> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page index 07eaa505..994c3a5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,33 +21,26 @@ somestr - Regress.TestObj.do_matrix - - + @accepts(Regress.TestObj, unicode) @returns(int) def do_matrix(self, somestr): # Python wrapper for regress_test_obj_do_matrix() - - - -

This method is virtual. Notably its name differs from the virtual + +

This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.

- - - - + <code>self</code> -

A

+

A

<code>somestr</code> -

Meaningless string

+

Meaningless string

 <code>Returns</code> @@ -56,6 +48,4 @@ case.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 065d745..2400bc6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestObj.emit_sig_with_foreign_struct - - + @accepts(Regress.TestObj) @returns(none) def emit_sig_with_foreign_struct(self): # Python wrapper for regress_test_obj_emit_sig_with_foreign_struct() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def emit_sig_with_foreign_struct(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page index fb0679a..5760c64 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestObj.emit_sig_with_int64 - - + @accepts(Regress.TestObj) @returns(none) def emit_sig_with_int64(self): # Python wrapper for regress_test_obj_emit_sig_with_int64() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def emit_sig_with_int64(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page index 2515498..eb961af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestObj.emit_sig_with_obj - - + @accepts(Regress.TestObj) @returns(none) def emit_sig_with_obj(self): # Python wrapper for regress_test_obj_emit_sig_with_obj() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def emit_sig_with_obj(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page index 34fbfe3..659b882 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestObj.emit_sig_with_uint64 - - + @accepts(Regress.TestObj) @returns(none) def emit_sig_with_uint64(self): # Python wrapper for regress_test_obj_emit_sig_with_uint64() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def emit_sig_with_uint64(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page index e477052..a8dbc9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ self - Regress.TestObj.forced_method - - + @accepts(Regress.TestObj) @returns(none) def forced_method(self): # Python wrapper for regress_forced_method() - + + - - - - - - <code>self</code> -

A

+

A

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page new file mode 100644 index 0000000..caa0c19 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.function_ptr.page @@ -0,0 +1,21 @@ + + + + + + Regress.TestObj.function_ptr + +@returns(none) +def on_function_ptr(): + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page index 58c58e3..cd73b23 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestObj.instance_method - - + @accepts(Regress.TestObj) @returns(int) def instance_method(self): # Python wrapper for regress_test_obj_instance_method() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def instance_method(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page index d491fa6..15402e6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ callback - Regress.TestObj.instance_method_callback - - + @accepts(Regress.TestObj, Regress.TestCallback) @returns(none) def instance_method_callback(self, callback): # Python wrapper for regress_test_obj_instance_method_callback() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def instance_method_callback(self, callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page index a1c0660..3c6146b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ obj - Regress.TestObj.null_out - - + @accepts(Regress.TestObj) @returns(none) def null_out(obj): # Python wrapper for regress_test_obj_null_out() - + + - - - - - - <code>obj</code> -

A

+

A

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page index 1ded23c..56033fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestObj - from gi.repository import Regress -test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) +test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ test_obj = Regress.TestObj(bare=value, - - + + Constructors + @@ -44,7 +40,7 @@ test_obj = Regress.TestObj(bare=value, - Functions + Static Functions Properties @@ -55,8 +51,10 @@ test_obj = Regress.TestObj(bare=value, Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page index 63acc89..2d405e9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ bare - Regress.TestObj.set_bare - - + @accepts(Regress.TestObj, GObject.Object) @returns(none) def set_bare(self, bare): # Python wrapper for regress_test_obj_set_bare() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def set_bare(self, bare): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page index 3d32ba0..e3ba881 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,55 +45,48 @@ num2 - Regress.TestObj.skip_inout_param - - + @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_inout_param() - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>self</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> @@ -102,6 +94,4 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page index 58c5268..e055130 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,55 +45,48 @@ num2 - Regress.TestObj.skip_out_param - - + @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_out_param() - + +

Check that the out value is skipped

- -

Check that the out value is skipped

- - - - <code>self</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> @@ -102,6 +94,4 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page index c02f3b9..77fc43d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,55 +45,48 @@ num2 - Regress.TestObj.skip_param - - + @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_param() - + +

Check that a parameter is skipped

- -

Check that a parameter is skipped

- - - - <code>self</code> -

A .

+

A .

 <code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

Return value.

+

Return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> @@ -102,6 +94,4 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page index 2aadb42..dc4e915 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -46,55 +45,48 @@ num2 - Regress.TestObj.skip_return_val - - + @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_return_val() - + +

Check that the return value is skipped

- -

Check that the return value is skipped

- - - - <code>self</code> -

a

+

a

<code>a</code> -

Parameter.

+

Parameter.

 <code>out_b</code> -

A return value.

+

A return value.

 <code>c</code> -

Other parameter.

+

Other parameter.

 <code>inout_d</code> -

Will be incremented.

+

Will be incremented.

 <code>out_sum</code> -

Return value.

+

Return value.

 <code>num1</code> -

Number.

+

Number.

 <code>num2</code> -

Number.

+

Number.

 <code>Returns</code> @@ -102,6 +94,4 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page index f0c50f5..77b925e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,32 +21,25 @@ a - Regress.TestObj.skip_return_val_no_out - - + @accepts(Regress.TestObj, int) @returns(bool) def skip_return_val_no_out(self, a): # Python wrapper for regress_test_obj_skip_return_val_no_out() - - - -

Check that the return value is skipped. Succeed if a is nonzero, otherwise + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.

- - - - + <code>self</code> -

a

+

a

<code>a</code> -

Parameter.

+

Parameter.

 <code>Returns</code> @@ -55,6 +47,4 @@ raise an error.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page index 6751026..a3cbb87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ x - Regress.TestObj.static_method - - + @accepts(int) @returns(float) def static_method(x): # Python wrapper for regress_test_obj_static_method() - + + - - - - - - <code>x</code> @@ -46,6 +38,4 @@ def static_method(x): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page index 4d97f31..e28dfae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - Regress.TestObj.static_method_callback - - + @accepts(Regress.TestCallback) @returns(none) def static_method_callback(callback): # Python wrapper for regress_test_obj_static_method_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def static_method_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page index 4cc806d..d1c7596 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -42,27 +41,20 @@ m - Regress.TestObj.torture_signature_0 - - + @accepts(Regress.TestObj, int, float, int, unicode, int, int) @returns(none) def torture_signature_0(self, x, y, z, foo, q, m): # Python wrapper for regress_test_obj_torture_signature_0() - + + - - - - - - <code>self</code> -

A

+

A

<code>x</code> @@ -90,6 +82,4 @@ def torture_signature_0(self, x, y, z, foo, q, m): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page index 7ccc132..2ab1ed7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -42,27 +41,20 @@ m - Regress.TestObj.torture_signature_1 - - + @accepts(Regress.TestObj, int, float, int, unicode, int, int) @returns(bool) def torture_signature_1(self, x, y, z, foo, q, m): # Python wrapper for regress_test_obj_torture_signature_1() - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>self</code> -

A

+

A

<code>x</code> @@ -94,6 +86,4 @@ def torture_signature_1(self, x, y, z, foo, q, m): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page index 858e58a..f968c9c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestOtherError - - - - - - - - + + <code>TestOtherError.CODE1</code> @@ -34,6 +26,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page index 341e774..fee709c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page @@ -6,30 +6,22 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + GLib.Quark regress_test_unconventional_error_quark - - Index.quark - - + Regress.TestOtherError.quark + @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_unconventional_error_quark() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def quark(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page index 66b477d..be741c4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page @@ -1,25 +1,25 @@ - - - + Regress.TestPrivateEnum - - - - - - - - - - - + + + + +<code>TestPrivateEnum.PUBLIC_ENUM_BEFORE</code> + + + +<code>TestPrivateEnum.PUBLIC_ENUM_AFTER</code> + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page new file mode 100644 index 0000000..843ed30 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestPrivateStruct->this_is_public_after + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page new file mode 100644 index 0000000..84a6eca --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestPrivateStruct->this_is_public_before + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page index 7b1309d..d5ea6d0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page @@ -1,25 +1,40 @@ - - - + Regress.TestPrivateStruct - - - - - - - - - - - + +from gi.repository import Regress + +test_private_struct = Regress.TestPrivateStruct() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page index 2c8b1ab..afda5f3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestReferenceEnum - - - - - - - - + + <code>TestReferenceEnum.0</code> @@ -46,6 +38,4 @@ - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page new file mode 100644 index 0000000..61e4303 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_double + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page new file mode 100644 index 0000000..c31c20d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_enum + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page new file mode 100644 index 0000000..aad211d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_int + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page new file mode 100644 index 0000000..349c0af --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedA->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page index 499a047..2b7ee6a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_simple_boxed_a_const_return - Regress.TestSimpleBoxedA.const_return - - + @returns(Regress.TestSimpleBoxedA) def const_return(): # Python wrapper for regress_test_simple_boxed_a_const_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def const_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page index 5e3fc24..62a3467 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestSimpleBoxedA.copy - - + @accepts(Regress.TestSimpleBoxedA) @returns(Regress.TestSimpleBoxedA) def copy(self): # Python wrapper for regress_test_simple_boxed_a_copy() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def copy(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page index a9ae5b2..caebbf8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ other_a - Regress.TestSimpleBoxedA.equals - - + @accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA) @returns(bool) def equals(self, other_a): # Python wrapper for regress_test_simple_boxed_a_equals() - + + - - - - - - <code>self</code> @@ -54,6 +46,4 @@ def equals(self, other_a): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page index 9117ddb..a758ab6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page @@ -1,25 +1,40 @@ - - - + Regress.TestSimpleBoxedA - - - - - - - - - - - + +from gi.repository import Regress + +test_simple_boxed_a = Regress.TestSimpleBoxedA() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page new file mode 100644 index 0000000..6014279 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedB->nested_a + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page new file mode 100644 index 0000000..8c8b86d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSimpleBoxedB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page index 999c850..feae1ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestSimpleBoxedB.copy - - + @accepts(Regress.TestSimpleBoxedB) @returns(Regress.TestSimpleBoxedB) def copy(self): # Python wrapper for regress_test_simple_boxed_b_copy() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def copy(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page index 7ecc623..5201ea6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page @@ -1,25 +1,40 @@ - - - + Regress.TestSimpleBoxedB - - - - - - - - - - - + +from gi.repository import Regress + +test_simple_boxed_b = Regress.TestSimpleBoxedB() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page index f815782..da812bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page @@ -1,25 +1,21 @@ - - - + Regress.TestSimpleCallback - - - - - - - - - - - + +@returns(none) +def on_TestSimpleCallback(): + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page new file mode 100644 index 0000000..6cc6110 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_double + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page new file mode 100644 index 0000000..1fc8f31 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_enum + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page new file mode 100644 index 0000000..b3e1d84 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_int + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page new file mode 100644 index 0000000..cdfd2a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructA->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page index cb2ea92..a849bfb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ a_out - Regress.TestStructA.clone - - + @accepts(Regress.TestStructA, Regress.TestStructA) @returns(none) def clone(self, a_out): # Python wrapper for regress_test_struct_a_clone() - + +

Make a copy of a RegressTestStructA

- -

Make a copy of a RegressTestStructA

- - - - <code>self</code> -

the structure

+

the structure

 <code>a_out</code> -

the cloned structure

+

the cloned structure

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page index a6a9817..0974017 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructA - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_a = Regress.TestStructA() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page index bfd3189..42bade9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ string - Regress.TestStructA.parse - - + @accepts(Regress.TestStructA, unicode) @returns(none) def parse(a_out, string): # Python wrapper for regress_test_struct_a_parse() - + + - - - - - - <code>a_out</code> -

the structure that is to be filled

+

the structure that is to be filled

 <code>string</code> -

ignored

+

ignored

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page new file mode 100644 index 0000000..5864588 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructB->nested_a + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page new file mode 100644 index 0000000..d7e90d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructB->some_int8 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page index ea78efd..3ddabd6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ b_out - Regress.TestStructB.clone - - + @accepts(Regress.TestStructB, Regress.TestStructB) @returns(none) def clone(self, b_out): # Python wrapper for regress_test_struct_b_clone() - + +

Make a copy of a RegressTestStructB

- -

Make a copy of a RegressTestStructB

- - - - <code>self</code> -

the structure

+

the structure

 <code>b_out</code> -

the cloned structure

+

the cloned structure

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page index 21d8626..df4a287 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructB - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_b = Regress.TestStructB() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page new file mode 100644 index 0000000..9d3e222 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructC->another_int + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page new file mode 100644 index 0000000..ecf3c25 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructC->obj + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page index 6bd5812..89036d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructC - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_c = Regress.TestStructC() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page new file mode 100644 index 0000000..6e8cf23 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->array1 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page new file mode 100644 index 0000000..93995fe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->array2 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page new file mode 100644 index 0000000..e46d5da --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->field + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page new file mode 100644 index 0000000..39adf11 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->garray + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page new file mode 100644 index 0000000..2601051 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructD->list + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page index aa9f131..64c8105 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructD - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_d = Regress.TestStructD() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page new file mode 100644 index 0000000..ea61037 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructE->some_type + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page new file mode 100644 index 0000000..fda8d2a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructE->some_union + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page index b931c36..8726b95 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructE - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_e = Regress.TestStructE() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page new file mode 100644 index 0000000..d80e779 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_double + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page new file mode 100644 index 0000000..30d6126 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_float + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page new file mode 100644 index 0000000..487a6c5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_int + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page new file mode 100644 index 0000000..fbe75bf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_int64 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page new file mode 100644 index 0000000..a909fa8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_long + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page new file mode 100644 index 0000000..8dca96c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_pointer + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page new file mode 100644 index 0000000..61d30a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_uint + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page new file mode 100644 index 0000000..360e1e9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_uint64 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page new file mode 100644 index 0000000..117b95f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page @@ -0,0 +1,16 @@ + + + + + + Regress.TestStructE__some_union__union->v_ulong + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page index 3b81e62..f2d50b0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructE__some_union__union - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_e__some_union__union = Regress.TestStructE__some_union__union() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page new file mode 100644 index 0000000..5d424ad --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data1 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page new file mode 100644 index 0000000..b03800e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data2 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page new file mode 100644 index 0000000..e25e712 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data3 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page new file mode 100644 index 0000000..ceedf9d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data4 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page new file mode 100644 index 0000000..d239488 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data5 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page new file mode 100644 index 0000000..09d7215 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->data6 + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page new file mode 100644 index 0000000..98fad0b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructF->ref_count + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page index cfb434b..42be286 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructF - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_f = Regress.TestStructF() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page new file mode 100644 index 0000000..fb214ce --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructFixedArray->array + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page new file mode 100644 index 0000000..0c8a594 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestStructFixedArray->just_int + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page index 8f9e288..ed2f460 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestStructFixedArray.frob - - + @accepts(Regress.TestStructFixedArray) @returns(none) def frob(self): # Python wrapper for regress_test_struct_fixed_array_frob() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def frob(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page index db6e789..61dcf2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page @@ -1,25 +1,40 @@ - - - + Regress.TestStructFixedArray - - - - - - - - - - - + +from gi.repository import Regress + +test_struct_fixed_array = Regress.TestStructFixedArray() + + + + + Constructors + + + Methods + + + Static Functions + + + Fields + + + Other + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page new file mode 100644 index 0000000..15b87da --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestSubObj->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page index 9806d28..09872dc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestSubObj.instance_method - - + @accepts(Regress.TestSubObj) @returns(int) def instance_method(self): # Python wrapper for regress_test_sub_obj_instance_method() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def instance_method(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page index b1dc19b..da1c0db 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestSubObj - from gi.repository import Regress -test_sub_obj = Regress.TestSubObj() +test_sub_obj = Regress.TestSubObj() + + - - - - - - Hierarchy @@ -37,8 +30,11 @@ test_sub_obj = Regress.TestSubObj() - - + + Constructors + @@ -47,7 +43,7 @@ test_sub_obj = Regress.TestSubObj() - Functions + Static Functions Properties @@ -58,8 +54,10 @@ test_sub_obj = Regress.TestSubObj() Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page index 2b54839..c5c1a13 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestSubObj.unset_bare - - + @accepts(Regress.TestSubObj) @returns(none) def unset_bare(self): # Python wrapper for regress_test_sub_obj_unset_bare() - + + - - - - - - <code>self</code> @@ -42,6 +34,4 @@ def unset_bare(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page index e0a7bc0..fcb2f3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestTypeGUInt64 - - - - - - - - - - - + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page new file mode 100644 index 0000000..7bdb8c1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page @@ -0,0 +1,14 @@ + + + + + + Regress.TestWi8021x->parent_instance + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page index 00c168b..8f9603d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page @@ -6,24 +6,13 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - testbool - Regress.TestWi8021x:testbool - - + "testbool" bool : Read / Write - + + - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page index cd83b9d..17049bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ self - Regress.TestWi8021x.get_testbool - - + @accepts(Regress.TestWi8021x) @returns(bool) def get_testbool(self): # Python wrapper for regress_test_wi_802_1x_get_testbool() - + + - - - - - - <code>self</code> @@ -46,6 +38,4 @@ def get_testbool(self): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page index aef0387..8b8bf05 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page @@ -6,23 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - + Regress.TestWi8021x - from gi.repository import Regress -test_wi8021x = Regress.TestWi8021x(testbool=value) +test_wi8021x = Regress.TestWi8021x(testbool=value) + + - - - - - - Hierarchy @@ -34,8 +27,11 @@ test_wi8021x = Regress.TestWi8021x(tes - - + + Constructors + @@ -44,7 +40,7 @@ test_wi8021x = Regress.TestWi8021x(tes - Functions + Static Functions Properties @@ -55,8 +51,10 @@ test_wi8021x = Regress.TestWi8021x(tes Virtual functions + + Fields + Other - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page index 59dbbd9..19b2ec5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ v - Regress.TestWi8021x.set_testbool - - + @accepts(Regress.TestWi8021x, bool) @returns(none) def set_testbool(self, v): # Python wrapper for regress_test_wi_802_1x_set_testbool() - + + - - - - - - <code>self</code> @@ -50,6 +42,4 @@ def set_testbool(self, v): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page index d2d83e3..635b57f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ x - Regress.TestWi8021x.static_method - - + @accepts(int) @returns(int) def static_method(x): # Python wrapper for regress_test_wi_802_1x_static_method() - + + - - - - - - <code>x</code> @@ -46,6 +38,4 @@ def static_method(x): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 0000000..343ad00 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,14 @@ + + + + + + Regress.UTF8_CONSTANT + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page index e210a97..046658d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ boxed - - Index.aliased_caller_alloc - - + Regress.aliased_caller_alloc + @accepts(Regress.AliasedTestBoxed) @returns(none) def aliased_caller_alloc(boxed): # Python wrapper for regress_aliased_caller_alloc() - + + - - - - - - <code>boxed</code> @@ -42,6 +34,4 @@ def aliased_caller_alloc(boxed): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page index edee18b..d5b7337 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ data - - Index.annotation_attribute_func - - + Regress.annotation_attribute_func + @accepts(Regress.AnnotationObject, unicode) @returns(int) def annotation_attribute_func(object, data): # Python wrapper for regress_annotation_attribute_func() - + + - - - - - - <code>object</code> -

A .

+

A .

 <code>data</code> -

Some data.

+

Some data.

 <code>Returns</code> @@ -54,6 +46,4 @@ def annotation_attribute_func(object, data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index 860107f..2883312 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,28 +25,21 @@ data - - Index.annotation_custom_destroy - - + Regress.annotation_custom_destroy + @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer) @returns(none) def annotation_custom_destroy(callback, destroy, data): # Python wrapper for regress_annotation_custom_destroy() - - - -

Test messing up the heuristic of closure/destroy-notification + +

Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations.

- - - - + <code>callback</code> -

Destroy notification

+

Destroy notification

 <code>destroy</code> @@ -59,6 +51,4 @@ detection, and fixing it via annotations.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page index 51a2ce4..c3fced4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_annotation_get_source_file - - Index.annotation_get_source_file - - + Regress.annotation_get_source_file + @returns(filename) def annotation_get_source_file(): # Python wrapper for regress_annotation_get_source_file() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def annotation_get_source_file(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page index 16c7ebd..b87747a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ argv - - Index.annotation_init - - + Regress.annotation_init + @accepts(int, [unicode]) @returns(none) def annotation_init(argc, argv): # Python wrapper for regress_annotation_init() - + + - - - - - - <code>argc</code> -

The number of args.

+

The number of args.

 <code>argv</code> -

The arguments.

+

The arguments.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page index 5870104..e64d0ee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ foo - - Index.annotation_invalid_regress_annotation - - + Regress.annotation_invalid_regress_annotation + @accepts(int) @returns(none) def annotation_invalid_regress_annotation(foo): # Python wrapper for regress_annotation_invalid_regress_annotation() - + + - - - - - - <code>foo</code> -

some text (e.g. example) or else

+

some text (e.g. example) or else

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page index 62cfbf7..2a09bdc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ array - - Index.annotation_ptr_array - - + Regress.annotation_ptr_array + @accepts([GObject.Value]) @returns(none) def annotation_ptr_array(array): # Python wrapper for regress_annotation_ptr_array() - + + - - - - - - <code>array</code> -

the array

+

the array

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page index fa1908d..374b21b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ length - - Index.annotation_return_array - - + Regress.annotation_return_array + @accepts(int) @returns([unicode]) def annotation_return_array(length): # Python wrapper for regress_annotation_return_array() - + + - - - - - - <code>length</code> -

Number of return values

+

Number of return values

 <code>Returns</code> @@ -46,6 +38,4 @@ def annotation_return_array(length): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page index 4cbc4db..2cf6fef 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_annotation_return_filename - - Index.annotation_return_filename - - + Regress.annotation_return_filename + @returns(filename) def annotation_return_filename(): # Python wrapper for regress_annotation_return_filename() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def annotation_return_filename(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page index 6eb6e85..7da1060 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ fname - - Index.annotation_set_source_file - - + Regress.annotation_set_source_file + @accepts(filename) @returns(none) def annotation_set_source_file(fname): # Python wrapper for regress_annotation_set_source_file() - + + - - - - - - <code>fname</code> -

Source file

+

Source file

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page index 0015484..86daca5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,16 @@ regress_annotation_space_after_comment_bug631690 - - Index.annotation_space_after_comment_bug631690 - - + Regress.annotation_space_after_comment_bug631690 + @returns(none) def annotation_space_after_comment_bug631690(): # Python wrapper for regress_annotation_space_after_comment_bug631690() - + +

Explicitly test having a space after the ** here.

- -

Explicitly test having a space after the ** here.

- - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page index c7d2409..9e3c823 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ properties - - Index.annotation_string_array_length - - + Regress.annotation_string_array_length + @accepts(int, [unicode]) @returns(none) def annotation_string_array_length(n_properties, properties): # Python wrapper for regress_annotation_string_array_length() - + + - - - - - - <code>n_properties</code> @@ -50,6 +42,4 @@ def annotation_string_array_length(n_properties, properties): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page index 765658c..24ac475 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_annotation_string_zero_terminated - - Index.annotation_string_zero_terminated - - + Regress.annotation_string_zero_terminated + @returns([unicode]) def annotation_string_zero_terminated(): # Python wrapper for regress_annotation_string_zero_terminated() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def annotation_string_zero_terminated(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page index 1a9e2a4..a5fcc99 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ out - - Index.annotation_string_zero_terminated_out - - + Regress.annotation_string_zero_terminated_out + @accepts([unicode]) @returns(none) def annotation_string_zero_terminated_out(out): # Python wrapper for regress_annotation_string_zero_terminated_out() - + + - - - - - - <code>out</code> @@ -42,6 +34,4 @@ def annotation_string_zero_terminated_out(out): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page index 868c2d8..f247ad4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_annotation_test_parsing_bug630862 - - Index.annotation_test_parsing_bug630862 - - + Regress.annotation_test_parsing_bug630862 + @returns(GObject.Object) def annotation_test_parsing_bug630862(): # Python wrapper for regress_annotation_test_parsing_bug630862() - + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- -

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

- - - - <code>Returns</code> @@ -37,6 +29,4 @@ def annotation_test_parsing_bug630862(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page index 223d1a2..f8f68c1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_annotation_transfer_floating - - Index.annotation_transfer_floating - - + Regress.annotation_transfer_floating + @returns(GObject.Object) def annotation_transfer_floating(): # Python wrapper for regress_annotation_transfer_floating() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def annotation_transfer_floating(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page index 51d53cd..6132e91 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,16 @@ regress_annotation_versioned - - Index.annotation_versioned - - + Regress.annotation_versioned + @returns(none) def annotation_versioned(): # Python wrapper for regress_annotation_versioned() - + - - - - -

Since 0.6

- - +

Since 0.6

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page index 9adb4a8..af23bfb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_atest_error_quark - - Index.atest_error_quark - - + Regress.atest_error_quark + @returns(GLib.Quark) def atest_error_quark(): # Python wrapper for regress_atest_error_quark() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def atest_error_quark(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page index b2c0a69..3827a9c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ user_data - - Index.foo_async_ready_callback - - + Regress.foo_async_ready_callback + @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer) @returns(none) def foo_async_ready_callback(cancellable, callback, user_data): # Python wrapper for regress_foo_async_ready_callback() - + + - - - - - - <code>cancellable</code> @@ -58,6 +50,4 @@ def foo_async_ready_callback(cancellable, callback, user_data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page index 873beb2..c910180 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ destroy - - Index.foo_destroy_notify_callback - - + Regress.foo_destroy_notify_callback + @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify) @returns(none) def foo_destroy_notify_callback(callback, data, destroy): # Python wrapper for regress_foo_destroy_notify_callback() - + + - - - - - - <code>callback</code> @@ -58,6 +50,4 @@ def foo_destroy_notify_callback(callback, data, destroy): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page index 6b62ac4..9af9201 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_init - - Index.foo_init - - + Regress.foo_init + @returns(int) def foo_init(): # Python wrapper for regress_foo_init() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def foo_init(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page index 4be8179..bc6c91f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -30,23 +29,16 @@ s - - Index.foo_method_external_references - - + Regress.foo_method_external_references + @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct) @returns(none) def foo_method_external_references(object, e, f, s): # Python wrapper for regress_foo_method_external_references() - + + - - - - - - <code>object</code> @@ -66,6 +58,4 @@ def foo_method_external_references(object, e, f, s): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page index 0f9ba11..7559bea 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,23 +13,16 @@ regress_foo_not_a_constructor_new - - Index.foo_not_a_constructor_new - - + Regress.foo_not_a_constructor_new + @returns(Regress.FooObject) def foo_not_a_constructor_new(): # Python wrapper for regress_foo_not_a_constructor_new() - - - -

This should be scanned as a top-level function, and shouldn't cause + +

This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning.

- - - - + <code>Returns</code> @@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page index d8cdbf5..102747c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_test_array - - Index.foo_test_array - - + Regress.foo_test_array + @returns([unicode]) def foo_test_array(): # Python wrapper for regress_foo_test_array() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def foo_test_array(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page index fa7bc2e..73a82be 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ param - - Index.foo_test_const_char_param - - + Regress.foo_test_const_char_param + @accepts(unicode) @returns(none) def foo_test_const_char_param(param): # Python wrapper for regress_foo_test_const_char_param() - + + - - - - - - <code>param</code> @@ -42,6 +34,4 @@ def foo_test_const_char_param(param): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page index 34ae3f9..e1c7f87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_test_const_char_retval - - Index.foo_test_const_char_retval - - + Regress.foo_test_const_char_retval + @returns(unicode) def foo_test_const_char_retval(): # Python wrapper for regress_foo_test_const_char_retval() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def foo_test_const_char_retval(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page index f32ff39..75c2cc8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ param - - Index.foo_test_const_struct_param - - + Regress.foo_test_const_struct_param + @accepts(Regress.FooStruct) @returns(none) def foo_test_const_struct_param(param): # Python wrapper for regress_foo_test_const_struct_param() - + + - - - - - - <code>param</code> @@ -42,6 +34,4 @@ def foo_test_const_struct_param(param): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page index 24337f0..35e246a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_foo_test_const_struct_retval - - Index.foo_test_const_struct_retval - - + Regress.foo_test_const_struct_retval + @returns(Regress.FooStruct) def foo_test_const_struct_retval(): # Python wrapper for regress_foo_test_const_struct_retval() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def foo_test_const_struct_retval(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page index 8e242c5..16f72c2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ array - - Index.foo_test_string_array - - + Regress.foo_test_string_array + @accepts([unicode]) @returns(none) def foo_test_string_array(array): # Python wrapper for regress_foo_test_string_array() - + + - - - - - - <code>array</code> @@ -42,6 +34,4 @@ def foo_test_string_array(array): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page index 92752bf..e2dfd8b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ array - - Index.foo_test_string_array_with_g - - + Regress.foo_test_string_array_with_g + @accepts([unicode]) @returns(none) def foo_test_string_array_with_g(array): # Python wrapper for regress_foo_test_string_array_with_g() - + + - - - - - - <code>array</code> @@ -42,6 +34,4 @@ def foo_test_string_array_with_g(array): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page index 2006eae..48559b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ unsigned_param - - Index.foo_test_unsigned_qualifier - - + Regress.foo_test_unsigned_qualifier + @accepts(int) @returns(none) def foo_test_unsigned_qualifier(unsigned_param): # Python wrapper for regress_foo_test_unsigned_qualifier() - + + - - - - - - <code>unsigned_param</code> @@ -42,6 +34,4 @@ def foo_test_unsigned_qualifier(unsigned_param): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page index c32efe8..c3eafeb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ unsigned_param - - Index.foo_test_unsigned_type - - + Regress.foo_test_unsigned_type + @accepts(int) @returns(none) def foo_test_unsigned_type(unsigned_param): # Python wrapper for regress_foo_test_unsigned_type() - + + - - - - - - <code>unsigned_param</code> @@ -42,6 +34,4 @@ def foo_test_unsigned_type(unsigned_param): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page index 1e737c0..58571ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ obj - - Index.func_obj_null_in - - + Regress.func_obj_null_in + @accepts(Regress.TestObj) @returns(none) def func_obj_null_in(obj): # Python wrapper for regress_func_obj_null_in() - + + - - - - - - <code>obj</code> -

A

+

A

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page index 825fe35..a01a068 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ v - - Index.global_get_flags_out - - + Regress.global_get_flags_out + @accepts(Regress.TestFlags) @returns(none) def global_get_flags_out(v): # Python wrapper for regress_global_get_flags_out() - + + - - - - - - <code>v</code> -

A flags value

+

A flags value

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page index 51ae15f..bc4cd70 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,35 +21,26 @@ attributes - - Index.has_parameter_named_attrs - - + Regress.has_parameter_named_attrs + @accepts(int, [guint32]) @returns(none) def has_parameter_named_attrs(foo, attributes): # Python wrapper for regress_has_parameter_named_attrs() - - - -

This test case mirrors GnomeKeyringPasswordSchema from + +

This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.

- - - - + <code>foo</code> -

some int

+

some int

 <code>attributes</code> -

list of attributes

+

list of attributes

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page index 9fc5a47..121f4a3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ data - - Index.introspectable_via_alias - - + Regress.introspectable_via_alias + @accepts(Regress.PtrArrayAlias) @returns(none) def introspectable_via_alias(data): # Python wrapper for regress_introspectable_via_alias() - + + - - - - - - <code>data</code> @@ -42,6 +34,4 @@ def introspectable_via_alias(data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page index ad81bff..6e2d6e6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ abort_on_error - - Index.set_abort_on_error - - + Regress.set_abort_on_error + @accepts(bool) @returns(none) def set_abort_on_error(abort_on_error): # Python wrapper for regress_set_abort_on_error() - + + - - - - - - <code>abort_on_error</code> @@ -42,6 +34,4 @@ def set_abort_on_error(abort_on_error): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page index 536a02c..c47120e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_array_callback - - + Regress.test_array_callback + @accepts(Regress.TestCallbackArray) @returns(int) def test_array_callback(callback): # Python wrapper for regress_test_array_callback() - + + - - - - - - <code>callback</code> @@ -46,6 +38,4 @@ def test_array_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page index 26ddf0c..f00d8a2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ objs - - Index.test_array_fixed_out_objects - - + Regress.test_array_fixed_out_objects + @accepts([Regress.TestObj]) @returns(none) def test_array_fixed_out_objects(objs): # Python wrapper for regress_test_array_fixed_out_objects() - + + - - - - - - <code>objs</code> -

An array of

+

An array of

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page index eb816b8..a1986cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ ints - - Index.test_array_fixed_size_int_in - - + Regress.test_array_fixed_size_int_in + @accepts([int]) @returns(int) def test_array_fixed_size_int_in(ints): # Python wrapper for regress_test_array_fixed_size_int_in() - + + - - - - - - <code>ints</code> -

a list of 5 integers

+

a list of 5 integers

 <code>Returns</code> @@ -46,6 +38,4 @@ def test_array_fixed_size_int_in(ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page index 39db1de..768bcb7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,30 +17,21 @@ ints - - Index.test_array_fixed_size_int_out - - + Regress.test_array_fixed_size_int_out + @accepts([int]) @returns(none) def test_array_fixed_size_int_out(ints): # Python wrapper for regress_test_array_fixed_size_int_out() - + + - - - - - - <code>ints</code> -

a list of 5 integers ranging from 0 to 4

+

a list of 5 integers ranging from 0 to 4

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page index 30cfee8..afe8709 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_array_fixed_size_int_return - - Index.test_array_fixed_size_int_return - - + Regress.test_array_fixed_size_int_return + @returns([int]) def test_array_fixed_size_int_return(): # Python wrapper for regress_test_array_fixed_size_int_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_array_fixed_size_int_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page index 62c1c4c..b50f461 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ ints - - Index.test_array_gint16_in - - + Regress.test_array_gint16_in + @accepts(int, [gint16]) @returns(int) def test_array_gint16_in(n_ints, ints): # Python wrapper for regress_test_array_gint16_in() - + + - - - - - - <code>n_ints</code> @@ -46,7 +38,7 @@ def test_array_gint16_in(n_ints, ints): <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_gint16_in(n_ints, ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page index 948b271..b259d7a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ ints - - Index.test_array_gint32_in - - + Regress.test_array_gint32_in + @accepts(int, [gint32]) @returns(gint32) def test_array_gint32_in(n_ints, ints): # Python wrapper for regress_test_array_gint32_in() - + + - - - - - - <code>n_ints</code> @@ -46,7 +38,7 @@ def test_array_gint32_in(n_ints, ints): <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_gint32_in(n_ints, ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page index 6756e0d..2e5e313 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ ints - - Index.test_array_gint64_in - - + Regress.test_array_gint64_in + @accepts(int, [int]) @returns(int) def test_array_gint64_in(n_ints, ints): # Python wrapper for regress_test_array_gint64_in() - + + - - - - - - <code>n_ints</code> @@ -46,7 +38,7 @@ def test_array_gint64_in(n_ints, ints): <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_gint64_in(n_ints, ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page index a7d7001..4900dbe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ ints - - Index.test_array_gint8_in - - + Regress.test_array_gint8_in + @accepts(int, [gint8]) @returns(int) def test_array_gint8_in(n_ints, ints): # Python wrapper for regress_test_array_gint8_in() - + + - - - - - - <code>n_ints</code> @@ -46,7 +38,7 @@ def test_array_gint8_in(n_ints, ints): <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_gint8_in(n_ints, ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page index e56b522..42c5332 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ types - - Index.test_array_gtype_in - - + Regress.test_array_gtype_in + @accepts(int, [GType]) @returns(unicode) def test_array_gtype_in(n_types, types): # Python wrapper for regress_test_array_gtype_in() - + + - - - - - - <code>n_types</code> @@ -46,7 +38,7 @@ def test_array_gtype_in(n_types, types): <code>types</code> -

List of types

+

List of types

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_gtype_in(n_types, types): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page index 42cbb0f..87eb1a3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ len - - Index.test_array_int_full_out - - + Regress.test_array_int_full_out + @accepts(int) @returns([int]) def test_array_int_full_out(len): # Python wrapper for regress_test_array_int_full_out() - + + - - - - - - <code>len</code> -

length of the returned array.

+

length of the returned array.

 <code>Returns</code> @@ -46,6 +38,4 @@ def test_array_int_full_out(len): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page index 8e706e8..f3e2709 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ ints - - Index.test_array_int_in - - + Regress.test_array_int_in + @accepts(int, [int]) @returns(int) def test_array_int_in(n_ints, ints): # Python wrapper for regress_test_array_int_in() - + + - - - - - - <code>n_ints</code> @@ -46,7 +38,7 @@ def test_array_int_in(n_ints, ints): <code>ints</code> -

List of ints

+

List of ints

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_array_int_in(n_ints, ints): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page index b3f4448..f52feba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ ints - - Index.test_array_int_inout - - + Regress.test_array_int_inout + @accepts(int, [int]) @returns(none) def test_array_int_inout(n_ints, ints): # Python wrapper for regress_test_array_int_inout() - + + - - - - - - <code>n_ints</code> -

the length of ints

+

the length of ints

 <code>ints</code> -

a list of integers whose items will be increased by 1, except the first that will be dropped

+

a list of integers whose items will be increased by 1, except the first that will be dropped

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page index 21e5bac..7d47b82 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ len - - Index.test_array_int_none_out - - + Regress.test_array_int_none_out + @accepts(int) @returns([int]) def test_array_int_none_out(len): # Python wrapper for regress_test_array_int_none_out() - + + - - - - - - <code>len</code> -

length of the returned array.

+

length of the returned array.

 <code>Returns</code> @@ -46,6 +38,4 @@ def test_array_int_none_out(len): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page index 9b3fc8b..2383f04 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ len - - Index.test_array_int_null_in - - + Regress.test_array_int_null_in + @accepts([int], int) @returns(none) def test_array_int_null_in(arr, len): # Python wrapper for regress_test_array_int_null_in() - + + - - - - - - <code>arr</code> @@ -46,10 +38,8 @@ def test_array_int_null_in(arr, len): <code>len</code> -

length

+

length

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page index 5b83b30..0ecf204 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ len - - Index.test_array_int_null_out - - + Regress.test_array_int_null_out + @accepts([int], int) @returns(none) def test_array_int_null_out(arr, len): # Python wrapper for regress_test_array_int_null_out() - + + - - - - - - <code>arr</code> @@ -46,10 +38,8 @@ def test_array_int_null_out(arr, len): <code>len</code> -

length

+

length

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page index b8f4441..8a766cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ ints - - Index.test_array_int_out - - + Regress.test_array_int_out + @accepts(int, [int]) @returns(none) def test_array_int_out(n_ints, ints): # Python wrapper for regress_test_array_int_out() - + + - - - - - - <code>n_ints</code> -

the length of ints

+

the length of ints

 <code>ints</code> -

a list of 5 integers, from 0 to 4 in consecutive order

+

a list of 5 integers, from 0 to 4 in consecutive order

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page index 1dcf46c..8001c87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_async_ready_callback - - + Regress.test_async_ready_callback + @accepts(Gio.AsyncReadyCallback) @returns(none) def test_async_ready_callback(callback): # Python wrapper for regress_test_async_ready_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def test_async_ready_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page index 22d2ebf..a3e12a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_boolean - - + Regress.test_boolean + @accepts(bool) @returns(bool) def test_boolean(in): # Python wrapper for regress_test_boolean() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_boolean(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page index 877f582..7a3d352 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_boolean_false - - + Regress.test_boolean_false + @accepts(bool) @returns(bool) def test_boolean_false(in): # Python wrapper for regress_test_boolean_false() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_boolean_false(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page index 3a1fc20..983517c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_boolean_true - - + Regress.test_boolean_true + @accepts(bool) @returns(bool) def test_boolean_true(in): # Python wrapper for regress_test_boolean_true() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_boolean_true(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page new file mode 100644 index 0000000..a97d550 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page @@ -0,0 +1,37 @@ + + + + + + + none + + regress_test_boxeds_not_a_method + + Regress.TestBoxed + boxed + + + + Regress.test_boxeds_not_a_method + +@accepts(Regress.TestBoxed) +@returns(none) +def test_boxeds_not_a_method(boxed): + # Python wrapper for regress_test_boxeds_not_a_method() + + + + + +<code>boxed</code> + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page new file mode 100644 index 0000000..9d7a5f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page @@ -0,0 +1,28 @@ + + + + + + + none + + regress_test_boxeds_not_a_static + + + Regress.test_boxeds_not_a_static + +@returns(none) +def test_boxeds_not_a_static(): + # Python wrapper for regress_test_boxeds_not_a_static() + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page index 4bf83f0..ea38b4c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_context_full_return - - Index.test_cairo_context_full_return - - + Regress.test_cairo_context_full_return + @returns(cairo.Context) def test_cairo_context_full_return(): # Python wrapper for regress_test_cairo_context_full_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_cairo_context_full_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page index a30b8d2..860d5b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ context - - Index.test_cairo_context_none_in - - + Regress.test_cairo_context_none_in + @accepts(cairo.Context) @returns(none) def test_cairo_context_none_in(context): # Python wrapper for regress_test_cairo_context_none_in() - + + - - - - - - <code>context</code> @@ -42,6 +34,4 @@ def test_cairo_context_none_in(context): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page index cfda6fd..a5b4753 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ surface - - Index.test_cairo_surface_full_out - - + Regress.test_cairo_surface_full_out + @accepts(cairo.Surface) @returns(none) def test_cairo_surface_full_out(surface): # Python wrapper for regress_test_cairo_surface_full_out() - + + - - - - - - <code>surface</code> @@ -42,6 +34,4 @@ def test_cairo_surface_full_out(surface): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page index 5de20a9..b86412f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_surface_full_return - - Index.test_cairo_surface_full_return - - + Regress.test_cairo_surface_full_return + @returns(cairo.Surface) def test_cairo_surface_full_return(): # Python wrapper for regress_test_cairo_surface_full_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_cairo_surface_full_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page index af1b948..f284ad3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ surface - - Index.test_cairo_surface_none_in - - + Regress.test_cairo_surface_none_in + @accepts(cairo.Surface) @returns(none) def test_cairo_surface_none_in(surface): # Python wrapper for regress_test_cairo_surface_none_in() - + + - - - - - - <code>surface</code> @@ -42,6 +34,4 @@ def test_cairo_surface_none_in(surface): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page index 98fa6eb..4ef2959 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_cairo_surface_none_return - - Index.test_cairo_surface_none_return - - + Regress.test_cairo_surface_none_return + @returns(cairo.Surface) def test_cairo_surface_none_return(): # Python wrapper for regress_test_cairo_surface_none_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_cairo_surface_none_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page index 3481fc1..a4a7c7a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_callback - - + Regress.test_callback + @accepts(Regress.TestCallback) @returns(int) def test_callback(callback): # Python wrapper for regress_test_callback() - + + - - - - - - <code>callback</code> @@ -46,6 +38,4 @@ def test_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page index 21dc7ee..7de1412 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ user_data - - Index.test_callback_async - - + Regress.test_callback_async + @accepts(Regress.TestCallbackUserData, gpointer) @returns(none) def test_callback_async(callback, user_data): # Python wrapper for regress_test_callback_async() - + + - - - - - - <code>callback</code> @@ -50,6 +42,4 @@ def test_callback_async(callback, user_data): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page index 86df794..7d9d27e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,24 +25,17 @@ notify - - Index.test_callback_destroy_notify - - + Regress.test_callback_destroy_notify + @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify) @returns(int) def test_callback_destroy_notify(callback, user_data, notify): # Python wrapper for regress_test_callback_destroy_notify() - - - -

Notified - callback persists until a DestroyNotify delegate + +

Notified - callback persists until a DestroyNotify delegate is invoked.

- - - - + <code>callback</code> @@ -63,6 +55,4 @@ is invoked.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page index 05883e8..60f53b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,24 +21,17 @@ notify - - Index.test_callback_destroy_notify_no_user_data - - + Regress.test_callback_destroy_notify_no_user_data + @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify) @returns(int) def test_callback_destroy_notify_no_user_data(callback, notify): # Python wrapper for regress_test_callback_destroy_notify_no_user_data() - - - -

Adds a scope notified callback with no user data. This can invoke an error + +

Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.

- - - - + <code>callback</code> @@ -55,6 +47,4 @@ condition in bindings which needs to be tested.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page index d362cb8..0418eee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_callback_thaw_async - - Index.test_callback_thaw_async - - + Regress.test_callback_thaw_async + @returns(int) def test_callback_thaw_async(): # Python wrapper for regress_test_callback_thaw_async() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_callback_thaw_async(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page index 485e69b..6d57146 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,24 +13,17 @@ regress_test_callback_thaw_notifications - - Index.test_callback_thaw_notifications - - + Regress.test_callback_thaw_notifications + @returns(int) def test_callback_thaw_notifications(): # Python wrapper for regress_test_callback_thaw_notifications() - - - -

Invokes all callbacks installed by #test_callback_destroy_notify(), + +

Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.

- - - - + <code>Returns</code> @@ -39,6 +31,4 @@ corresponding destroy notfications.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page index 8ec8376..5245a42 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,24 +21,17 @@ user_data - - Index.test_callback_user_data - - + Regress.test_callback_user_data + @accepts(Regress.TestCallbackUserData, gpointer) @returns(int) def test_callback_user_data(callback, user_data): # Python wrapper for regress_test_callback_user_data() - - - -

Call - callback parameter persists for the duration of the method + +

Call - callback parameter persists for the duration of the method call and can be released on return.

- - - - + <code>callback</code> @@ -55,6 +47,4 @@ call and can be released on return.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page index d11a8a0..aed5622 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ closure - - Index.test_closure - - + Regress.test_closure + @accepts(GObject.Closure) @returns(int) def test_closure(closure): # Python wrapper for regress_test_closure() - + + - - - - - - <code>closure</code> @@ -46,6 +38,4 @@ def test_closure(closure): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page index f8d91f1..69c5c19 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ arg - - Index.test_closure_one_arg - - + Regress.test_closure_one_arg + @accepts(GObject.Closure, int) @returns(int) def test_closure_one_arg(closure, arg): # Python wrapper for regress_test_closure_one_arg() - + + - - - - - - <code>closure</code> @@ -54,6 +46,4 @@ def test_closure_one_arg(closure, arg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page index 7d6a1ac..ca362d7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,31 +21,24 @@ arg - - Index.test_closure_variant - - + Regress.test_closure_variant + @accepts(GObject.Closure, GLib.Variant) @returns(GLib.Variant) def test_closure_variant(closure, arg): # Python wrapper for regress_test_closure_variant() - + + - - - - - - <code>closure</code> -

GClosure which takes one GVariant and returns a GVariant

+

GClosure which takes one GVariant and returns a GVariant

 <code>arg</code> -

a GVariant passed as argument to closure

+

a GVariant passed as argument to closure

 <code>Returns</code> @@ -54,6 +46,4 @@ def test_closure_variant(closure, arg): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page index 0428986..becfae6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_date_in_gvalue - - Index.test_date_in_gvalue - - + Regress.test_date_in_gvalue + @returns(GObject.Value) def test_date_in_gvalue(): # Python wrapper for regress_test_date_in_gvalue() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_date_in_gvalue(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page index 95f40e3..78665a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_def_error_quark - - Index.test_def_error_quark - - + Regress.test_def_error_quark + @returns(GLib.Quark) def test_def_error_quark(): # Python wrapper for regress_test_def_error_quark() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_def_error_quark(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page index 9a2b786..47397f3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_double - - + Regress.test_double + @accepts(float) @returns(float) def test_double(in): # Python wrapper for regress_test_double() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_double(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index d267b55..14d6b3a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_filename_return - - Index.test_filename_return - - + Regress.test_filename_return + @returns([filename]) def test_filename_return(): # Python wrapper for regress_test_filename_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_filename_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page index 9d362f8..dc9c306 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_float - - + Regress.test_float + @accepts(float) @returns(float) def test_float(in): # Python wrapper for regress_test_float() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_float(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page index 43990b2..f8093f6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_garray_container_return - - Index.test_garray_container_return - - + Regress.test_garray_container_return + @returns([unicode]) def test_garray_container_return(): # Python wrapper for regress_test_garray_container_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_garray_container_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page index f0bfb6d..8f14652 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_garray_full_return - - Index.test_garray_full_return - - + Regress.test_garray_full_return + @returns([unicode]) def test_garray_full_return(): # Python wrapper for regress_test_garray_full_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_garray_full_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page index 5630526..72d8bc4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_gerror_callback - - + Regress.test_gerror_callback + @accepts(Regress.TestCallbackGError) @returns(none) def test_gerror_callback(callback): # Python wrapper for regress_test_gerror_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def test_gerror_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page index ec91c45..482d3e8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_container_return - - Index.test_ghash_container_return - - + Regress.test_ghash_container_return + @returns({unicode: unicode}) def test_ghash_container_return(): # Python wrapper for regress_test_ghash_container_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_container_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page index 5356c01..43feb5f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_everything_return - - Index.test_ghash_everything_return - - + Regress.test_ghash_everything_return + @returns({unicode: unicode}) def test_ghash_everything_return(): # Python wrapper for regress_test_ghash_everything_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_everything_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page index 8273602..ab380d9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,31 +17,22 @@ hash - - Index.test_ghash_gvalue_in - - + Regress.test_ghash_gvalue_in + @accepts({unicode: GObject.Value}) @returns(none) def test_ghash_gvalue_in(hash): # Python wrapper for regress_test_ghash_gvalue_in() - + + - - - - - - <code>hash</code> -

the hash table returned by +

the hash table returned by .

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page index 6d6a257..81eac0e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_gvalue_return - - Index.test_ghash_gvalue_return - - + Regress.test_ghash_gvalue_return + @returns({unicode: GObject.Value}) def test_ghash_gvalue_return(): # Python wrapper for regress_test_ghash_gvalue_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_gvalue_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page index 6bc643f..ef755d3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nested_everything_return - - Index.test_ghash_nested_everything_return - - + Regress.test_ghash_nested_everything_return + @returns({unicode: {unicode: unicode}}) def test_ghash_nested_everything_return(): # Python wrapper for regress_test_ghash_nested_everything_return() - + +

Specify nested parameterized types directly with the (type ) annotation.

- -

Specify nested parameterized types directly with the (type ) annotation.

- - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_nested_everything_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page index 1cb3442..708363d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,23 +13,16 @@ regress_test_ghash_nested_everything_return2 - - Index.test_ghash_nested_everything_return2 - - + Regress.test_ghash_nested_everything_return2 + @returns({unicode: {unicode: unicode}}) def test_ghash_nested_everything_return2(): # Python wrapper for regress_test_ghash_nested_everything_return2() - - - -

Another way of specifying nested parameterized types: using the + +

Another way of specifying nested parameterized types: using the element-type annotation.

- - - - + <code>Returns</code> @@ -38,6 +30,4 @@ element-type annotation.

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page index b1d295c..70cd4d4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ghash_nothing_in - - + Regress.test_ghash_nothing_in + @accepts({unicode: unicode}) @returns(none) def test_ghash_nothing_in(in): # Python wrapper for regress_test_ghash_nothing_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_ghash_nothing_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page index df58bb6..b83ff33 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ghash_nothing_in2 - - + Regress.test_ghash_nothing_in2 + @accepts({unicode: unicode}) @returns(none) def test_ghash_nothing_in2(in): # Python wrapper for regress_test_ghash_nothing_in2() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_ghash_nothing_in2(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page index 072fed9..817cde2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nothing_return - - Index.test_ghash_nothing_return - - + Regress.test_ghash_nothing_return + @returns({unicode: unicode}) def test_ghash_nothing_return(): # Python wrapper for regress_test_ghash_nothing_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_nothing_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page index 161d3f6..dac2400 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_nothing_return2 - - Index.test_ghash_nothing_return2 - - + Regress.test_ghash_nothing_return2 + @returns({unicode: unicode}) def test_ghash_nothing_return2(): # Python wrapper for regress_test_ghash_nothing_return2() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_nothing_return2(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page index ee3ed32..7349fdd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ghash_null_in - - + Regress.test_ghash_null_in + @accepts({unicode: unicode}) @returns(none) def test_ghash_null_in(in): # Python wrapper for regress_test_ghash_null_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_ghash_null_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page index 683efc4..40f5540 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ out - - Index.test_ghash_null_out - - + Regress.test_ghash_null_out + @accepts({unicode: unicode}) @returns(none) def test_ghash_null_out(out): # Python wrapper for regress_test_ghash_null_out() - + + - - - - - - <code>out</code> @@ -42,6 +34,4 @@ def test_ghash_null_out(out): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page index ea51622..78f3d73 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_ghash_null_return - - Index.test_ghash_null_return - - + Regress.test_ghash_null_return + @returns({unicode: unicode}) def test_ghash_null_return(): # Python wrapper for regress_test_ghash_null_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_ghash_null_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 9d098ba..e204db0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_glist_container_return - - Index.test_glist_container_return - - + Regress.test_glist_container_return + @returns([unicode]) def test_glist_container_return(): # Python wrapper for regress_test_glist_container_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_glist_container_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index 6b2d370..4b922a4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_glist_everything_return - - Index.test_glist_everything_return - - + Regress.test_glist_everything_return + @returns([unicode]) def test_glist_everything_return(): # Python wrapper for regress_test_glist_everything_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_glist_everything_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index 4873a19..0210e0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_glist_nothing_in - - + Regress.test_glist_nothing_in + @accepts([unicode]) @returns(none) def test_glist_nothing_in(in): # Python wrapper for regress_test_glist_nothing_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_glist_nothing_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index e28d3a8..0247875 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_glist_nothing_in2 - - + Regress.test_glist_nothing_in2 + @accepts([unicode]) @returns(none) def test_glist_nothing_in2(in): # Python wrapper for regress_test_glist_nothing_in2() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_glist_nothing_in2(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index b4b12c8..99cd304 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_glist_nothing_return - - Index.test_glist_nothing_return - - + Regress.test_glist_nothing_return + @returns([unicode]) def test_glist_nothing_return(): # Python wrapper for regress_test_glist_nothing_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_glist_nothing_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index aab83e5..74264db 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_glist_nothing_return2 - - Index.test_glist_nothing_return2 - - + Regress.test_glist_nothing_return2 + @returns([unicode]) def test_glist_nothing_return2(): # Python wrapper for regress_test_glist_nothing_return2() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_glist_nothing_return2(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index ac3f3d6..f403de3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_glist_null_in - - + Regress.test_glist_null_in + @accepts([unicode]) @returns(none) def test_glist_null_in(in): # Python wrapper for regress_test_glist_null_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_glist_null_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index 335d1b2..86bf40d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ out_list - - Index.test_glist_null_out - - + Regress.test_glist_null_out + @accepts([unicode]) @returns(none) def test_glist_null_out(out_list): # Python wrapper for regress_test_glist_null_out() - + + - - - - - - <code>out_list</code> @@ -42,6 +34,4 @@ def test_glist_null_out(out_list): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index 702c635..89b98f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gslist_container_return - - Index.test_gslist_container_return - - + Regress.test_gslist_container_return + @returns([unicode]) def test_gslist_container_return(): # Python wrapper for regress_test_gslist_container_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gslist_container_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index 95fd40c..49d81db 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gslist_everything_return - - Index.test_gslist_everything_return - - + Regress.test_gslist_everything_return + @returns([unicode]) def test_gslist_everything_return(): # Python wrapper for regress_test_gslist_everything_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gslist_everything_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index 534ac13..b72f0c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_gslist_nothing_in - - + Regress.test_gslist_nothing_in + @accepts([unicode]) @returns(none) def test_gslist_nothing_in(in): # Python wrapper for regress_test_gslist_nothing_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_gslist_nothing_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index a7e0635..016ab04 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_gslist_nothing_in2 - - + Regress.test_gslist_nothing_in2 + @accepts([unicode]) @returns(none) def test_gslist_nothing_in2(in): # Python wrapper for regress_test_gslist_nothing_in2() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_gslist_nothing_in2(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index ff7d7e5..e250994 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gslist_nothing_return - - Index.test_gslist_nothing_return - - + Regress.test_gslist_nothing_return + @returns([unicode]) def test_gslist_nothing_return(): # Python wrapper for regress_test_gslist_nothing_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gslist_nothing_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index cf0f67a..fe208c1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gslist_nothing_return2 - - Index.test_gslist_nothing_return2 - - + Regress.test_gslist_nothing_return2 + @returns([unicode]) def test_gslist_nothing_return2(): # Python wrapper for regress_test_gslist_nothing_return2() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gslist_nothing_return2(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index b017466..d6872af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_gslist_null_in - - + Regress.test_gslist_null_in + @accepts([unicode]) @returns(none) def test_gslist_null_in(in): # Python wrapper for regress_test_gslist_null_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_gslist_null_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index 24ef27f..2bdeb03 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ out_list - - Index.test_gslist_null_out - - + Regress.test_gslist_null_out + @accepts([unicode]) @returns(none) def test_gslist_null_out(out_list): # Python wrapper for regress_test_gslist_null_out() - + + - - - - - - <code>out_list</code> @@ -42,6 +34,4 @@ def test_gslist_null_out(out_list): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page index 38ffb44..3f936fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_gtype - - + Regress.test_gtype + @accepts(GType) @returns(GType) def test_gtype(in): # Python wrapper for regress_test_gtype() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_gtype(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page index f4c4cd8..b2bd44b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gvariant_as - - Index.test_gvariant_as - - + Regress.test_gvariant_as + @returns(GLib.Variant) def test_gvariant_as(): # Python wrapper for regress_test_gvariant_as() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gvariant_as(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page index 8357191..dbb9c2b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gvariant_asv - - Index.test_gvariant_asv - - + Regress.test_gvariant_asv + @returns(GLib.Variant) def test_gvariant_asv(): # Python wrapper for regress_test_gvariant_asv() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gvariant_asv(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page index c0db460..238b002 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gvariant_i - - Index.test_gvariant_i - - + Regress.test_gvariant_i + @returns(GLib.Variant) def test_gvariant_i(): # Python wrapper for regress_test_gvariant_i() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gvariant_i(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page index 454fc8a..f360849 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gvariant_s - - Index.test_gvariant_s - - + Regress.test_gvariant_s + @returns(GLib.Variant) def test_gvariant_s(): # Python wrapper for regress_test_gvariant_s() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gvariant_s(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page index e8a6c00..d13b7a1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_gvariant_v - - Index.test_gvariant_v - - + Regress.test_gvariant_v + @returns(GLib.Variant) def test_gvariant_v(): # Python wrapper for regress_test_gvariant_v() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_gvariant_v(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page index 2f8ebcb..1264f29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,27 +21,20 @@ callback - - Index.test_hash_table_callback - - + Regress.test_hash_table_callback + @accepts({unicode: int}, Regress.TestCallbackHashtable) @returns(none) def test_hash_table_callback(data, callback): # Python wrapper for regress_test_hash_table_callback() - + + - - - - - - <code>data</code> -

GHashTable that gets passed to callback

+

GHashTable that gets passed to callback

 <code>callback</code> @@ -50,6 +42,4 @@ def test_hash_table_callback(data, callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page index d039883..b695f1b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_int - - + Regress.test_int + @accepts(int) @returns(int) def test_int(in): # Python wrapper for regress_test_int() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_int(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page index 7e99517..23cd04f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_int16 - - + Regress.test_int16 + @accepts(gint16) @returns(gint16) def test_int16(in): # Python wrapper for regress_test_int16() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_int16(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page index 03e5c07..7f69a51 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_int32 - - + Regress.test_int32 + @accepts(gint32) @returns(gint32) def test_int32(in): # Python wrapper for regress_test_int32() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_int32(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page index 645792c..94b67ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_int64 - - + Regress.test_int64 + @accepts(int) @returns(int) def test_int64(in): # Python wrapper for regress_test_int64() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_int64(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page index c733d1b..80c27ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_int8 - - + Regress.test_int8 + @accepts(gint8) @returns(gint8) def test_int8(in): # Python wrapper for regress_test_int8() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_int8(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page index f43f0bc..1123838 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,23 +21,16 @@ in - - Index.test_int_out_utf8 - - + Regress.test_int_out_utf8 + @accepts(int, unicode) @returns(none) def test_int_out_utf8(length, in): # Python wrapper for regress_test_int_out_utf8() - + + - - - - - - <code>length</code> @@ -50,6 +42,4 @@ def test_int_out_utf8(length, in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page index d7210b5..b759240 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ v - - Index.test_int_value_arg - - + Regress.test_int_value_arg + @accepts(GObject.Value) @returns(int) def test_int_value_arg(v): # Python wrapper for regress_test_int_value_arg() - + + - - - - - - <code>v</code> @@ -46,6 +38,4 @@ def test_int_value_arg(v): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page index 147cae2..bef24f9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_long - - + Regress.test_long + @accepts(int) @returns(int) def test_long(in): # Python wrapper for regress_test_long() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_long(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page index c195b82..9f25f97 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_multi_callback - - + Regress.test_multi_callback + @accepts(Regress.TestCallback) @returns(int) def test_multi_callback(callback): # Python wrapper for regress_test_multi_callback() - + + - - - - - - <code>callback</code> @@ -46,6 +38,4 @@ def test_multi_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page index 7946d57..ee94e27 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -26,23 +25,16 @@ two - - Index.test_multi_double_args - - + Regress.test_multi_double_args + @accepts(float, float, float) @returns(none) def test_multi_double_args(in, one, two): # Python wrapper for regress_test_multi_double_args() - + + - - - - - - <code>in</code> @@ -58,6 +50,4 @@ def test_multi_double_args(in, one, two): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page index 2516138..80ec8cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,25 +13,16 @@ regress_test_multiline_doc_comments - - Index.test_multiline_doc_comments - - + Regress.test_multiline_doc_comments + @returns(none) def test_multiline_doc_comments(): # Python wrapper for regress_test_multiline_doc_comments() - + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- -

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

- - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page index 98c1fd3..c386b91 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,19 +17,15 @@ a - - Index.test_nested_parameter - - + Regress.test_nested_parameter + @accepts(int) @returns(none) def test_nested_parameter(a): # Python wrapper for regress_test_nested_parameter() - - - -

<informaltable> + +

<informaltable> <tgroup cols="3"> <thead> <row> @@ -55,18 +50,13 @@ rgb(20%, 30%, 0%)</literallayout></entry> </row> </tbody> </tgroup> -</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

- - - - +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ <code>a</code> -

An integer

+

An integer

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page index cdb1b92..5c71e87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_null_gerror_callback - - + Regress.test_null_gerror_callback + @accepts(Regress.TestCallbackGError) @returns(none) def test_null_gerror_callback(callback): # Python wrapper for regress_test_null_gerror_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def test_null_gerror_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page index f33b39e..882083e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_owned_gerror_callback - - + Regress.test_owned_gerror_callback + @accepts(Regress.TestCallbackOwnedGError) @returns(none) def test_owned_gerror_callback(callback): # Python wrapper for regress_test_owned_gerror_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def test_owned_gerror_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page index e2f4563..5deeb7d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_short - - + Regress.test_short + @accepts(gshort) @returns(gshort) def test_short(in): # Python wrapper for regress_test_short() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_short(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page index a9fa29c..4a5da37 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ callback - - Index.test_simple_callback - - + Regress.test_simple_callback + @accepts(Regress.TestSimpleCallback) @returns(none) def test_simple_callback(callback): # Python wrapper for regress_test_simple_callback() - + + - - - - - - <code>callback</code> @@ -42,6 +34,4 @@ def test_simple_callback(callback): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page index 7935c21..fb761b3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_size - - + Regress.test_size + @accepts(gsize) @returns(gsize) def test_size(in): # Python wrapper for regress_test_size() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_size(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page index 47fe2cd..a681b17 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ssize - - + Regress.test_ssize + @accepts(gssize) @returns(gssize) def test_ssize(in): # Python wrapper for regress_test_ssize() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_ssize(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page index 1121a7d..f70904d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ arr - - Index.test_strv_in - - + Regress.test_strv_in + @accepts([unicode]) @returns(bool) def test_strv_in(arr): # Python wrapper for regress_test_strv_in() - + + - - - - - - <code>arr</code> @@ -46,6 +38,4 @@ def test_strv_in(arr): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page index fcffe1b..6481456 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_strv_in_gvalue - - Index.test_strv_in_gvalue - - + Regress.test_strv_in_gvalue + @returns(GObject.Value) def test_strv_in_gvalue(): # Python wrapper for regress_test_strv_in_gvalue() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_strv_in_gvalue(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page index eea084c..0c69875 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_strv_out - - Index.test_strv_out - - + Regress.test_strv_out + @returns([unicode]) def test_strv_out(): # Python wrapper for regress_test_strv_out() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_strv_out(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page index c800fa0..bce768a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_strv_out_c - - Index.test_strv_out_c - - + Regress.test_strv_out_c + @returns([unicode]) def test_strv_out_c(): # Python wrapper for regress_test_strv_out_c() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_strv_out_c(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page index 69f6c56..4f8a906 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_strv_out_container - - Index.test_strv_out_container - - + Regress.test_strv_out_container + @returns([unicode]) def test_strv_out_container(): # Python wrapper for regress_test_strv_out_container() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_strv_out_container(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page index 3624f8a..cf37489 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ retp - - Index.test_strv_outarg - - + Regress.test_strv_outarg + @accepts([unicode]) @returns(none) def test_strv_outarg(retp): # Python wrapper for regress_test_strv_outarg() - + + - - - - - - <code>retp</code> @@ -42,6 +34,4 @@ def test_strv_outarg(retp): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page index 5169828..7ba8fe5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_timet - - + Regress.test_timet + @accepts(int) @returns(int) def test_timet(in): # Python wrapper for regress_test_timet() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_timet(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page index 7875a81..0f2413f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -38,23 +37,16 @@ m - - Index.test_torture_signature_0 - - + Regress.test_torture_signature_0 + @accepts(int, float, int, unicode, int, int) @returns(none) def test_torture_signature_0(x, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_0() - + + - - - - - - <code>x</code> @@ -82,6 +74,4 @@ def test_torture_signature_0(x, y, z, foo, q, m): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page index 6a499a5..8a99c2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -38,23 +37,16 @@ m - - Index.test_torture_signature_1 - - + Regress.test_torture_signature_1 + @accepts(int, float, int, unicode, int, int) @returns(bool) def test_torture_signature_1(x, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_1() - + +

This function throws an error if m is odd.

- -

This function throws an error if m is odd.

- - - - <code>x</code> @@ -86,6 +78,4 @@ def test_torture_signature_1(x, y, z, foo, q, m): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page index 01f7778..f982841 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -50,23 +49,16 @@ m - - Index.test_torture_signature_2 - - + Regress.test_torture_signature_2 + @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int) @returns(none) def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_2() - + + - - - - - - <code>x</code> @@ -106,6 +98,4 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page index f6943c0..d4bcf56 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_uint - - + Regress.test_uint + @accepts(int) @returns(int) def test_uint(in): # Python wrapper for regress_test_uint() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_uint(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page index 5ace288..181beae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_uint16 - - + Regress.test_uint16 + @accepts(guint16) @returns(guint16) def test_uint16(in): # Python wrapper for regress_test_uint16() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_uint16(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page index 084d619..ea052bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_uint32 - - + Regress.test_uint32 + @accepts(guint32) @returns(guint32) def test_uint32(in): # Python wrapper for regress_test_uint32() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_uint32(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page index b2234a3..63841e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_uint64 - - + Regress.test_uint64 + @accepts(int) @returns(int) def test_uint64(in): # Python wrapper for regress_test_uint64() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_uint64(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page index 94e367b..377cf5d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_uint8 - - + Regress.test_uint8 + @accepts(guint8) @returns(guint8) def test_uint8(in): # Python wrapper for regress_test_uint8() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_uint8(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page index dc98e47..10e75d9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ulong - - + Regress.test_ulong + @accepts(int) @returns(int) def test_ulong(in): # Python wrapper for regress_test_ulong() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_ulong(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page index abc373e..4fe338d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_unichar - - + Regress.test_unichar + @accepts(unicode) @returns(unicode) def test_unichar(in): # Python wrapper for regress_test_unichar() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_unichar(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page index eb7ff64..0a99c9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ e - - Index.test_unsigned_enum_param - - + Regress.test_unsigned_enum_param + @accepts(Regress.TestEnumUnsigned) @returns(unicode) def test_unsigned_enum_param(e): # Python wrapper for regress_test_unsigned_enum_param() - + + - - - - - - <code>e</code> @@ -46,6 +38,4 @@ def test_unsigned_enum_param(e): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page index 4bebadc..383547a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_ushort - - + Regress.test_ushort + @accepts(gushort) @returns(gushort) def test_ushort(in): # Python wrapper for regress_test_ushort() - + + - - - - - - <code>in</code> @@ -46,6 +38,4 @@ def test_ushort(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page index 4d4ff1a..05eb0d4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_utf8_const_in - - + Regress.test_utf8_const_in + @accepts(unicode) @returns(none) def test_utf8_const_in(in): # Python wrapper for regress_test_utf8_const_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_utf8_const_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page index 7149eac..04c7325 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_utf8_const_return - - Index.test_utf8_const_return - - + Regress.test_utf8_const_return + @returns(unicode) def test_utf8_const_return(): # Python wrapper for regress_test_utf8_const_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_utf8_const_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page index 28ecfc2..a47d745 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ inout - - Index.test_utf8_inout - - + Regress.test_utf8_inout + @accepts(unicode) @returns(none) def test_utf8_inout(inout): # Python wrapper for regress_test_utf8_inout() - + + - - - - - - <code>inout</code> @@ -42,6 +34,4 @@ def test_utf8_inout(inout): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page index 1d1be7d..82bc903 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,22 +13,15 @@ regress_test_utf8_nonconst_return - - Index.test_utf8_nonconst_return - - + Regress.test_utf8_nonconst_return + @returns(unicode) def test_utf8_nonconst_return(): # Python wrapper for regress_test_utf8_nonconst_return() - + + - - - - - - <code>Returns</code> @@ -37,6 +29,4 @@ def test_utf8_nonconst_return(): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page index 8074caf..8f01c44 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ in - - Index.test_utf8_null_in - - + Regress.test_utf8_null_in + @accepts(unicode) @returns(none) def test_utf8_null_in(in): # Python wrapper for regress_test_utf8_null_in() - + + - - - - - - <code>in</code> @@ -42,6 +34,4 @@ def test_utf8_null_in(in): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page index da98d74..0beedb3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ char_out - - Index.test_utf8_null_out - - + Regress.test_utf8_null_out + @accepts(unicode) @returns(none) def test_utf8_null_out(char_out): # Python wrapper for regress_test_utf8_null_out() - + + - - - - - - <code>char_out</code> @@ -42,6 +34,4 @@ def test_utf8_null_out(char_out): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page index 3aa56f0..9fbf938 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,23 +17,16 @@ out - - Index.test_utf8_out - - + Regress.test_utf8_out + @accepts(unicode) @returns(none) def test_utf8_out(out): # Python wrapper for regress_test_utf8_out() - + + - - - - - - <code>out</code> @@ -42,6 +34,4 @@ def test_utf8_out(out): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page index 0b775cc..127c763 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ out - - Index.test_utf8_out_nonconst_return - - + Regress.test_utf8_out_nonconst_return + @accepts(unicode) @returns(unicode) def test_utf8_out_nonconst_return(out): # Python wrapper for regress_test_utf8_out_nonconst_return() - + + - - - - - - <code>out</code> -

a copy of "second"

+

a copy of "second"

 <code>Returns</code> @@ -46,6 +38,4 @@ def test_utf8_out_nonconst_return(out): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page index 5a6bc2e..a93227d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -22,34 +21,25 @@ out1 - - Index.test_utf8_out_out - - + Regress.test_utf8_out_out + @accepts(unicode, unicode) @returns(none) def test_utf8_out_out(out0, out1): # Python wrapper for regress_test_utf8_out_out() - + + - - - - - - <code>out0</code> -

a copy of "first"

+

a copy of "first"

 <code>out1</code> -

a copy of "second"

+

a copy of "second"

 - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page index ef9f97e..d35a11a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -18,27 +17,20 @@ i - - Index.test_value_return - - + Regress.test_value_return + @accepts(int) @returns(GObject.Value) def test_value_return(i): # Python wrapper for regress_test_value_return() - + + - - - - - - <code>i</code> -

an int

+

an int

 <code>Returns</code> @@ -46,6 +38,4 @@ def test_value_return(i): - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page index 847a5c3..de64f26 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - @@ -14,26 +13,16 @@ regress_test_versioning - - Index.test_versioning - - + Regress.test_versioning + @returns(none) def test_versioning(): # Python wrapper for regress_test_versioning() - + - - - - -

Since 1.32.1

- - +

Since 1.32.1

- - diff --git a/tests/scanner/Regress-1.0-Python-expected/index.page b/tests/scanner/Regress-1.0-Python-expected/index.page index a5426d8..426ebed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/index.page +++ b/tests/scanner/Regress-1.0-Python-expected/index.page @@ -5,21 +5,9 @@ xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - - - - - Index - - - - - - - - - - + + Regress + Classes diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index a565113..82c11d3 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -2140,6 +2140,18 @@ use it should be. + + + + + + + + + + @@ -2466,6 +2478,20 @@ use it should be. + + + + + + + + + + + + + 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"> + + + + + + + + + + + + + + + + + + + + A new #RegressTestFundamentalObject @@ -2866,6 +2915,19 @@ use it should be. + + + + + + + + + + + + + This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this @@ -3388,6 +3450,13 @@ raise an error. + + + + + + + + + + @@ -5055,6 +5128,23 @@ libgnome-keyring. + + + + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt index 96df7c5..c9ff60a 100644 --- a/tests/scanner/Regress-1.0-sections-expected.txt +++ b/tests/scanner/Regress-1.0-sections-expected.txt @@ -74,6 +74,8 @@ regress_test_async_ready_callback regress_test_boolean regress_test_boolean_false regress_test_boolean_true +regress_test_boxeds_not_a_method +regress_test_boxeds_not_a_static regress_test_cairo_context_full_return regress_test_cairo_context_none_in regress_test_cairo_surface_full_out diff --git a/tests/scanner/annotationparser/Makefile.in b/tests/scanner/annotationparser/Makefile.in index c55def4..9c2f3c3 100644 --- a/tests/scanner/annotationparser/Makefile.in +++ b/tests/scanner/annotationparser/Makefile.in @@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -519,7 +519,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -529,7 +529,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 4507bc6..1bad36e 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -1872,6 +1872,16 @@ regress_test_boxed_equals (RegressTestBoxed *boxed, regress_test_simple_boxed_a_equals(&other->nested_a, &boxed->nested_a)); } +void +regress_test_boxeds_not_a_method (RegressTestBoxed *boxed) +{ +} + +void +regress_test_boxeds_not_a_static (void) +{ +} + static void regress_test_boxed_free (RegressTestBoxed *boxed) { diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 3f917e6..e2e645b 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -426,6 +426,9 @@ RegressTestBoxed *regress_test_boxed_copy (RegressTestBoxed *boxed); gboolean regress_test_boxed_equals (RegressTestBoxed *boxed, RegressTestBoxed *other); +void regress_test_boxeds_not_a_method (RegressTestBoxed *boxed); +void regress_test_boxeds_not_a_static (void); + typedef struct _RegressTestBoxedB RegressTestBoxedB; struct _RegressTestBoxedB @@ -485,8 +488,13 @@ struct _RegressTestObj double some_double; char* string; GType gtype; + + /* < private > */ + void (*function_ptr) (void); }; +typedef void (*RegressTestExternallyDefinedCallback) (RegressTestObj *obj, int someint); + struct _RegressTestObjClass { GObjectClass parent_class; @@ -502,6 +510,8 @@ struct _RegressTestObjClass guint test_signal; guint test_signal_with_static_scope_arg; + RegressTestExternallyDefinedCallback complex_vfunc; + /* Should be replaced with simple "gpointer" and not be callback */ void (*_regress_reserved1) (void); void (*_regress_reserved2) (void); diff --git a/tests/warn/Makefile.in b/tests/warn/Makefile.in index 1ad7654..3cf9642 100644 --- a/tests/warn/Makefile.in +++ b/tests/warn/Makefile.in @@ -501,7 +501,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INTROSPECTION_SCANNER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ @@ -518,7 +518,7 @@ INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ @@ -528,7 +528,7 @@ INTROSPECTION_COMPILER_ARGS = \ --includedir=$(top_builddir) INTROSPECTION_DOCTOOL = \ - env PATH=.libs:$(PATH) \ + env PATH=".libs:$(PATH)" \ LPATH=.libs \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ -- 2.7.4