diff options
Diffstat (limited to 'tests/scanner/Regress-1.0-Gjs-expected')
530 files changed, 5576 insertions, 7497 deletions
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page index 6dc17b32..55a4b6d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -1,25 +1,14 @@ <?xml version="1.0"?> -<page id="Regress.AnAnonymousUnion.None" +<page id="Regress.ANNOTATION_CALCULATED_DEFINE" type="topic" style="default" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> - <title>Regress.AnAnonymousUnion.None</title> - - - - - - - - - - - + <title>Regress.ANNOTATION_CALCULATED_DEFINE</title> + + </page> 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 00000000..c8887ffb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.ANNOTATION_CALCULATED_LARGE" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.ANNOTATION_CALCULATED_LARGE</title> + <p>Constant to define a calculated large value</p> + <p>Since 1.4</p> +</page> 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 00000000..08eda319 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.ANNOTATION_CALCULATED_LARGE_DIV" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.ANNOTATION_CALCULATED_LARGE_DIV</title> + <p>Constant to define a calculated large value</p> + +</page> 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 9ac6820d..f0b11e81 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.ATestError</title> - - - - - - - - + + <terms> <item> <title><code>ATestError.CODE0</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 9490e4a3..097c37ba 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/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.AliasedTestBoxed</title> - - - - <p>Typedef TestBoxed to test caller-allocates correctness</p> - - - - - - - + <p>Typedef TestBoxed to test caller-allocates correctness</p> + </page> 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 00000000..71177e3f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnAnonymousUnion-x.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.AnAnonymousUnion-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/> + <title type="link" role="topic">x</title> + </info> + <title>Regress.AnAnonymousUnion.x</title> + <synopsis><code mime="text/x-gjs"> +AnAnonymousUnion.x: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 2556feda..ff0853e8 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 @@ <?xml version="1.0"?> <page id="Regress.AnAnonymousUnion" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnAnonymousUnion</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let anAnonymousUnion = new Regress.AnAnonymousUnion({ + <link xref='Regress.AnAnonymousUnion-x'>x</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 4e19ef92..e0e5b006 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.AnnotationBitfield</title> - - - - - - - - - - - + + </page> 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 9a652d80..97b8b65f 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationCallback</title> - - - - <p>This is a callback.</p> - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onAnnotationCallback(in: Number(gint)): Number(gint) { +} + </code></synopsis> + <p>This is a callback.</p> + +<terms> +<item> +<title><code>in</code></title> + <p>array of ints</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 00000000..8074ffda --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-arr" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + <title type="link" role="topic">arr</title> + </info> + <title>Regress.AnnotationFields.arr</title> + <synopsis><code mime="text/x-gjs"> +AnnotationFields.arr: Array(Number(guint8)) (Read / Write) + </code></synopsis> + <p>an array of length @len</p> + +</page> 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 00000000..aa029dbe --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-field1.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-field1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + <title type="link" role="topic">field1</title> + </info> + <title>Regress.AnnotationFields.field1</title> + <synopsis><code mime="text/x-gjs"> +AnnotationFields.field1: Number(gint) (Read / Write) + </code></synopsis> + <p>Some documentation</p> + +</page> 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 00000000..5fb363c0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-len.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-len" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + <title type="link" role="topic">len</title> + </info> + <title>Regress.AnnotationFields.len</title> + <synopsis><code mime="text/x-gjs"> +AnnotationFields.len: Number(gulong) (Read / Write) + </code></synopsis> + <p>the length of array</p> + +</page> 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 53234545..585a97c1 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationFields" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationFields</title> - - - - <p>This is a struct for testing field documentation and annotations</p> - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let annotationFields = new Regress.AnnotationFields({ + <link xref='Regress.AnnotationFields-field1'>field1</link>: value + <link xref='Regress.AnnotationFields-arr'>arr</link>: value + <link xref='Regress.AnnotationFields-len'>len</link>: value +}); + </code></synopsis> + <p>This is a struct for testing field documentation and annotations</p> + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 db77a117..cf16fa37 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationForeachFunc" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationForeachFunc</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onAnnotationForeachFunc(object: <link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>, item: String): void { +} + </code></synopsis> + + +<terms> +<item> +<title><code>object</code></title> + +</item> +<item> +<title><code>item</code></title> + +</item> +</terms> + </page> 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 79844c66..a92a4f35 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationListCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationListCallback</title> - - - - <p>This is a callback taking a list.</p> - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onAnnotationListCallback(in: Array(String)): Array(String) { +} + </code></synopsis> + <p>This is a callback taking a list.</p> + +<terms> +<item> +<title><code>in</code></title> + <p>list of strings</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 17c80292..665fd2aa 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationNotifyFunc" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationNotifyFunc</title> - - - - <p>This is a callback with a 'closure' argument that is not named + <synopsis><code mime="text/x-gjs"> +function onAnnotationNotifyFunc(): void { +} + </code></synopsis> + <p>This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated.</p> - - - - - - - + +<terms> +</terms> + </page> 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 c30c3377..d57d2512 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/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">attribute-signal</title> - </info> <title>Regress.AnnotationObject::attribute-signal</title> - -<synopsis><code mime="text/x-python"> -function callback(annotation_object, arg1:String, arg2:String, ):String; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('attribute-signal', function (annotationObject, arg1: String, arg2: String, ): String); + </code></synopsis> + <p>This signal tests a signal with attributes.</p> - - <p>This signal tests a signal with attributes.</p> - - - - <terms> <item> -<title><code>annotation_object</code></title> +<title><code>annotationObject</code></title> <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p> </item> <item> <title><code>arg1</code></title> -<p>a value</p> + <p>a value</p> </item> <item> <title><code>arg2</code></title> -<p>another value</p> + <p>another value</p> </item> <item> <title><code>Returns</code></title> -<p>the return value</p> + <p>the return value</p> </item> </terms> - - </page> 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 61025917..0bcbbbcc 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/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">doc-empty-arg-parsing</title> - </info> <title>Regress.AnnotationObject::doc-empty-arg-parsing</title> - -<synopsis><code mime="text/x-python"> -function callback(annotation_object, arg1:gpointer, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('doc-empty-arg-parsing', function (annotationObject, arg1: void, ): void); + </code></synopsis> + <p>This signal tests an empty document argument (<code>arg1</code>)</p> - - <p>This signal tests an empty document argument (<code>arg1</code>)</p> - - - - <terms> <item> -<title><code>annotation_object</code></title> +<title><code>annotationObject</code></title> <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p> </item> <item> @@ -34,6 +26,4 @@ function callback(annotation_object, arg1:gpointer, ):void; </item> </terms> - - </page> 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 d9d8b55a..148081a5 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/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">function-property</title> - </info> - <title>Regress.AnnotationObject:function-property</title> - -<synopsis><code mime="text/x-python"> -"function-property" Regress.AnnotationCallback : Read / Write / Construct -</code></synopsis> + <title>Regress.AnnotationObject.function_property</title> + <synopsis><code mime="text/x-gjs"> +AnnotationObject.function_property: <link xref="Regress.AnnotationCallback">Regress.AnnotationCallback</link> (Read / Write / Construct) + </code></synopsis> + - - - - - - - - - </page> 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 4e2044dd..c94b525c 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/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">list-signal</title> - </info> <title>Regress.AnnotationObject::list-signal</title> - -<synopsis><code mime="text/x-python"> -function callback(annotation_object, list:[String], ):void; -</code></synopsis> - - - <p>This is a signal which takes a list of strings, but it's not + <synopsis><code mime="text/x-gjs"> +connect('list-signal', function (annotationObject, list: Array(String), ): void); + </code></synopsis> + <p>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</p> - - - - + <terms> <item> -<title><code>annotation_object</code></title> +<title><code>annotationObject</code></title> <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p> </item> <item> <title><code>list</code></title> -<p>a list of strings</p> + <p>a list of strings</p> </item> </terms> - - </page> 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 eba5cef7..2eff7167 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/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">string-property</title> - </info> - <title>Regress.AnnotationObject:string-property</title> - -<synopsis><code mime="text/x-python"> -"string-property" String : Read / Write / Construct -</code></synopsis> - - - <p>This is a property which is a string</p> - - - <p>Since 1.0</p> - - - - - + <title>Regress.AnnotationObject.string_property</title> + <synopsis><code mime="text/x-gjs"> +AnnotationObject.string_property: String (Read / Write / Construct) + </code></synopsis> + <p>This is a property which is a string</p> + <p>Since 1.0</p> </page> 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 59408b40..9c16d757 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/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">string-signal</title> - </info> <title>Regress.AnnotationObject::string-signal</title> - -<synopsis><code mime="text/x-python"> -function callback(annotation_object, string:String, ):void; -</code></synopsis> - - - <p>This is a signal which has a broken signal handler, + <synopsis><code mime="text/x-gjs"> +connect('string-signal', function (annotationObject, string: String, ): void); + </code></synopsis> + <p>This is a signal which has a broken signal handler, it says it's pointer but it's actually a string.</p> - - - <p>Since 1.0</p> - - + <p>Since 1.0</p> <terms> <item> -<title><code>annotation_object</code></title> +<title><code>annotationObject</code></title> <p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p> </item> <item> <title><code>string</code></title> -<p>a string</p> + <p>a string</p> </item> </terms> - - </page> 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 c2444fa4..d943cf45 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/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">tab-property</title> - </info> - <title>Regress.AnnotationObject:tab-property</title> - -<synopsis><code mime="text/x-python"> -"tab-property" String : Read / Write / Construct -</code></synopsis> - - - <p>This is a property annotation intentionally indented with a mix + <title>Regress.AnnotationObject.tab_property</title> + <synopsis><code mime="text/x-gjs"> +AnnotationObject.tab_property: String (Read / Write / Construct) + </code></synopsis> + <p>This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</p> - - - <p>Since 1.2</p> - - - - - + <p>Since 1.2</p> </page> 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 414f5c63..64d872f5 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>somearg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.allow_none</title> - -<synopsis><code mime="text/x-gjs"> -function allow_none(somearg:String):GObject.Object { + <synopsis><code mime="text/x-gjs"> +function allow_none(somearg: String): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_object_allow_none() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>somearg</code></title> @@ -41,10 +33,8 @@ function allow_none(somearg:String):GObject.Object { </item> <item> <title><code>Returns</code></title> -<p><code>null</code> always</p> + </item> </terms> - - </page> 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 8dd15f1c..75741225 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_calleeowns</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.calleeowns</title> - -<synopsis><code mime="text/x-gjs"> -function calleeowns():Number { + <synopsis><code mime="text/x-gjs"> +function calleeowns(): [return_value: Number(gint), toown: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>] { // Gjs wrapper for regress_annotation_object_calleeowns() } -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments; GObject defaults to transfer</p> - - <p>This is a test for out arguments; GObject defaults to transfer</p> - - - - <terms> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>toown</code></title> + <p>a <link xref="GObject.Object"/></p> </item> </terms> - - </page> 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 a12be358..33ba8e53 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_calleesowns</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.calleesowns</title> - -<synopsis><code mime="text/x-gjs"> -function calleesowns():Number { + <synopsis><code mime="text/x-gjs"> +function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, toown2: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>] { // Gjs wrapper for regress_annotation_object_calleesowns() } -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments, one transferred, other not</p> - - <p>This is a test for out arguments, one transferred, other not</p> - - - - <terms> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>toown1</code></title> + <p>a <link xref="GObject.Object"/></p> +</item> +<item> +<title><code>toown2</code></title> + <p>a <link xref="GObject.Object"/></p> </item> </terms> - - </page> 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 d7e6784d..fd3e7948 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_object_compute_sum</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.compute_sum</title> - -<synopsis><code mime="text/x-gjs"> -function compute_sum(nums:[Number]):void { + <synopsis><code mime="text/x-gjs"> +function compute_sum(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum() } -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array</p> - - <p>Test taking a zero-terminated array</p> - - - - <terms> <item> <title><code>nums</code></title> -<p>Sequence of numbers</p> + <p>Sequence of numbers</p> </item> </terms> - - </page> 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 932b1922..331214b3 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,34 +13,25 @@ </api:returns> <api:name>regress_annotation_object_compute_sum_n</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.compute_sum_n</title> - -<synopsis><code mime="text/x-gjs"> -function compute_sum_n(nums:[Number]):void { + <synopsis><code mime="text/x-gjs"> +function compute_sum_n(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum_n() } -</code></synopsis> + </code></synopsis> + <p>Test taking an array with length parameter</p> - - <p>Test taking an array with length parameter</p> - - - - <terms> <item> <title><code>nums</code></title> -<p>Sequence of + <p>Sequence of numbers that are zero-terminated</p> </item> </terms> - - </page> 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 3891049b..754a37fa 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,34 +13,25 @@ </api:returns> <api:name>regress_annotation_object_compute_sum_nz</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.compute_sum_nz</title> - -<synopsis><code mime="text/x-gjs"> -function compute_sum_nz(nums:[Number]):void { + <synopsis><code mime="text/x-gjs"> +function compute_sum_nz(nums: Array(Number(gint))): void { // Gjs wrapper for regress_annotation_object_compute_sum_nz() } -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array with length parameter</p> - - <p>Test taking a zero-terminated array with length parameter</p> - - - - <terms> <item> <title><code>nums</code></title> -<p>Sequence of numbers that + <p>Sequence of numbers that are zero-terminated</p> </item> </terms> - - </page> 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 03ceac18..8752d9ff 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_annotation_object_create_object</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.create_object</title> - -<synopsis><code mime="text/x-gjs"> -function create_object():GObject.Object { + <synopsis><code mime="text/x-gjs"> +function create_object(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_object_create_object() } -</code></synopsis> + </code></synopsis> + <p>Test returning a caller-owned object</p> - - <p>Test returning a caller-owned object</p> - - - - <terms> <item> <title><code>Returns</code></title> -<p>The object</p> + </item> </terms> - - </page> 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 e89c8fe6..331b7e04 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_annotation_object_do_not_use</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.do_not_use</title> - -<synopsis><code mime="text/x-gjs"> -function do_not_use():GObject.Object { + <synopsis><code mime="text/x-gjs"> +function do_not_use(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_object_do_not_use() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p><code>null</code> always</p> + </item> </terms> - - </page> 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 cd58eed9..af1d729f 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_annotation_object_extra_annos</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.extra_annos</title> - -<synopsis><code mime="text/x-gjs"> -function extra_annos():void { + <synopsis><code mime="text/x-gjs"> +function extra_annos(): void { // Gjs wrapper for regress_annotation_object_extra_annos() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 e4cc4c0b..8152aa80 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,20 @@ <api:name>func</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.foreach</title> - -<synopsis><code mime="text/x-gjs"> -function foreach(func:Regress.AnnotationForeachFunc):void { + <synopsis><code mime="text/x-gjs"> +function foreach(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void { // Gjs wrapper for regress_annotation_object_foreach() } -</code></synopsis> + </code></synopsis> + <p>Test taking a call-scoped callback</p> - - <p>Test taking a call-scoped callback</p> - - - - <terms> <item> <title><code>func</code></title> -<p>Callback to invoke</p> + <p>Callback to invoke</p> </item> </terms> - - </page> 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 2e6ca61a..a411ad87 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,30 +13,21 @@ </api:returns> <api:name>regress_annotation_object_get_hash</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.get_hash</title> - -<synopsis><code mime="text/x-gjs"> -function get_hash():{String: GObject.Object} { + <synopsis><code mime="text/x-gjs"> +function get_hash(): {String: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>} { // Gjs wrapper for regress_annotation_object_get_hash() } -</code></synopsis> - - - <p>This is a test for returning a hash table mapping strings to + </code></synopsis> + <p>This is a test for returning a hash table mapping strings to objects.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>hash table</p> + </item> </terms> - - </page> 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 c0350d7e..fc8960b2 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>[Regress.AnnotationObject]</api:type> + <api:type>Array(Regress.AnnotationObject)</api:type> </api:returns> <api:name>regress_annotation_object_get_objects</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.get_objects</title> - -<synopsis><code mime="text/x-gjs"> -function get_objects():[Regress.AnnotationObject] { + <synopsis><code mime="text/x-gjs"> +function get_objects(): Array(<link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>) { // Gjs wrapper for regress_annotation_object_get_objects() } -</code></synopsis> - - - <p>This is a test for returning a list of objects. + </code></synopsis> + <p>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</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>list of objects</p> + </item> </terms> - - </page> 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 e36d25a8..8038a7d0 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_annotation_object_get_strings</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.get_strings</title> - -<synopsis><code mime="text/x-gjs"> -function get_strings():[String] { + <synopsis><code mime="text/x-gjs"> +function get_strings(): Array(String) { // Gjs wrapper for regress_annotation_object_get_strings() } -</code></synopsis> - - - <p>This is a test for returning a list of strings, where + </code></synopsis> + <p>This is a test for returning a list of strings, where each string needs to be freed.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>list of strings</p> + </item> </terms> - - </page> 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 945acf01..814248f7 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_annotation_object_hidden_self</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.hidden_self</title> - -<synopsis><code mime="text/x-gjs"> -function hidden_self():void { + <synopsis><code mime="text/x-gjs"> +function hidden_self(): void { // Gjs wrapper for regress_annotation_object_hidden_self() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 226b2b97..3ef203f4 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_in</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.in</title> - -<synopsis><code mime="text/x-gjs"> -function in(inarg:Number):Number { + <synopsis><code mime="text/x-gjs"> +function in(inarg: Number(gint)): Number(gint) { // Gjs wrapper for regress_annotation_object_in() } -</code></synopsis> + </code></synopsis> + <p>This is a test for in arguments</p> - - <p>This is a test for in arguments</p> - - - - <terms> <item> <title><code>inarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + </item> </terms> - - </page> 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 885412fb..02ad264f 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_inout</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.inout</title> - -<synopsis><code mime="text/x-gjs"> -function inout(inoutarg:Number):Number { + <synopsis><code mime="text/x-gjs"> +function inout(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout() } -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments</p> - - <p>This is a test for out arguments</p> - - - - <terms> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> +</item> +<item> +<title><code>return_value</code></title> + </item> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>inoutarg (out)</code></title> + <p>This is an argument test</p> </item> </terms> - - </page> 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 34406b7b..00807c0b 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_inout2</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.inout2</title> - -<synopsis><code mime="text/x-gjs"> -function inout2(inoutarg:Number):Number { + <synopsis><code mime="text/x-gjs"> +function inout2(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout2() } -</code></synopsis> + </code></synopsis> + <p>This is a second test for out arguments</p> - - <p>This is a second test for out arguments</p> - - - - <terms> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> +</item> +<item> +<title><code>return_value</code></title> + </item> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>inoutarg (out)</code></title> + <p>This is an argument test</p> </item> </terms> - - </page> 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 2828964e..7bf33744 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_inout3</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.inout3</title> - -<synopsis><code mime="text/x-gjs"> -function inout3(inoutarg:Number):Number { + <synopsis><code mime="text/x-gjs"> +function inout3(inoutarg: Number(gint)): [return_value: Number(gint), inoutarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_inout3() } -</code></synopsis> + </code></synopsis> + <p>This is a 3th test for out arguments</p> - - <p>This is a 3th test for out arguments</p> - - - - <terms> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> +</item> +<item> +<title><code>return_value</code></title> + </item> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>inoutarg (out)</code></title> + <p>This is an argument test</p> </item> </terms> - - </page> 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 49d937a1..23836e63 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_method</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.method</title> - -<synopsis><code mime="text/x-gjs"> -function method():Number { + <synopsis><code mime="text/x-gjs"> +function method(): Number(gint) { // Gjs wrapper for regress_annotation_object_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>an int</p> + </item> </terms> - - </page> 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 0424719e..8edd9cbf 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_annotation_object_notrans</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.notrans</title> - -<synopsis><code mime="text/x-gjs"> -function notrans():GObject.Object { + <synopsis><code mime="text/x-gjs"> +function notrans(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_object_notrans() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>An object, not referenced</p> + </item> </terms> - - </page> 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 5120baf8..c6072028 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_object_out</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.out</title> - -<synopsis><code mime="text/x-gjs"> -function out():Number { + <synopsis><code mime="text/x-gjs"> +function out(): [return_value: Number(gint), outarg: Number(gint)] { // Gjs wrapper for regress_annotation_object_out() } -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments</p> - - <p>This is a test for out arguments</p> - - - - <terms> <item> -<title><code>Returns</code></title> -<p>an int</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>outarg</code></title> + <p>This is an argument test</p> </item> </terms> - - </page> 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 f4f01301..cca4c5d6 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationObject</title> - <synopsis><code> const Regress = imports.gi.Regress; -let annotation_object = new Regress.AnnotationObject({ +let annotationObject = new Regress.AnnotationObject({ <link xref='Regress.AnnotationObject-function-property'>function_property</link>: value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>: value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>: value, }); </code></synopsis> + <p>This is an object used to test annotations.</p> - - <p>This is an object used to test annotations.</p> - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -39,8 +31,11 @@ let annotation_object = new Regress.AnnotationObject({ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -49,7 +44,7 @@ let annotation_object = new Regress.AnnotationObject({ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -60,8 +55,10 @@ let annotation_object = new Regress.AnnotationObject({ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 8476fd89..7e1a3013 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,28 @@ </api:returns> <api:name>regress_annotation_object_parse_args</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>argv</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.parse_args</title> - -<synopsis><code mime="text/x-gjs"> -function parse_args(argv:[String]):void { + <synopsis><code mime="text/x-gjs"> +function parse_args(argv: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_object_parse_args() } -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array with length parameter</p> - - <p>Test taking a zero-terminated array with length parameter</p> - - - - <terms> <item> <title><code>argv</code></title> -<p>Argument vector</p> + <p>Argument vector</p> +</item> +<item> +<title><code>argv (out)</code></title> + <p>Argument vector</p> </item> </terms> - - </page> 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 a5dafb97..43e0c1bb 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_object_set_data</api:name> <api:arg> - <api:type>[guint8]</api:type> + <api:type>Array(Number(guint8))</api:type> <api:name>data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.set_data</title> - -<synopsis><code mime="text/x-gjs"> -function set_data(data:[guint8]):void { + <synopsis><code mime="text/x-gjs"> +function set_data(data: Array(Number(guint8))): void { // Gjs wrapper for regress_annotation_object_set_data() } -</code></synopsis> + </code></synopsis> + <p>Test taking a guchar * with a length.</p> - - <p>Test taking a guchar * with a length.</p> - - - - <terms> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> </terms> - - </page> 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 3fcd8188..70204151 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_object_set_data2</api:name> <api:arg> - <api:type>[gint8]</api:type> + <api:type>Array(Number(gint8))</api:type> <api:name>data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.set_data2</title> - -<synopsis><code mime="text/x-gjs"> -function set_data2(data:[gint8]):void { + <synopsis><code mime="text/x-gjs"> +function set_data2(data: Array(Number(gint8))): void { // Gjs wrapper for regress_annotation_object_set_data2() } -</code></synopsis> + </code></synopsis> + <p>Test taking a gchar * with a length.</p> - - <p>Test taking a gchar * with a length.</p> - - - - <terms> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> </terms> - - </page> 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 22fb98dd..14709d97 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,34 +13,25 @@ </api:returns> <api:name>regress_annotation_object_set_data3</api:name> <api:arg> - <api:type>[guint8]</api:type> + <api:type>Array(Number(guint8))</api:type> <api:name>data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.set_data3</title> - -<synopsis><code mime="text/x-gjs"> -function set_data3(data:[guint8]):void { + <synopsis><code mime="text/x-gjs"> +function set_data3(data: Array(Number(guint8))): void { // Gjs wrapper for regress_annotation_object_set_data3() } -</code></synopsis> - - - <p>Test taking a gchar * with a length, overriding the array element + </code></synopsis> + <p>Test taking a gchar * with a length, overriding the array element type.</p> - - - - + <terms> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> </terms> - - </page> 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 4d6029a1..d7a0cf9c 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,24 @@ </api:returns> <api:name>regress_annotation_object_string_out</api:name> </api:function> - </info> <title>Regress.AnnotationObject.prototype.string_out</title> - -<synopsis><code mime="text/x-gjs"> -function string_out():Boolean { + <synopsis><code mime="text/x-gjs"> +function string_out(): [ok: Boolean, str_out: String] { // Gjs wrapper for regress_annotation_object_string_out() } -</code></synopsis> + </code></synopsis> + <p>Test returning a string as an out parameter</p> - - <p>Test returning a string as an out parameter</p> - - - - <terms> <item> -<title><code>Returns</code></title> -<p>some boolean</p> +<title><code>ok</code></title> + +</item> +<item> +<title><code>str_out</code></title> + <p>string return value</p> </item> </terms> - - </page> 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 c602a896..5f452837 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_annotation_object_use_buffer</api:name> <api:arg> - <api:type>guint8</api:type> + <api:type>Number(guint8)</api:type> <api:name>bytes</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.use_buffer</title> - -<synopsis><code mime="text/x-gjs"> -function use_buffer(bytes:guint8):void { + <synopsis><code mime="text/x-gjs"> +function use_buffer(bytes: Number(guint8)): void { // Gjs wrapper for regress_annotation_object_use_buffer() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>bytes</code></title> @@ -41,6 +33,4 @@ function use_buffer(bytes:guint8):void { </item> </terms> - - </page> 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_full.page index 99bfaf1b..3701b581 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_full.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,20 @@ <api:name>func</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.watch_full</title> - -<synopsis><code mime="text/x-gjs"> -function watch_full(func:Regress.AnnotationForeachFunc):void { + <synopsis><code mime="text/x-gjs"> +function watch_full(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void { // Gjs wrapper for regress_annotation_object_watch_full() } -</code></synopsis> + </code></synopsis> + <p>Test overriding via the "Rename To" annotation.</p> - - <p>Test overriding via the "Rename To" annotation.</p> - - - - <terms> <item> <title><code>func</code></title> -<p>The callback</p> + <p>The callback</p> </item> </terms> - - </page> 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 6daccb5e..b78d7bf4 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/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_object_with_voidp</api:name> <api:arg> - <api:type>gpointer</api:type> + <api:type>void</api:type> <api:name>data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.prototype.with_voidp</title> - -<synopsis><code mime="text/x-gjs"> -function with_voidp(data:gpointer):void { + <synopsis><code mime="text/x-gjs"> +function with_voidp(data: void): void { // Gjs wrapper for regress_annotation_object_with_voidp() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> -<p>Opaque pointer handle</p> + <p>Opaque pointer handle</p> </item> </terms> - - </page> 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 00000000..e1e85f0f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct-objects.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationStruct-objects" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationStruct" group="field" type="guide"/> + <title type="link" role="topic">objects</title> + </info> + <title>Regress.AnnotationStruct.objects</title> + <synopsis><code mime="text/x-gjs"> +AnnotationStruct.objects: Array(<link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>) (Read / Write) + </code></synopsis> + + +</page> 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 e2100429..cdb55853 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 @@ <?xml version="1.0"?> <page id="Regress.AnnotationStruct" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationStruct</title> - - - - <p>This is a test of an array of object in an field of a struct.</p> - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let annotationStruct = new Regress.AnnotationStruct({ + <link xref='Regress.AnnotationStruct-objects'>objects</link>: value +}); + </code></synopsis> + <p>This is a test of an array of object in an field of a struct.</p> + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..e65594f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.BOOL_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.BOOL_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.BOOL_CONSTANT</title> + + +</page> 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 00000000..bbc2a038 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.DOUBLE_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.DOUBLE_CONSTANT</title> + + +</page> 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 00000000..09b1561c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_DEFINE_SHOULD_BE_EXPOSED" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_DEFINE_SHOULD_BE_EXPOSED</title> + + +</page> 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 00000000..132f5083 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_PIE_IS_TASTY" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_PIE_IS_TASTY</title> + + +</page> 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 00000000..58650ec5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_SUCCESS_INT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_SUCCESS_INT</title> + + +</page> 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 09cd98fd..2af7b9e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooASingle</title> - - - - - - - - + + <terms> <item> <title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title> @@ -26,6 +18,4 @@ </item> </terms> - - </page> 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 008a8f36..a4b82a3e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooAddressType</title> - - - - - - - - + + <terms> <item> <title><code>FooAddressType.INVALID</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 00000000..3bb9c257 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-x.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooBRect-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBRect" group="field" type="guide"/> + <title type="link" role="topic">x</title> + </info> + <title>Regress.FooBRect.x</title> + <synopsis><code mime="text/x-gjs"> +FooBRect.x: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..6a233fc0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect-y.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooBRect-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBRect" group="field" type="guide"/> + <title type="link" role="topic">y</title> + </info> + <title>Regress.FooBRect.y</title> + <synopsis><code mime="text/x-gjs"> +FooBRect.y: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 9091617a..7e5ba37b 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/"> <info> - <link xref="Regress.FooBRect" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>b2</api:name> </api:arg> </api:function> - </info> <title>Regress.FooBRect.prototype.add</title> - -<synopsis><code mime="text/x-gjs"> -function add(b2:Regress.FooBRect):void { + <synopsis><code mime="text/x-gjs"> +function add(b2: <link xref="Regress.FooBRect">Regress.FooBRect</link>): void { // Gjs wrapper for regress_foo_brect_add() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>b2</code></title> @@ -41,6 +33,4 @@ function add(b2:Regress.FooBRect):void { </item> </terms> - - </page> 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 deleted file mode 100644 index 2d2b5749..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooBRect.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooBRect" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooBRect</api:type> - </api:returns> - <api:name>regress_foo_brect_new</api:name> - <api:arg> - <api:type>Number</api:type> - <api:name>x</api:name> - </api:arg> - <api:arg> - <api:type>Number</api:type> - <api:name>y</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.FooBRect.new</title> - -<synopsis><code mime="text/x-gjs"> -function new(x:Number, y:Number):Regress.FooBRect { - // Gjs wrapper for regress_foo_brect_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>x</code></title> - -</item> -<item> -<title><code>y</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 fd1e9d6e..81db692c 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 @@ <?xml version="1.0"?> <page id="Regress.FooBRect" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBRect</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooBRect = new Regress.FooBRect({ + <link xref='Regress.FooBRect-x'>x</link>: value + <link xref='Regress.FooBRect-y'>y</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-rect.page new file mode 100644 index 00000000..8a4f98af --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-rect.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-rect" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + <title type="link" role="topic">rect</title> + </info> + <title>Regress.FooBUnion.rect</title> + <synopsis><code mime="text/x-gjs"> +FooBUnion.rect: <link xref="Regress.FooBRect">Regress.FooBRect</link> (Read) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-type.page new file mode 100644 index 00000000..361f8622 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-type.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + <title type="link" role="topic">type</title> + </info> + <title>Regress.FooBUnion.type</title> + <synopsis><code mime="text/x-gjs"> +FooBUnion.type: Number(gint) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-v.page new file mode 100644 index 00000000..1ab80587 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion-v.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-v" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + <title type="link" role="topic">v</title> + </info> + <title>Regress.FooBUnion.v</title> + <synopsis><code mime="text/x-gjs"> +FooBUnion.v: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 7d82f4f6..33ec70a8 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/"> <info> - <link xref="Regress.FooBUnion" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_foo_bunion_get_contained_type</api:name> </api:function> - </info> <title>Regress.FooBUnion.prototype.get_contained_type</title> - -<synopsis><code mime="text/x-gjs"> -function get_contained_type():Number { + <synopsis><code mime="text/x-gjs"> +function get_contained_type(): Number(gint) { // Gjs wrapper for regress_foo_bunion_get_contained_type() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function get_contained_type():Number { </item> </terms> - - </page> 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 deleted file mode 100644 index e16397c9..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooBUnion.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooBUnion" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooBUnion</api:type> - </api:returns> - <api:name>regress_foo_bunion_new</api:name> - </api:function> - - </info> - <title>Regress.FooBUnion.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.FooBUnion { - // Gjs wrapper for regress_foo_bunion_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 8644d96e..91f431b8 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,43 @@ <?xml version="1.0"?> <page id="Regress.FooBUnion" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBUnion</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooBUnion = new Regress.FooBUnion({ + <link xref='Regress.FooBUnion-type'>type</link>: value + <link xref='Regress.FooBUnion-v'>v</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 896d02ad..c5d4dac5 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/"> <info> - <link xref="Regress.FooBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_foo_boxed_method</api:name> </api:function> - </info> <title>Regress.FooBoxed.prototype.method</title> - -<synopsis><code mime="text/x-gjs"> -function method():void { + <synopsis><code mime="text/x-gjs"> +function method(): void { // Gjs wrapper for regress_foo_boxed_method() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 deleted file mode 100644 index 67b1c4fc..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooBoxed.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooBoxed" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooBoxed</api:type> - </api:returns> - <api:name>regress_foo_boxed_new</api:name> - </api:function> - - </info> - <title>Regress.FooBoxed.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.FooBoxed { - // Gjs wrapper for regress_foo_boxed_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 bca1f99a..d7e24e27 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 @@ <?xml version="1.0"?> <page id="Regress.FooBoxed" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBoxed</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooBoxed = new Regress.FooBoxed(); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 0b4f9e52..6e28c737 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBuffer</title> - <synopsis><code> const Regress = imports.gi.Regress; -let foo_buffer = new Regress.FooBuffer(); +let fooBuffer = new Regress.FooBuffer(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -38,8 +30,11 @@ let foo_buffer = new Regress.FooBuffer(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -48,7 +43,7 @@ let foo_buffer = new Regress.FooBuffer(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -59,8 +54,10 @@ let foo_buffer = new Regress.FooBuffer(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 871ec7af..273d069f 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/"> <info> - <link xref="Regress.FooBuffer" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_foo_buffer_some_method</api:name> </api:function> - </info> <title>Regress.FooBuffer.prototype.some_method</title> - -<synopsis><code mime="text/x-gjs"> -function some_method():void { + <synopsis><code mime="text/x-gjs"> +function some_method(): void { // Gjs wrapper for regress_foo_buffer_some_method() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 52feda29..0cf20c3f 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 @@ <?xml version="1.0"?> <page id="Regress.FooCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.FooCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onFooCallback(regress_foo: <link xref="Regress.FooObject">Regress.FooObject</link>, b: Boolean, data: void): Boolean { +} + </code></synopsis> + + +<terms> +<item> +<title><code>regress_foo</code></title> + +</item> +<item> +<title><code>b</code></title> + +</item> +<item> +<title><code>data</code></title> + +</item> +<item> +<title><code>ok</code></title> + +</item> +</terms> + </page> 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 0b1b6b86..734f2ae7 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/"> <info> - <link xref="Regress.FooDBusData" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_foo_dbus_data_method</api:name> </api:function> - </info> <title>Regress.FooDBusData.prototype.method</title> - -<synopsis><code mime="text/x-gjs"> -function method():void { + <synopsis><code mime="text/x-gjs"> +function method(): void { // Gjs wrapper for regress_foo_dbus_data_method() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 b4eaeade..60ef8727 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 @@ <?xml version="1.0"?> <page id="Regress.FooDBusData" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooDBusData</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooDBusData = new Regress.FooDBusData(); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00169aaf..61843918 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumFullname</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumFullname.ONE</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 d2b41e61..44c091a9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumNoType</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumNoType.UN</code></title> @@ -38,6 +30,4 @@ </item> </terms> - - </page> 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 e3240c10..61a41afe 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_foo_enum_type_method</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>regress_foo_enum</api:name> </api:arg> </api:function> - </info> - <title>method</title> - -<synopsis><code mime="text/x-gjs"> -function method(regress_foo_enum:Regress.FooEnumType):Number { + <title>Regress.method</title> + <synopsis><code mime="text/x-gjs"> +function method(regress_foo_enum: <link xref="Regress.FooEnumType">Regress.FooEnumType</link>): Number(gint) { // Gjs wrapper for regress_foo_enum_type_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>regress_foo_enum</code></title> @@ -45,6 +37,4 @@ function method(regress_foo_enum:Regress.FooEnumType):Number { </item> </terms> - - </page> 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 c3ff89b3..5827bd60 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumType</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumType.ALPHA</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 4e42fdeb..004f7a3d 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_enum_type_returnv</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> - <title>returnv</title> - -<synopsis><code mime="text/x-gjs"> -function returnv(x:Number):Regress.FooEnumType { + <title>Regress.returnv</title> + <synopsis><code mime="text/x-gjs"> +function returnv(x: Number(gint)): <link xref="Regress.FooEnumType">Regress.FooEnumType</link> { // Gjs wrapper for regress_foo_enum_type_returnv() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -45,6 +37,4 @@ function returnv(x:Number):Regress.FooEnumType { </item> </terms> - - </page> 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 8c0b6a23..873701b0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooError</title> - - - - - - - - + + <terms> <item> <title><code>FooError.GOOD</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 ed023765..4c3e58b3 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_error_quark</api:name> </api:function> - </info> - <title>quark</title> - -<synopsis><code mime="text/x-gjs"> -function quark():GLib.Quark { + <title>Regress.quark</title> + <synopsis><code mime="text/x-gjs"> +function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_foo_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function quark():GLib.Quark { </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-any.page new file mode 100644 index 00000000..77ea5f14 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-any.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-any" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + <title type="link" role="topic">any</title> + </info> + <title>Regress.FooEvent.any</title> + <synopsis><code mime="text/x-gjs"> +FooEvent.any: <link xref="Regress.FooEventAny">Regress.FooEventAny</link> (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-expose.page new file mode 100644 index 00000000..8bd11ea4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-expose.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-expose" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + <title type="link" role="topic">expose</title> + </info> + <title>Regress.FooEvent.expose</title> + <synopsis><code mime="text/x-gjs"> +FooEvent.expose: <link xref="Regress.FooEventExpose">Regress.FooEventExpose</link> (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-type.page new file mode 100644 index 00000000..37c6ab54 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent-type.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + <title type="link" role="topic">type</title> + </info> + <title>Regress.FooEvent.type</title> + <synopsis><code mime="text/x-gjs"> +FooEvent.type: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 ce368302..7a6f3d16 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,44 @@ <?xml version="1.0"?> <page id="Regress.FooEvent" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEvent</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooEvent = new Regress.FooEvent({ + <link xref='Regress.FooEvent-type'>type</link>: value + <link xref='Regress.FooEvent-any'>any</link>: value + <link xref='Regress.FooEvent-expose'>expose</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..e6cba871 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny-send_event.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventAny-send_event" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventAny" group="field" type="guide"/> + <title type="link" role="topic">send_event</title> + </info> + <title>Regress.FooEventAny.send_event</title> + <synopsis><code mime="text/x-gjs"> +FooEventAny.send_event: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 562ec03c..110f36d5 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 @@ <?xml version="1.0"?> <page id="Regress.FooEventAny" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEventAny</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooEventAny = new Regress.FooEventAny({ + <link xref='Regress.FooEventAny-send_event'>send_event</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..d8ef3dcd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-count.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventExpose-count" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventExpose" group="field" type="guide"/> + <title type="link" role="topic">count</title> + </info> + <title>Regress.FooEventExpose.count</title> + <synopsis><code mime="text/x-gjs"> +FooEventExpose.count: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..19d36c87 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose-send_event.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventExpose-send_event" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventExpose" group="field" type="guide"/> + <title type="link" role="topic">send_event</title> + </info> + <title>Regress.FooEventExpose.send_event</title> + <synopsis><code mime="text/x-gjs"> +FooEventExpose.send_event: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 0000add5..4e6d7f0d 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 @@ <?xml version="1.0"?> <page id="Regress.FooEventExpose" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEventExpose</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooEventExpose = new Regress.FooEventExpose({ + <link xref='Regress.FooEventExpose-send_event'>send_event</link>: value + <link xref='Regress.FooEventExpose-count'>count</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 53539d49..930b6d0c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooFlagsNoType</title> - - - - - - - - - - - + + </page> 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 2b4afeb5..96e97592 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooFlagsType</title> - - - - - - - - - - - + + </page> 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 00000000..f50e6341 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct-regress_foo.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooForeignStruct-regress_foo" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooForeignStruct" group="field" type="guide"/> + <title type="link" role="topic">regress_foo</title> + </info> + <title>Regress.FooForeignStruct.regress_foo</title> + <synopsis><code mime="text/x-gjs"> +FooForeignStruct.regress_foo: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 1a61cfbb..313f3ecc 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/"> <info> - <link xref="Regress.FooForeignStruct" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_foreign_struct_copy</api:name> </api:function> - </info> <title>Regress.FooForeignStruct.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.FooForeignStruct { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.FooForeignStruct">Regress.FooForeignStruct</link> { // Gjs wrapper for regress_foo_foreign_struct_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.FooForeignStruct { </item> </terms> - - </page> 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 deleted file mode 100644 index 814eef35..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooForeignStruct.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooForeignStruct</api:type> - </api:returns> - <api:name>regress_foo_foreign_struct_new</api:name> - </api:function> - - </info> - <title>Regress.FooForeignStruct.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.FooForeignStruct { - // Gjs wrapper for regress_foo_foreign_struct_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 312994a9..86892262 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 @@ <?xml version="1.0"?> <page id="Regress.FooForeignStruct" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooForeignStruct</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooForeignStruct = new Regress.FooForeignStruct({ + <link xref='Regress.FooForeignStruct-regress_foo'>regress_foo</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 17f6ec94..25f17092 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/"> <info> - - <link xref="Regress.FooInterface" group="vfunc" type="guide"/> - + <link xref="Regress.FooInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooInterface::do_regress_foo</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_do_regress_foo(x:Number):void { + <synopsis><code mime="text/x-gjs"> +function vfunc_do_regress_foo(x: Number(gint)): void { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -30,6 +22,4 @@ function vfunc_do_regress_foo(x:Number):void { </item> </terms> - - </page> 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 993998e4..4fda50ef 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/"> <info> - <link xref="Regress.FooInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_interface_do_regress_foo</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.FooInterface.prototype.do_regress_foo</title> - -<synopsis><code mime="text/x-gjs"> -function do_regress_foo(x:Number):void { + <synopsis><code mime="text/x-gjs"> +function do_regress_foo(x: Number(gint)): void { // Gjs wrapper for regress_foo_interface_do_regress_foo() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -41,6 +33,4 @@ function do_regress_foo(x:Number):void { </item> </terms> - - </page> 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 83ae1d0d..d5db2a09 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 @@ <?xml version="1.0"?> <page id="Regress.FooInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.FooInterface</title> - <synopsis><code> const Regress = imports.gi.Regress; let foo_interface = new Regress.FooInterface(); </code></synopsis> - - - - - - + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.FooInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>FooInterface requires GObject.Object</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>FooInterface is implemented by FooBuffer, FooObject and FooSubobject</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -42,7 +37,7 @@ let foo_interface = new Regress.FooInterface(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -53,8 +48,10 @@ let foo_interface = new Regress.FooInterface(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 d38a4488..6915fcc3 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/"> <info> - <link xref="Regress.FooInterface" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_interface_static_method</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> - <title>static_method</title> - -<synopsis><code mime="text/x-gjs"> -function static_method(x:Number):void { + <title>Regress.FooInterface.static_method</title> + <synopsis><code mime="text/x-gjs"> +function static_method(x: Number(gint)): void { // Gjs wrapper for regress_foo_interface_static_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -41,6 +33,4 @@ function static_method(x:Number):void { </item> </terms> - - </page> 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 4bdaf370..7c058935 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/"> <info> - - <link xref="Regress.FooObject" group="vfunc" type="guide"/> - + <link xref="Regress.FooObject" group="vfunc" type="guide"/> </info> <title>Regress.FooObject::read_fn</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_read_fn(offset:Number, length:Number):void { + <synopsis><code mime="text/x-gjs"> +function vfunc_read_fn(offset: Number(gint), length: Number(gint)): void { } -</code></synopsis> + </code></synopsis> + <p>Read some stuff.</p> - - <p>Read some stuff.</p> - - - - <terms> <item> <title><code>offset</code></title> -<p>offset</p> + <p>offset</p> </item> <item> <title><code>length</code></title> -<p>length</p> + <p>length</p> </item> </terms> - - </page> 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 6e5657d4..f455012d 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/"> <info> - <link xref="Regress.FooObject" group="signal" type="guide"/> <title type="link" role="topic">signal</title> - </info> <title>Regress.FooObject::signal</title> - -<synopsis><code mime="text/x-python"> -function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('signal', function (fooObject, object: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, p0: void, ): String); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>foo_object</code></title> +<title><code>fooObject</code></title> <p>instance of <link xref="Regress.FooObject"/> that is emitting the signal</p> </item> <item> @@ -42,6 +34,4 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; </item> </terms> - - </page> 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 a738fdd7..47e90020 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/"> <info> - <link xref="Regress.FooObject" group="property" type="guide"/> <title type="link" role="topic">string</title> - </info> - <title>Regress.FooObject:string</title> - -<synopsis><code mime="text/x-python"> -"string" String : Read / Write / Construct -</code></synopsis> + <title>Regress.FooObject.string</title> + <synopsis><code mime="text/x-gjs"> +FooObject.string: String (Read / Write / Construct) + </code></synopsis> + - - - - - - - - - </page> 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 d2ccd866..327a02dc 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/"> <info> - - <link xref="Regress.FooObject" group="vfunc" type="guide"/> - + <link xref="Regress.FooObject" group="vfunc" type="guide"/> </info> <title>Regress.FooObject::virtual_method</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_virtual_method(first_param:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +function vfunc_virtual_method(first_param: Number(gint)): Boolean { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>first_param</code></title> @@ -34,6 +26,4 @@ function vfunc_virtual_method(first_param:Number):Boolean { </item> </terms> - - </page> 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 83fec18f..6c3a99b2 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/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> - <title>a_global_method</title> - -<synopsis><code mime="text/x-gjs"> -function a_global_method(obj:Utility.Object):void { + <title>Regress.FooObject.a_global_method</title> + <synopsis><code mime="text/x-gjs"> +function a_global_method(obj: <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link>): void { // Gjs wrapper for regress_foo_object_a_global_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -41,6 +33,4 @@ function a_global_method(obj:Utility.Object):void { </item> </terms> - - </page> 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 f1bfd923..9aa82beb 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_object_append_new_stack_layer</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.append_new_stack_layer</title> - -<synopsis><code mime="text/x-gjs"> -function append_new_stack_layer(x:Number):Regress.FooOtherObject { + <synopsis><code mime="text/x-gjs"> +function append_new_stack_layer(x: Number(gint)): <link xref="Regress.FooOtherObject">Regress.FooOtherObject</link> { // Gjs wrapper for regress_foo_object_append_new_stack_layer() } -</code></synopsis> + </code></synopsis> + <p>This shouldn't be scanned as a constructor.</p> - - <p>This shouldn't be scanned as a constructor.</p> - - - - <terms> <item> <title><code>x</code></title> @@ -45,6 +37,4 @@ function append_new_stack_layer(x:Number):Regress.FooOtherObject { </item> </terms> - - </page> 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 d74f95bf..83aa735c 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_object_dup_name</api:name> </api:function> - </info> <title>Regress.FooObject.prototype.dup_name</title> - -<synopsis><code mime="text/x-gjs"> -function dup_name():String { + <synopsis><code mime="text/x-gjs"> +function dup_name(): String { // Gjs wrapper for regress_foo_object_dup_name() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function dup_name():String { </item> </terms> - - </page> 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 7da1b86e..9d962d12 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_foo_object_external_type</api:name> </api:function> - </info> <title>Regress.FooObject.prototype.external_type</title> - -<synopsis><code mime="text/x-gjs"> -function external_type():Utility.Object { + <synopsis><code mime="text/x-gjs"> +function external_type(): <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link> { // Gjs wrapper for regress_foo_object_external_type() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p><code>null</code> always</p> + </item> </terms> - - </page> 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 8ab86544..acb4b465 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/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> @@ -14,30 +13,21 @@ </api:returns> <api:name>regress_foo_object_get_default</api:name> </api:function> - </info> - <title>get_default</title> - -<synopsis><code mime="text/x-gjs"> -function get_default():Regress.FooSubobject { + <title>Regress.FooObject.get_default</title> + <synopsis><code mime="text/x-gjs"> +function get_default(): <link xref="Regress.FooSubobject">Regress.FooSubobject</link> { // Gjs wrapper for regress_foo_object_get_default() } -</code></synopsis> - - - <p>This function is intended to match clutter_stage_get_default which + </code></synopsis> + <p>This function is intended to match clutter_stage_get_default which uses a C sugar return type.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>The global <link xref="Regress.FooSubobject"/></p> + </item> </terms> - - </page> 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 b9c69d2b..00b4445e 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_object_get_name</api:name> </api:function> - </info> <title>Regress.FooObject.prototype.get_name</title> - -<synopsis><code mime="text/x-gjs"> -function get_name():String { + <synopsis><code mime="text/x-gjs"> +function get_name(): String { // Gjs wrapper for regress_foo_object_get_name() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function get_name():String { </item> </terms> - - </page> 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 3209f200..6e8b1d62 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>glyph</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.handle_glyph</title> - -<synopsis><code mime="text/x-gjs"> -function handle_glyph(glyph:Utility.Glyph):void { + <synopsis><code mime="text/x-gjs"> +function handle_glyph(glyph: <link href="../Utility-1.0/Utility.Glyph.page">Utility.Glyph</link>): void { // Gjs wrapper for regress_foo_object_handle_glyph() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>glyph</code></title> @@ -41,6 +33,4 @@ function handle_glyph(glyph:Utility.Glyph):void { </item> </terms> - - </page> 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 f42e16bb..61c1a7fc 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_object_is_it_time_yet</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(glong)</api:type> <api:name>time</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.is_it_time_yet</title> - -<synopsis><code mime="text/x-gjs"> -function is_it_time_yet(time:Number):void { + <synopsis><code mime="text/x-gjs"> +function is_it_time_yet(time: Number(glong)): void { // Gjs wrapper for regress_foo_object_is_it_time_yet() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>time</code></title> @@ -41,6 +33,4 @@ function is_it_time_yet(time:Number):void { </item> </terms> - - </page> 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 deleted file mode 100644 index fa40bfc3..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooObject.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooObject" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooObject</api:type> - </api:returns> - <api:name>regress_foo_object_new</api:name> - </api:function> - - </info> - <title>Regress.FooObject.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.FooObject { - // Gjs wrapper for regress_foo_object_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 deleted file mode 100644 index 0323a1be..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooObject.new_as_super" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooObject" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>GObject.Object</api:type> - </api:returns> - <api:name>regress_foo_object_new_as_super</api:name> - </api:function> - - </info> - <title>Regress.FooObject.new_as_super</title> - -<synopsis><code mime="text/x-gjs"> -function new_as_super():GObject.Object { - // Gjs wrapper for regress_foo_object_new_as_super() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 1cbea89b..723e8e8b 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooObject</title> - <synopsis><code> const Regress = imports.gi.Regress; -let foo_object = new Regress.FooObject({ +let fooObject = new Regress.FooObject({ <link xref='Regress.FooObject-hidden'>hidden</link>: value, <link xref='Regress.FooObject-string'>string</link>: value, }); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -38,8 +30,11 @@ let foo_object = new Regress.FooObject({ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -48,7 +43,7 @@ let foo_object = new Regress.FooObject({ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -59,8 +54,10 @@ let foo_object = new Regress.FooObject({ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 78bdb648..f4224dba 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,41 +13,32 @@ </api:returns> <api:name>regress_foo_object_read</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>offset</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>length</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.read</title> - -<synopsis><code mime="text/x-gjs"> -function read(offset:Number, length:Number):void { + <synopsis><code mime="text/x-gjs"> +function read(offset: Number(gint), length: Number(gint)): void { // Gjs wrapper for regress_foo_object_read() } -</code></synopsis> + </code></synopsis> + <p>Read some stuff.</p> - - <p>Read some stuff.</p> - - - - <terms> <item> <title><code>offset</code></title> -<p>offset</p> + <p>offset</p> </item> <item> <title><code>length</code></title> -<p>length</p> + <p>length</p> </item> </terms> - - </page> 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 c4c1045a..fe9c952e 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/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_foo_object_static_meth</api:name> </api:function> - </info> - <title>static_meth</title> - -<synopsis><code mime="text/x-gjs"> -function static_meth():Number { + <title>Regress.FooObject.static_meth</title> + <synopsis><code mime="text/x-gjs"> +function static_meth(): Number(gint) { // Gjs wrapper for regress_foo_object_static_meth() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function static_meth():Number { </item> </terms> - - </page> 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 1f509214..f16c04d9 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,30 +13,23 @@ </api:returns> <api:name>regress_foo_object_various</api:name> <api:arg> - <api:type>gpointer</api:type> + <api:type>void</api:type> <api:name>data</api:name> </api:arg> <api:arg> - <api:type>GType</api:type> + <api:type>GObject.Type</api:type> <api:name>some_type</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.various</title> - -<synopsis><code mime="text/x-gjs"> -function various(data:gpointer, some_type:GType):void { + <synopsis><code mime="text/x-gjs"> +function various(data: void, some_type: GObject.Type): void { // Gjs wrapper for regress_foo_object_various() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> @@ -49,6 +41,4 @@ function various(data:gpointer, some_type:GType):void { </item> </terms> - - </page> 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 3467ca20..df24439e 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/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -14,37 +13,28 @@ </api:returns> <api:name>regress_foo_object_virtual_method</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>first_param</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.prototype.virtual_method</title> - -<synopsis><code mime="text/x-gjs"> -function virtual_method(first_param:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +function virtual_method(first_param: Number(gint)): Boolean { // Gjs wrapper for regress_foo_object_virtual_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>first_param</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 44a63ab1..fecc5544 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/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooObjectCookie</title> - - - - - - - - - - - + + </page> 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 0916a449..524f7612 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooOtherObject</title> - <synopsis><code> const Regress = imports.gi.Regress; -let foo_other_object = new Regress.FooOtherObject(); +let fooOtherObject = new Regress.FooOtherObject(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -35,8 +27,11 @@ let foo_other_object = new Regress.FooOtherObject(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -45,7 +40,7 @@ let foo_other_object = new Regress.FooOtherObject(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -56,8 +51,10 @@ let foo_other_object = new Regress.FooOtherObject(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 00000000..bd583c79 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-height.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-height" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + <title type="link" role="topic">height</title> + </info> + <title>Regress.FooRectangle.height</title> + <synopsis><code mime="text/x-gjs"> +FooRectangle.height: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..bc3d3dee --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-width.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-width" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + <title type="link" role="topic">width</title> + </info> + <title>Regress.FooRectangle.width</title> + <synopsis><code mime="text/x-gjs"> +FooRectangle.width: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..5e2c2519 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-x.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + <title type="link" role="topic">x</title> + </info> + <title>Regress.FooRectangle.x</title> + <synopsis><code mime="text/x-gjs"> +FooRectangle.x: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..5096547f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle-y.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + <title type="link" role="topic">y</title> + </info> + <title>Regress.FooRectangle.y</title> + <synopsis><code mime="text/x-gjs"> +FooRectangle.y: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 276450e6..a3978c4e 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/"> <info> - <link xref="Regress.FooRectangle" group="method" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,20 @@ <api:name>r2</api:name> </api:arg> </api:function> - </info> <title>Regress.FooRectangle.prototype.add</title> - -<synopsis><code mime="text/x-gjs"> -function add(r2:Regress.FooRectangle):void { + <synopsis><code mime="text/x-gjs"> +function add(r2: <link xref="Regress.FooRectangle">Regress.FooRectangle</link>): void { // Gjs wrapper for regress_foo_rectangle_add() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>r2</code></title> -<p>source rectangle</p> + <p>source rectangle</p> </item> </terms> - - </page> 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 0cfef622..0b6e46d1 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 @@ <?xml version="1.0"?> <page id="Regress.FooRectangle" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooRectangle</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooRectangle = new Regress.FooRectangle({ + <link xref='Regress.FooRectangle-x'>x</link>: value + <link xref='Regress.FooRectangle-y'>y</link>: value + <link xref='Regress.FooRectangle-width'>width</link>: value + <link xref='Regress.FooRectangle-height'>height</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 8a08c9ae..bb6bc51d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooStackLayer</title> - - - - - - - - + + <terms> <item> <title><code>FooStackLayer.DESKTOP</code></title> @@ -58,6 +50,4 @@ </item> </terms> - - </page> 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 00000000..5a2946e6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-member.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooStruct-member" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooStruct" group="field" type="guide"/> + <title type="link" role="topic">member</title> + </info> + <title>Regress.FooStruct.member</title> + <synopsis><code mime="text/x-gjs"> +FooStruct.member: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..665bf16b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct-priv.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooStruct-priv" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooStruct" group="field" type="guide"/> + <title type="link" role="topic">priv</title> + </info> + <title>Regress.FooStruct.priv</title> + <synopsis><code mime="text/x-gjs"> +FooStruct.priv: <link xref="Regress.FooStructPrivate">Regress.FooStructPrivate</link> (Read) + </code></synopsis> + + +</page> 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 84f5d192..0571517b 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 @@ <?xml version="1.0"?> <page id="Regress.FooStruct" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooStruct</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooStruct = new Regress.FooStruct({ + <link xref='Regress.FooStruct-member'>member</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 961a22e6..7f3f1f84 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/"> <info> - <link xref="Regress.FooSubInterface" group="signal" type="guide"/> <title type="link" role="topic">destroy-event</title> - </info> <title>Regress.FooSubInterface::destroy-event</title> - -<synopsis><code mime="text/x-python"> -function callback(foo_sub_interface, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('destroy-event', function (fooSubInterface, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>foo_sub_interface</code></title> +<title><code>fooSubInterface</code></title> <p>instance of <link xref="Regress.FooSubInterface"/> that is emitting the signal</p> </item> </terms> - - </page> 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 5abc585f..0433a7fe 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/"> <info> - - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::destroy_event</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_destroy_event():void { + <synopsis><code mime="text/x-gjs"> +function vfunc_destroy_event(): void { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> </terms> - - </page> 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 81649248..90b6bf4a 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/"> <info> - - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::do_bar</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_do_bar():void { + <synopsis><code mime="text/x-gjs"> +function vfunc_do_bar(): void { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> </terms> - - </page> 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 4945c890..51e23667 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/"> <info> - - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::do_baz</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_do_baz(callback:GObject.Callback):void { + <synopsis><code mime="text/x-gjs"> +function vfunc_do_baz(callback: <link href="../GObject-2.0/GObject.Callback.page">GObject.Callback</link>): void { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -30,6 +22,4 @@ function vfunc_do_baz(callback:GObject.Callback):void { </item> </terms> - - </page> 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 a258a3e6..aad9cf43 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/"> <info> - <link xref="Regress.FooSubInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_foo_sub_interface_do_bar</api:name> </api:function> - </info> <title>Regress.FooSubInterface.prototype.do_bar</title> - -<synopsis><code mime="text/x-gjs"> -function do_bar():void { + <synopsis><code mime="text/x-gjs"> +function do_bar(): void { // Gjs wrapper for regress_foo_sub_interface_do_bar() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 b55a8d78..7f07e006 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/"> <info> - <link xref="Regress.FooSubInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>Regress.FooSubInterface.prototype.do_baz</title> - -<synopsis><code mime="text/x-gjs"> -function do_baz(callback:GObject.Callback):void { + <synopsis><code mime="text/x-gjs"> +function do_baz(callback: <link href="../GObject-2.0/GObject.Callback.page">GObject.Callback</link>): void { // Gjs wrapper for regress_foo_sub_interface_do_baz() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function do_baz(callback:GObject.Callback):void { </item> </terms> - - </page> 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 0694e3df..eae9fbd0 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 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.FooSubInterface</title> - <synopsis><code> const Regress = imports.gi.Regress; let foo_sub_interface = new Regress.FooSubInterface(); </code></synopsis> - - - - - - + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.FooSubInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>FooSubInterface requires Regress.FooInterface</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>None</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -42,7 +37,7 @@ let foo_sub_interface = new Regress.FooSubInterface(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -53,8 +48,10 @@ let foo_sub_interface = new Regress.FooSubInterface(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 deleted file mode 100644 index 08cb116d..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.FooSubobject.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.FooSubobject" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.FooSubobject</api:type> - </api:returns> - <api:name>regress_foo_subobject_new</api:name> - </api:function> - - </info> - <title>Regress.FooSubobject.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.FooSubobject { - // Gjs wrapper for regress_foo_subobject_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 f9cac644..3936b17f 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooSubobject</title> - <synopsis><code> const Regress = imports.gi.Regress; -let foo_subobject = new Regress.FooSubobject(); +let fooSubobject = new Regress.FooSubobject(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -38,8 +30,11 @@ let foo_subobject = new Regress.FooSubobject(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -48,7 +43,7 @@ let foo_subobject = new Regress.FooSubobject(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -59,8 +54,10 @@ let foo_subobject = new Regress.FooSubobject(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 00000000..ba23b2f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-data.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-data" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + <title type="link" role="topic">data</title> + </info> + <title>Regress.FooThingWithArray.data</title> + <synopsis><code mime="text/x-gjs"> +FooThingWithArray.data: Number(guint8) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..0ff4621f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-lines.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-lines" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + <title type="link" role="topic">lines</title> + </info> + <title>Regress.FooThingWithArray.lines</title> + <synopsis><code mime="text/x-gjs"> +FooThingWithArray.lines: Array(Number(gchar)) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..bae7f5ad --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-x.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + <title type="link" role="topic">x</title> + </info> + <title>Regress.FooThingWithArray.x</title> + <synopsis><code mime="text/x-gjs"> +FooThingWithArray.x: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..c1812ca3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray-y.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + <title type="link" role="topic">y</title> + </info> + <title>Regress.FooThingWithArray.y</title> + <synopsis><code mime="text/x-gjs"> +FooThingWithArray.y: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 430dce7c..2254edc9 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 @@ <?xml version="1.0"?> <page id="Regress.FooThingWithArray" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooThingWithArray</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooThingWithArray = new Regress.FooThingWithArray({ + <link xref='Regress.FooThingWithArray-x'>x</link>: value + <link xref='Regress.FooThingWithArray-y'>y</link>: value + <link xref='Regress.FooThingWithArray-lines'>lines</link>: value + <link xref='Regress.FooThingWithArray-data'>data</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion-regress_foo.page new file mode 100644 index 00000000..2107a554 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion-regress_foo.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooUnion-regress_foo" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooUnion" group="field" type="guide"/> + <title type="link" role="topic">regress_foo</title> + </info> + <title>Regress.FooUnion.regress_foo</title> + <synopsis><code mime="text/x-gjs"> +FooUnion.regress_foo: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 9746f17e..9765253e 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,42 @@ <?xml version="1.0"?> <page id="Regress.FooUnion" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooUnion</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooUnion = new Regress.FooUnion({ + <link xref='Regress.FooUnion-regress_foo'>regress_foo</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..5dca9693 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.FooUtilityStruct-bar" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooUtilityStruct" group="field" type="guide"/> + <title type="link" role="topic">bar</title> + </info> + <title>Regress.FooUtilityStruct.bar</title> + <synopsis><code mime="text/x-gjs"> +FooUtilityStruct.bar: <link href="../Utility-1.0/Utility.Struct.page">Utility.Struct</link> (Read / Write) + </code></synopsis> + + +</page> 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 2b94f691..6d6b633a 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 @@ <?xml version="1.0"?> <page id="Regress.FooUtilityStruct" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooUtilityStruct</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let fooUtilityStruct = new Regress.FooUtilityStruct({ + <link xref='Regress.FooUtilityStruct-bar'>bar</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 c389ef05..19bee422 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/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooXEvent</title> - - - - - - - - - - - + + </page> 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 00000000..e9876e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_ELSE.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GI_SCANNER_ELSE" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GI_SCANNER_ELSE</title> + + +</page> 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 00000000..bfef183a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GI_SCANNER_IFDEF.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GI_SCANNER_IFDEF" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GI_SCANNER_IFDEF</title> + + +</page> 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 00000000..8c16dd2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GUINT64_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GUINT64_CONSTANT</title> + + +</page> 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 00000000..3b0d6f14 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GUINT64_CONSTANTA" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GUINT64_CONSTANTA</title> + + +</page> 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 00000000..cdce6076 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.G_GINT64_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.G_GINT64_CONSTANT</title> + + +</page> 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 00000000..e0512abe --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.INT_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.INT_CONSTANT</title> + + +</page> 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 00000000..85fe96ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.LONG_STRING_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.LONG_STRING_CONSTANT</title> + + +</page> 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 00000000..1a9e2def --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-attributes" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + <title type="link" role="topic">attributes</title> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema.attributes</title> + <synopsis><code mime="text/x-gjs"> +LikeGnomeKeyringPasswordSchema.attributes: Array(void) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..bcca817d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + <title type="link" role="topic">dummy</title> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema.dummy</title> + <synopsis><code mime="text/x-gjs"> +LikeGnomeKeyringPasswordSchema.dummy: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..4d64ad89 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + <title type="link" role="topic">dummy2</title> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema.dummy2</title> + <synopsis><code mime="text/x-gjs"> +LikeGnomeKeyringPasswordSchema.dummy2: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 44a946ee..fc44fcce 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 @@ <?xml version="1.0"?> <page id="Regress.LikeGnomeKeyringPasswordSchema" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.LikeGnomeKeyringPasswordSchema</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let likeGnomeKeyringPasswordSchema = new Regress.LikeGnomeKeyringPasswordSchema({ + <link xref='Regress.LikeGnomeKeyringPasswordSchema-dummy'>dummy</link>: value + <link xref='Regress.LikeGnomeKeyringPasswordSchema-attributes'>attributes</link>: value + <link xref='Regress.LikeGnomeKeyringPasswordSchema-dummy2'>dummy2</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..bf777c8a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem-name.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.LikeXklConfigItem-name" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeXklConfigItem" group="field" type="guide"/> + <title type="link" role="topic">name</title> + </info> + <title>Regress.LikeXklConfigItem.name</title> + <synopsis><code mime="text/x-gjs"> +LikeXklConfigItem.name: Array(Number(gchar)) (Read / Write) + </code></synopsis> + + +</page> 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 fb4831f5..5399d102 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 @@ <?xml version="1.0"?> <page id="Regress.LikeXklConfigItem" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.LikeXklConfigItem</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let likeXklConfigItem = new Regress.LikeXklConfigItem({ + <link xref='Regress.LikeXklConfigItem-name'>name</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 f81bc5df..2e0b9e89 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/"> <info> - <link xref="Regress.LikeXklConfigItem" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>name</api:name> </api:arg> </api:function> - </info> <title>Regress.LikeXklConfigItem.prototype.set_name</title> - -<synopsis><code mime="text/x-gjs"> -function set_name(name:String):void { + <synopsis><code mime="text/x-gjs"> +function set_name(name: String): void { // Gjs wrapper for regress_like_xkl_config_item_set_name() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>name</code></title> @@ -41,6 +33,4 @@ function set_name(name:String):void { </item> </terms> - - </page> 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 00000000..91d7ce51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.MAXUINT64" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.MAXUINT64</title> + + +</page> 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 00000000..1531540e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.MININT64" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.MININT64</title> + + +</page> 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 00000000..29e7314b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.Mixed_Case_Constant" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.Mixed_Case_Constant</title> + + +</page> 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 00000000..a0aad769 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.NEGATIVE_INT_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.NEGATIVE_INT_CONSTANT</title> + + +</page> 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 f66aee44..1acd4d22 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/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.PtrArrayAlias</title> - - - - <p>Typedef'd GPtrArray for some reason</p> - - - - - - - + <p>Typedef'd GPtrArray for some reason</p> + </page> 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 00000000..be1d6e16 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.STRING_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.STRING_CONSTANT</title> + + +</page> 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 f31b58ec..9ab21894 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestABCError</title> - - - - - - - - + + <terms> <item> <title><code>TestABCError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 72f9adc3..c9c560d3 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_abc_error_quark</api:name> </api:function> - </info> - <title>quark</title> - -<synopsis><code mime="text/x-gjs"> -function quark():GLib.Quark { + <title>Regress.quark</title> + <synopsis><code mime="text/x-gjs"> +function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_test_abc_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function quark():GLib.Quark { </item> </terms> - - </page> 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 00000000..856aa6f8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-nested_a.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + <title type="link" role="topic">nested_a</title> + </info> + <title>Regress.TestBoxed.nested_a</title> + <synopsis><code mime="text/x-gjs"> +TestBoxed.nested_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> (Read / Write) + </code></synopsis> + + +</page> 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 00000000..54bf6593 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-priv.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-priv" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + <title type="link" role="topic">priv</title> + </info> + <title>Regress.TestBoxed.priv</title> + <synopsis><code mime="text/x-gjs"> +TestBoxed.priv: <link xref="Regress.TestBoxedPrivate">Regress.TestBoxedPrivate</link> (Read) + </code></synopsis> + + +</page> 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 00000000..226cf959 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestBoxed.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestBoxed.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 751ce883..0aee5d02 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/"> <info> - <link xref="Regress.TestBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_boxed_copy</api:name> </api:function> - </info> <title>Regress.TestBoxed.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.TestBoxed { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> { // Gjs wrapper for regress_test_boxed_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxed { </item> </terms> - - </page> 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 5c23da2d..063c2412 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/"> <info> - <link xref="Regress.TestBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>other</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.prototype.equals</title> - -<synopsis><code mime="text/x-gjs"> -function equals(other:Regress.TestBoxed):Boolean { + <synopsis><code mime="text/x-gjs"> +function equals(other: <link xref="Regress.TestBoxed">Regress.TestBoxed</link>): Boolean { // Gjs wrapper for regress_test_boxed_equals() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>other</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 deleted file mode 100644 index 88e33de3..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestBoxed.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestBoxed</api:type> - </api:returns> - <api:name>regress_test_boxed_new</api:name> - </api:function> - - </info> - <title>Regress.TestBoxed.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.TestBoxed { - // Gjs wrapper for regress_test_boxed_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 801bad21..baf1bd77 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/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_boxed_new_alternative_constructor1</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>i</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.new_alternative_constructor1</title> - -<synopsis><code mime="text/x-gjs"> -function new_alternative_constructor1(i:Number):Regress.TestBoxed { + <synopsis><code mime="text/x-gjs"> +function new_alternative_constructor1(i: Number(gint)): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> { // Gjs wrapper for regress_test_boxed_new_alternative_constructor1() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> @@ -45,6 +37,4 @@ function new_alternative_constructor1(i:Number):Regress.TestBoxed { </item> </terms> - - </page> 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 23fa6723..eeb5c3cb 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/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,30 +13,23 @@ </api:returns> <api:name>regress_test_boxed_new_alternative_constructor2</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>i</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>j</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.new_alternative_constructor2</title> - -<synopsis><code mime="text/x-gjs"> -function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { + <synopsis><code mime="text/x-gjs"> +function new_alternative_constructor2(i: Number(gint), j: Number(gint)): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> { // Gjs wrapper for regress_test_boxed_new_alternative_constructor2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> @@ -53,6 +45,4 @@ function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { </item> </terms> - - </page> 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 8f0c2d28..55b17a51 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/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>s</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.new_alternative_constructor3</title> - -<synopsis><code mime="text/x-gjs"> -function new_alternative_constructor3(s:String):Regress.TestBoxed { + <synopsis><code mime="text/x-gjs"> +function new_alternative_constructor3(s: String): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> { // Gjs wrapper for regress_test_boxed_new_alternative_constructor3() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>s</code></title> @@ -45,6 +37,4 @@ function new_alternative_constructor3(s:String):Regress.TestBoxed { </item> </terms> - - </page> 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 baa423f2..d3e41a65 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 @@ <?xml version="1.0"?> <page id="Regress.TestBoxed" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxed</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testBoxed = new Regress.TestBoxed({ + <link xref='Regress.TestBoxed-some_int8'>some_int8</link>: value + <link xref='Regress.TestBoxed-nested_a'>nested_a</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..ff167f0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedB" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestBoxedB.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestBoxedB.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..8d48a34e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB-some_long.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedB-some_long" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedB" group="field" type="guide"/> + <title type="link" role="topic">some_long</title> + </info> + <title>Regress.TestBoxedB.some_long</title> + <synopsis><code mime="text/x-gjs"> +TestBoxedB.some_long: Number(glong) (Read / Write) + </code></synopsis> + + +</page> 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 06bccc87..ecf95e38 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/"> <info> - <link xref="Regress.TestBoxedB" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_boxed_b_copy</api:name> </api:function> - </info> <title>Regress.TestBoxedB.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.TestBoxedB { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.TestBoxedB">Regress.TestBoxedB</link> { // Gjs wrapper for regress_test_boxed_b_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxedB { </item> </terms> - - </page> 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 deleted file mode 100644 index e71147ae..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestBoxedB.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestBoxedB" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestBoxedB</api:type> - </api:returns> - <api:name>regress_test_boxed_b_new</api:name> - <api:arg> - <api:type>gint8</api:type> - <api:name>some_int8</api:name> - </api:arg> - <api:arg> - <api:type>Number</api:type> - <api:name>some_long</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestBoxedB.new</title> - -<synopsis><code mime="text/x-gjs"> -function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { - // Gjs wrapper for regress_test_boxed_b_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>some_int8</code></title> - -</item> -<item> -<title><code>some_long</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 0e39780b..a8a12405 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 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedB" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedB</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testBoxedB = new Regress.TestBoxedB({ + <link xref='Regress.TestBoxedB-some_int8'>some_int8</link>: value + <link xref='Regress.TestBoxedB-some_long'>some_long</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..1fdb39b2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-another_thing.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedC-another_thing" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedC" group="field" type="guide"/> + <title type="link" role="topic">another_thing</title> + </info> + <title>Regress.TestBoxedC.another_thing</title> + <synopsis><code mime="text/x-gjs"> +TestBoxedC.another_thing: Number(guint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..b78ee298 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC-refcount.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedC-refcount" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedC" group="field" type="guide"/> + <title type="link" role="topic">refcount</title> + </info> + <title>Regress.TestBoxedC.refcount</title> + <synopsis><code mime="text/x-gjs"> +TestBoxedC.refcount: Number(guint) (Read / Write) + </code></synopsis> + + +</page> 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 deleted file mode 100644 index 542c93e4..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestBoxedC.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestBoxedC" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestBoxedC</api:type> - </api:returns> - <api:name>regress_test_boxed_c_new</api:name> - </api:function> - - </info> - <title>Regress.TestBoxedC.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.TestBoxedC { - // Gjs wrapper for regress_test_boxed_c_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 18b77d9f..82d4fcd8 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 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedC" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedC</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testBoxedC = new Regress.TestBoxedC({ + <link xref='Regress.TestBoxedC-refcount'>refcount</link>: value + <link xref='Regress.TestBoxedC-another_thing'>another_thing</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 7b51fd5b..519d154f 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/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_boxed_d_copy</api:name> </api:function> - </info> <title>Regress.TestBoxedD.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.TestBoxedD { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.TestBoxedD">Regress.TestBoxedD</link> { // Gjs wrapper for regress_test_boxed_d_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.TestBoxedD { </item> </terms> - - </page> 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 82df9040..fd4fb6f2 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/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_boxed_d_free</api:name> </api:function> - </info> <title>Regress.TestBoxedD.prototype.free</title> - -<synopsis><code mime="text/x-gjs"> -function free():void { + <synopsis><code mime="text/x-gjs"> +function free(): void { // Gjs wrapper for regress_test_boxed_d_free() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 0f7923e6..37d6d017 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/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_boxed_d_get_magic</api:name> </api:function> - </info> <title>Regress.TestBoxedD.prototype.get_magic</title> - -<synopsis><code mime="text/x-gjs"> -function get_magic():Number { + <synopsis><code mime="text/x-gjs"> +function get_magic(): Number(gint) { // Gjs wrapper for regress_test_boxed_d_get_magic() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function get_magic():Number { </item> </terms> - - </page> 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 deleted file mode 100644 index cfd50c56..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestBoxedD.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestBoxedD" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestBoxedD</api:type> - </api:returns> - <api:name>regress_test_boxed_d_new</api:name> - <api:arg> - <api:type>String</api:type> - <api:name>a_string</api:name> - </api:arg> - <api:arg> - <api:type>Number</api:type> - <api:name>a_int</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestBoxedD.new</title> - -<synopsis><code mime="text/x-gjs"> -function new(a_string:String, a_int:Number):Regress.TestBoxedD { - // Gjs wrapper for regress_test_boxed_d_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>a_string</code></title> - -</item> -<item> -<title><code>a_int</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 995e80dd..093b4f9c 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 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedD" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedD</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testBoxedD = new Regress.TestBoxedD(); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 bed84d50..13e80ca0 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallback(): Number(gint) { +} + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 7d3f7b83..56e48b12 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackArray" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackArray</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackArray(one: Array(Number(gint)), two: Array(String)): Number(gint) { +} + </code></synopsis> + + +<terms> +<item> +<title><code>one</code></title> + +</item> +<item> +<title><code>two</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 0b8fca1d..edd33f3d 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackFull" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackFull</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackFull(foo: Number(gint), bar: Number(gdouble), path: String): Number(gint) { +} + </code></synopsis> + + +<terms> +<item> +<title><code>foo</code></title> + <p>the investment rate</p> +</item> +<item> +<title><code>bar</code></title> + <p>how much money</p> +</item> +<item> +<title><code>path</code></title> + <p>Path to file</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 804382f5..9e1e285f 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackGError" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackGError(error: <link href="../GLib-2.0/GLib.Error.page">GLib.Error</link>): void { +} + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + +</item> +</terms> + </page> 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 06ebb706..8f93a2a5 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackHashtable" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackHashtable</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackHashtable(data: {String: Number(gint)}): void { +} + </code></synopsis> + + +<terms> +<item> +<title><code>data</code></title> + <p>a hash table; will be modified</p> +</item> +</terms> + </page> 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 28b21ea4..9052a9d1 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackOwnedGError" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackOwnedGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackOwnedGError(error: <link href="../GLib-2.0/GLib.Error.page">GLib.Error</link>): void { +} + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + <p>GError instance; must be freed by the callback</p> +</item> +</terms> + </page> 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 286c830a..469aa406 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 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackUserData" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackUserData</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestCallbackUserData(): Number(gint) { +} + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 589059d5..4ee86378 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestDEFError</title> - - - - - - - - + + <terms> <item> <title><code>TestDEFError.CODE0</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 814b474b..10a6897d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnum</title> - - - - <p>By purpose, not all members have documentation</p> - - - - + <p>By purpose, not all members have documentation</p> + <terms> <item> <title><code>TestEnum.VALUE1</code></title> -<p>value 1</p> + <p>value 1</p> </item> <item> <title><code>TestEnum.VALUE2</code></title> -<p>value 2</p> + <p>value 2</p> </item> <item> <title><code>TestEnum.VALUE3</code></title> @@ -38,6 +30,4 @@ </item> </terms> - - </page> 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 b4dfb296..cab98809 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> - <title>param</title> - -<synopsis><code mime="text/x-gjs"> -function param(e:Regress.TestEnum):String { + <title>Regress.param</title> + <synopsis><code mime="text/x-gjs"> +function param(e: <link xref="Regress.TestEnum">Regress.TestEnum</link>): String { // Gjs wrapper for regress_test_enum_param() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -45,6 +37,4 @@ function param(e:Regress.TestEnum):String { </item> </terms> - - </page> 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 5c0c5594..34de1b89 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumNoGEnum</title> - - - - - - - - + + <terms> <item> <title><code>TestEnumNoGEnum.EVALUE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 df3cfa1e..e6976c87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumUnsigned</title> - - - - - - - - + + <terms> <item> <title><code>TestEnumUnsigned.VALUE1</code></title> @@ -30,6 +22,4 @@ </item> </terms> - - </page> 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 d6a6ebb2..15f5583e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestError</title> - - - - - - - - + + <terms> <item> <title><code>TestError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 f849bfe4..d03d1793 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_error_quark</api:name> </api:function> - </info> - <title>quark</title> - -<synopsis><code mime="text/x-gjs"> -function quark():GLib.Quark { + <title>Regress.quark</title> + <synopsis><code mime="text/x-gjs"> +function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_test_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function quark():GLib.Quark { </item> </terms> - - </page> 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 d5bfeeb4..efab1a05 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestFlags</title> - - - - - - - - - - - + + </page> 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 deleted file mode 100644 index 94c80cfa..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFloating.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestFloating" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestFloating</api:type> - </api:returns> - <api:name>regress_test_floating_new</api:name> - </api:function> - - </info> - <title>Regress.TestFloating.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.TestFloating { - // Gjs wrapper for regress_test_floating_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> -<p>A new floating <link xref="Regress.TestFloating"/></p> -</item> -</terms> - - - -</page> 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 07ef3f21..d9918ccc 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFloating</title> - <synopsis><code> const Regress = imports.gi.Regress; -let test_floating = new Regress.TestFloating(); +let testFloating = new Regress.TestFloating(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -38,8 +30,11 @@ let test_floating = new Regress.TestFloating(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -48,7 +43,7 @@ let test_floating = new Regress.TestFloating(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -59,8 +54,10 @@ let test_floating = new Regress.TestFloating(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page deleted file mode 100644 index a8cb35a0..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFundamentalObject" - type="guide" - style="class" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="index" group="class" type="guide"/> - - </info> - <title>Regress.TestFundamentalObject</title> - - <synopsis><code> -const Regress = imports.gi.Regress; - -let test_fundamental_object = new Regress.TestFundamentalObject(); - </code></synopsis> - - - - - - - - <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.TestFundamentalObject</code> - </item> - </tree> - </synopsis> - - - <links type="topic" ui:expanded="true" - api:type="function" api:mime="text/x-gjs" - groups="method" style="linklist"> - <title>Methods</title> - </links> - <links type="topic" ui:expanded="true" - api:type="function" api:mime="text/x-gjs" - groups="function" style="linklist"> - <title>Functions</title> - </links> - <links type="topic" ui:expanded="true" groups="property" style="linklist"> - <title>Properties</title> - </links> - <links type="topic" ui:expanded="true" groups="signal" style="linklist"> - <title>Signals</title> - </links> - <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> - <title>Virtual functions</title> - </links> - <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> - <title>Other</title> - </links> - -</page> 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 deleted file mode 100644 index b1c37efb..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFundamentalObject.ref" - type="topic" - style="method" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestFundamentalObject" group="method" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestFundamentalObject</api:type> - </api:returns> - <api:name>regress_test_fundamental_object_ref</api:name> - </api:function> - - </info> - <title>Regress.TestFundamentalObject.prototype.ref</title> - -<synopsis><code mime="text/x-gjs"> -function ref():Regress.TestFundamentalObject { - // Gjs wrapper for regress_test_fundamental_object_ref() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> -<p>A new <link xref="Regress.TestFundamentalObject"/></p> -</item> -</terms> - - - -</page> 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 deleted file mode 100644 index 758a30d7..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFundamentalObject.unref" - type="topic" - style="method" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestFundamentalObject" group="method" type="guide"/> - <api:function> - <api:returns> - <api:type>void</api:type> - </api:returns> - <api:name>regress_test_fundamental_object_unref</api:name> - </api:function> - - </info> - <title>Regress.TestFundamentalObject.prototype.unref</title> - -<synopsis><code mime="text/x-gjs"> -function unref():void { - // Gjs wrapper for regress_test_fundamental_object_unref() -} -</code></synopsis> - - - - - - - -<terms> -</terms> - - - -</page> 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 73a33285..c853dbb1 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 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalObjectCopyFunction" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestFundamentalObjectCopyFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestFundamentalObjectCopyFunction(obj: <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link>): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> { +} + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> 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 df0e8fba..dc9edd70 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 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalObjectFinalizeFunction" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestFundamentalObjectFinalizeFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestFundamentalObjectFinalizeFunction(obj: <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link>): void { +} + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +</terms> + </page> 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 deleted file mode 100644 index c6a31f90..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFundamentalSubObject.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestFundamentalSubObject" - group="constructor" - type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestFundamentalSubObject</api:type> - </api:returns> - <api:name>regress_test_fundamental_sub_object_new</api:name> - <api:arg> - <api:type>String</api:type> - <api:name>data</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestFundamentalSubObject.new</title> - -<synopsis><code mime="text/x-gjs"> -function new(data:String):Regress.TestFundamentalSubObject { - // Gjs wrapper for regress_test_fundamental_sub_object_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>data</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page deleted file mode 100644 index 619eb308..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestFundamentalSubObject" - type="guide" - style="class" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="index" group="class" type="guide"/> - - </info> - <title>Regress.TestFundamentalSubObject</title> - - <synopsis><code> -const Regress = imports.gi.Regress; - -let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); - </code></synopsis> - - - - - - - - <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.TestFundamentalObject</code> - <item> - <code>Regress.TestFundamentalSubObject</code> - </item> - </item> - </tree> - </synopsis> - - - <links type="topic" ui:expanded="true" - api:type="function" api:mime="text/x-gjs" - groups="method" style="linklist"> - <title>Methods</title> - </links> - <links type="topic" ui:expanded="true" - api:type="function" api:mime="text/x-gjs" - groups="function" style="linklist"> - <title>Functions</title> - </links> - <links type="topic" ui:expanded="true" groups="property" style="linklist"> - <title>Properties</title> - </links> - <links type="topic" ui:expanded="true" groups="signal" style="linklist"> - <title>Signals</title> - </links> - <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> - <title>Virtual functions</title> - </links> - <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> - <title>Other</title> - </links> - -</page> 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 176211b3..86af902a 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/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_inherit_drawable_do_foo</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.prototype.do_foo</title> - -<synopsis><code mime="text/x-gjs"> -function do_foo(x:Number):void { + <synopsis><code mime="text/x-gjs"> +function do_foo(x: Number(gint)): void { // Gjs wrapper for regress_test_inherit_drawable_do_foo() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -41,6 +33,4 @@ function do_foo(x:Number):void { </item> </terms> - - </page> 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 038b73f9..7dfeba57 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/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_inherit_drawable_do_foo_maybe_throw</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.prototype.do_foo_maybe_throw</title> - -<synopsis><code mime="text/x-gjs"> -function do_foo_maybe_throw(x:Number):void { + <synopsis><code mime="text/x-gjs"> +function do_foo_maybe_throw(x: Number(gint)): void { // Gjs wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -41,6 +33,4 @@ function do_foo_maybe_throw(x:Number):void { </item> </terms> - - </page> 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 9dd2cbaa..9a11c9ea 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/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,24 @@ </api:returns> <api:name>regress_test_inherit_drawable_get_origin</api:name> </api:function> - </info> <title>Regress.TestInheritDrawable.prototype.get_origin</title> - -<synopsis><code mime="text/x-gjs"> -function get_origin():void { + <synopsis><code mime="text/x-gjs"> +function get_origin(): [x: Number(gint), y: Number(gint)] { // Gjs wrapper for regress_test_inherit_drawable_get_origin() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>x</code></title> + +</item> +<item> +<title><code>y</code></title> + +</item> </terms> - - </page> 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 669ab1ce..c4b6f950 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/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,24 @@ </api:returns> <api:name>regress_test_inherit_drawable_get_size</api:name> </api:function> - </info> <title>Regress.TestInheritDrawable.prototype.get_size</title> - -<synopsis><code mime="text/x-gjs"> -function get_size():void { + <synopsis><code mime="text/x-gjs"> +function get_size(): [width: Number(guint), height: Number(guint)] { // Gjs wrapper for regress_test_inherit_drawable_get_size() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>width</code></title> + +</item> +<item> +<title><code>height</code></title> + +</item> </terms> - - </page> 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 02fa0649..27cb1182 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInheritDrawable</title> - <synopsis><code> const Regress = imports.gi.Regress; -let test_inherit_drawable = new Regress.TestInheritDrawable(); +let testInheritDrawable = new Regress.TestInheritDrawable(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -35,8 +27,11 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -45,7 +40,7 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -56,8 +51,10 @@ let test_inherit_drawable = new Regress.TestInheritDrawable(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 00000000..f5e3f316 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass-parent_class.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestInheritPixmapObjectClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestInheritPixmapObjectClass" group="field" type="guide"/> + <title type="link" role="topic">parent_class</title> + </info> + <title>Regress.TestInheritPixmapObjectClass.parent_class</title> + <synopsis><code mime="text/x-gjs"> +TestInheritPixmapObjectClass.parent_class: <link xref="Regress.TestInheritDrawableClass">Regress.TestInheritDrawableClass</link> (Read) + </code></synopsis> + + +</page> 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 0df0396b..5c17e822 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 @@ <?xml version="1.0"?> <page id="Regress.TestInheritPixmapObjectClass" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInheritPixmapObjectClass</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testInheritPixmapObjectClass = new Regress.TestInheritPixmapObjectClass(); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 4f398908..5fb58df4 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 @@ <?xml version="1.0"?> <page id="Regress.TestInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.TestInterface</title> - <synopsis><code> const Regress = imports.gi.Regress; let test_interface = new Regress.TestInterface(); </code></synopsis> - - - - - - + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.TestInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>TestInterface requires GObject.Object</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>None</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -42,7 +37,7 @@ let test_interface = new Regress.TestInterface(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -53,8 +48,10 @@ let test_interface = new Regress.TestInterface(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 c2d87a47..0bdbbc07 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">all</title> - </info> <title>Regress.TestObj::all</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('all', function (testObj, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> </terms> - - </page> 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 3febd772..5a1830ed 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/"> <info> - - <link xref="Regress.TestObj" group="vfunc" type="guide"/> - + <link xref="Regress.TestObj" group="vfunc" type="guide"/> </info> <title>Regress.TestObj::allow_none_vfunc</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_allow_none_vfunc(two:Regress.TestObj):void { + <synopsis><code mime="text/x-gjs"> +function vfunc_allow_none_vfunc(two: <link xref="Regress.TestObj">Regress.TestObj</link>): void { } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>two</code></title> -<p>Another object</p> + <p>Another object</p> </item> </terms> - - </page> 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 f1f1b520..c6d70c41 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">bare</title> - </info> - <title>Regress.TestObj:bare</title> - -<synopsis><code mime="text/x-python"> -"bare" GObject.Object : Read / Write -</code></synopsis> + <title>Regress.TestObj.bare</title> + <synopsis><code mime="text/x-gjs"> +TestObj.bare: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 a392a771..411d2b3e 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">boxed</title> - </info> - <title>Regress.TestObj:boxed</title> - -<synopsis><code mime="text/x-python"> -"boxed" Regress.TestBoxed : Read / Write -</code></synopsis> + <title>Regress.TestObj.boxed</title> + <synopsis><code mime="text/x-gjs"> +TestObj.boxed: <link xref="Regress.TestBoxed">Regress.TestBoxed</link> (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 8e5e2bfe..9985e1dd 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">cleanup</title> - </info> <title>Regress.TestObj::cleanup</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('cleanup', function (testObj, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> </terms> - - </page> 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 5e2df6bb..0aafd807 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">double</title> - </info> - <title>Regress.TestObj:double</title> - -<synopsis><code mime="text/x-python"> -"double" Number : Read / Write -</code></synopsis> + <title>Regress.TestObj.double</title> + <synopsis><code mime="text/x-gjs"> +TestObj.double: Number(gdouble) (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 d0294e9e..82850d20 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">first</title> - </info> <title>Regress.TestObj::first</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('first', function (testObj, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> </terms> - - </page> 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 0554ba82..9a320eda 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">float</title> - </info> - <title>Regress.TestObj:float</title> - -<synopsis><code mime="text/x-python"> -"float" Number : Read / Write -</code></synopsis> + <title>Regress.TestObj.float</title> + <synopsis><code mime="text/x-gjs"> +TestObj.float: Number(gfloat) (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 6b222e4e..82f59fbf 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">gtype</title> - </info> - <title>Regress.TestObj:gtype</title> - -<synopsis><code mime="text/x-python"> -"gtype" GType : Read / Write -</code></synopsis> + <title>Regress.TestObj.gtype</title> + <synopsis><code mime="text/x-gjs"> +TestObj.gtype: GObject.Type (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 1d3c3c22..ed4abee8 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">hash-table-old</title> - </info> - <title>Regress.TestObj:hash-table-old</title> - -<synopsis><code mime="text/x-python"> -"hash-table-old" {String: gint8} : Read / Write -</code></synopsis> + <title>Regress.TestObj.hash_table_old</title> + <synopsis><code mime="text/x-gjs"> +TestObj.hash_table_old: {String: Number(gint8)} (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 f8d3441a..e4f3a371 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">hash-table</title> - </info> - <title>Regress.TestObj:hash-table</title> - -<synopsis><code mime="text/x-python"> -"hash-table" {String: gint8} : Read / Write -</code></synopsis> + <title>Regress.TestObj.hash_table</title> + <synopsis><code mime="text/x-gjs"> +TestObj.hash_table: {String: Number(gint8)} (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 0c3f4ccb..04ef8874 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">int</title> - </info> - <title>Regress.TestObj:int</title> - -<synopsis><code mime="text/x-python"> -"int" Number : Read / Write -</code></synopsis> + <title>Regress.TestObj.int</title> + <synopsis><code mime="text/x-gjs"> +TestObj.int: Number(gint) (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 9d8ea917..937dd7af 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">list-old</title> - </info> - <title>Regress.TestObj:list-old</title> - -<synopsis><code mime="text/x-python"> -"list-old" [String] : Read / Write -</code></synopsis> + <title>Regress.TestObj.list_old</title> + <synopsis><code mime="text/x-gjs"> +TestObj.list_old: Array(String) (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 02638e9e..49c1ec27 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">list</title> - </info> - <title>Regress.TestObj:list</title> - -<synopsis><code mime="text/x-python"> -"list" [String] : Read / Write -</code></synopsis> + <title>Regress.TestObj.list</title> + <synopsis><code mime="text/x-gjs"> +TestObj.list: Array(String) (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 1d832171..3c6cc7d2 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/"> <info> - - <link xref="Regress.TestObj" group="vfunc" type="guide"/> - + <link xref="Regress.TestObj" group="vfunc" type="guide"/> </info> <title>Regress.TestObj::matrix</title> - -<synopsis><code mime="text/x-gjs"> -function vfunc_matrix(somestr:String):Number { + <synopsis><code mime="text/x-gjs"> +function vfunc_matrix(somestr: String): Number(gint) { } -</code></synopsis> - - - <p>This method is virtual. Notably its name differs from the virtual + </code></synopsis> + <p>This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</p> - - - - + <terms> <item> <title><code>somestr</code></title> -<p>Meaningless string</p> + <p>Meaningless string</p> </item> <item> <title><code>Returns</code></title> @@ -36,6 +28,4 @@ case.</p> </item> </terms> - - </page> 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 c359b137..6af8b356 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-array-len-prop</title> - </info> <title>Regress.TestObj::sig-with-array-len-prop</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, arr:[Number], ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('sig-with-array-len-prop', function (testObj, arr: Array(Number(guint)), ): void); + </code></synopsis> + <p>This test signal similar to GSettings::change-event</p> - - <p>This test signal similar to GSettings::change-event</p> - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>arr</code></title> -<p>numbers, or <code>null</code></p> + <p>numbers, or <code>null</code></p> </item> </terms> - - </page> 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 b1919f9b..e3b1de6f 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-array-prop</title> - </info> <title>Regress.TestObj::sig-with-array-prop</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, arr:[Number], ):void; -</code></synopsis> - - - <p>This test signal is like TelepathyGlib's + <synopsis><code mime="text/x-gjs"> +connect('sig-with-array-prop', function (testObj, arr: Array(Number(guint)), ): void); + </code></synopsis> + <p>This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed:</p> - - - - + <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>arr</code></title> -<p>numbers</p> + <p>numbers</p> </item> </terms> - - </page> 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 31b8ca38..4746b475 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-foreign-struct</title> - </info> <title>Regress.TestObj::sig-with-foreign-struct</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, cr:cairo.Context, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('sig-with-foreign-struct', function (testObj, cr: <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link>, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>cr</code></title> -<p>A cairo context.</p> + <p>A cairo context.</p> </item> </terms> - - </page> 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 137a4130..c3c9e0d9 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-hash-prop</title> - </info> <title>Regress.TestObj::sig-with-hash-prop</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, hash:{String: GObject.Value}, ):void; -</code></synopsis> - - - <p>This test signal is like TelepathyGlib's + <synopsis><code mime="text/x-gjs"> +connect('sig-with-hash-prop', function (testObj, hash: {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>}, ): void); + </code></synopsis> + <p>This test signal is like TelepathyGlib's TpAccount::status-changed</p> - - - - + <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> @@ -35,6 +27,4 @@ function callback(test_obj, hash:{String: GObject.Value}, ):void; </item> </terms> - - </page> 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 6c528c03..4743d223 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-int64-prop</title> - </info> <title>Regress.TestObj::sig-with-int64-prop</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, ):Number; -</code></synopsis> - - - <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from + <synopsis><code mime="text/x-gjs"> +connect('sig-with-int64-prop', function (testObj, i: Number(gint64), ): Number(gint64)); + </code></synopsis> + <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage.</p> - - - - + <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <item> <title><code>Returns</code></title> @@ -39,6 +31,4 @@ the introspection client langage.</p> </item> </terms> - - </page> 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 f724bcbf..cc187f72 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-intarray-ret</title> - </info> <title>Regress.TestObj::sig-with-intarray-ret</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, ):[Number]; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('sig-with-intarray-ret', function (testObj, i: Number(gint), ): Array(Number(gint))); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> </terms> - - </page> 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 d7e15e05..89cfd330 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-obj</title> - </info> <title>Regress.TestObj::sig-with-obj</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, obj:GObject.Object, ):void; -</code></synopsis> - - - <p>Test transfer none GObject as a param (tests refcounting). + <synopsis><code mime="text/x-gjs"> +connect('sig-with-obj', function (testObj, obj: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, ): void); + </code></synopsis> + <p>Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj</p> - - - - + <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>obj</code></title> -<p>A newly created RegressTestObj</p> + <p>A newly created RegressTestObj</p> </item> </terms> - - </page> 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 a63e2076..4a116ea7 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-strv</title> - </info> <title>Regress.TestObj::sig-with-strv</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, strs:[String], ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('sig-with-strv', function (testObj, strs: Array(String), ): void); + </code></synopsis> + <p>Test GStrv as a param.</p> - - <p>Test GStrv as a param.</p> - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>strs</code></title> -<p>strings</p> + <p>strings</p> </item> </terms> - - </page> 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 6fbf7a09..459ab4e9 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-uint64-prop</title> - </info> <title>Regress.TestObj::sig-with-uint64-prop</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, ):Number; -</code></synopsis> - - - <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + <synopsis><code mime="text/x-gjs"> +connect('sig-with-uint64-prop', function (testObj, i: Number(guint64), ): Number(guint64)); + </code></synopsis> + <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage.</p> - - - - + <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <item> <title><code>Returns</code></title> @@ -39,6 +31,4 @@ the introspection client langage.</p> </item> </terms> - - </page> 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 2e91097a..aaad476f 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/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">string</title> - </info> - <title>Regress.TestObj:string</title> - -<synopsis><code mime="text/x-python"> -"string" String : Read / Write -</code></synopsis> + <title>Regress.TestObj.string</title> + <synopsis><code mime="text/x-gjs"> +TestObj.string: String (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 b19711f1..0b940b1f 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">test-with-static-scope-arg</title> - </info> <title>Regress.TestObj::test-with-static-scope-arg</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('test-with-static-scope-arg', function (testObj, object: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link>, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> <item> @@ -34,6 +26,4 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; </item> </terms> - - </page> 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 9700cefd..1133b319 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/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">test</title> - </info> <title>Regress.TestObj::test</title> - -<synopsis><code mime="text/x-python"> -function callback(test_obj, ):void; -</code></synopsis> + <synopsis><code mime="text/x-gjs"> +connect('test', function (testObj, ): void); + </code></synopsis> + - - - - - - <terms> <item> -<title><code>test_obj</code></title> +<title><code>testObj</code></title> <p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p> </item> </terms> - - </page> 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 deleted file mode 100644 index 4f2183d8..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestObj.constructor" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestObj" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestObj</api:type> - </api:returns> - <api:name>regress_constructor</api:name> - </api:function> - - </info> - <title>Regress.TestObj.constructor</title> - -<synopsis><code mime="text/x-gjs"> -function constructor():Regress.TestObj { - // Gjs wrapper for regress_constructor() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 0770d0d3..f3629e20 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_obj_do_matrix</api:name> <api:arg> @@ -18,28 +17,21 @@ <api:name>somestr</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.do_matrix</title> - -<synopsis><code mime="text/x-gjs"> -function do_matrix(somestr:String):Number { + <synopsis><code mime="text/x-gjs"> +function do_matrix(somestr: String): Number(gint) { // Gjs wrapper for regress_test_obj_do_matrix() } -</code></synopsis> - - - <p>This method is virtual. Notably its name differs from the virtual + </code></synopsis> + <p>This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</p> - - - - + <terms> <item> <title><code>somestr</code></title> -<p>Meaningless string</p> + <p>Meaningless string</p> </item> <item> <title><code>Returns</code></title> @@ -47,6 +39,4 @@ case.</p> </item> </terms> - - </page> 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 5e719483..80b60d84 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_obj_emit_sig_with_foreign_struct</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.emit_sig_with_foreign_struct</title> - -<synopsis><code mime="text/x-gjs"> -function emit_sig_with_foreign_struct():void { + <synopsis><code mime="text/x-gjs"> +function emit_sig_with_foreign_struct(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_foreign_struct() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 1c46dfbb..843c89d3 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_obj_emit_sig_with_int64</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.emit_sig_with_int64</title> - -<synopsis><code mime="text/x-gjs"> -function emit_sig_with_int64():void { + <synopsis><code mime="text/x-gjs"> +function emit_sig_with_int64(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_int64() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 ea33a826..cfd7dd20 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_obj_emit_sig_with_obj</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.emit_sig_with_obj</title> - -<synopsis><code mime="text/x-gjs"> -function emit_sig_with_obj():void { + <synopsis><code mime="text/x-gjs"> +function emit_sig_with_obj(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_obj() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 35c06780..004df97c 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_obj_emit_sig_with_uint64</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.emit_sig_with_uint64</title> - -<synopsis><code mime="text/x-gjs"> -function emit_sig_with_uint64():void { + <synopsis><code mime="text/x-gjs"> +function emit_sig_with_uint64(): void { // Gjs wrapper for regress_test_obj_emit_sig_with_uint64() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 b3ff3bf7..126b739b 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_forced_method</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.forced_method</title> - -<synopsis><code mime="text/x-gjs"> -function forced_method():void { + <synopsis><code mime="text/x-gjs"> +function forced_method(): void { // Gjs wrapper for regress_forced_method() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 9ee87686..d193fc97 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_obj_instance_method</api:name> </api:function> - </info> <title>Regress.TestObj.prototype.instance_method</title> - -<synopsis><code mime="text/x-gjs"> -function instance_method():Number { + <synopsis><code mime="text/x-gjs"> +function instance_method(): Number(gint) { // Gjs wrapper for regress_test_obj_instance_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function instance_method():Number { </item> </terms> - - </page> 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 fe260691..73d8e538 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.instance_method_callback</title> - -<synopsis><code mime="text/x-gjs"> -function instance_method_callback(callback:Regress.TestCallback):void { + <synopsis><code mime="text/x-gjs"> +function instance_method_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): void { // Gjs wrapper for regress_test_obj_instance_method_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function instance_method_callback(callback:Regress.TestCallback):void { </item> </terms> - - </page> 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 deleted file mode 100644 index 024db932..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestObj.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestObj" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestObj</api:type> - </api:returns> - <api:name>regress_test_obj_new</api:name> - <api:arg> - <api:type>Regress.TestObj</api:type> - <api:name>obj</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestObj.new</title> - -<synopsis><code mime="text/x-gjs"> -function new(obj:Regress.TestObj):Regress.TestObj { - // Gjs wrapper for regress_test_obj_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 deleted file mode 100644 index 4eaa0365..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestObj.new_callback" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestObj" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestObj</api:type> - </api:returns> - <api:name>regress_test_obj_new_callback</api:name> - <api:arg> - <api:type>Regress.TestCallbackUserData</api:type> - <api:name>callback</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestObj.new_callback</title> - -<synopsis><code mime="text/x-gjs"> -function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { - // Gjs wrapper for regress_test_obj_new_callback() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>callback</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 deleted file mode 100644 index c54fa622..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestObj.new_from_file" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestObj" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestObj</api:type> - </api:returns> - <api:name>regress_test_obj_new_from_file</api:name> - <api:arg> - <api:type>String</api:type> - <api:name>x</api:name> - </api:arg> - </api:function> - - </info> - <title>Regress.TestObj.new_from_file</title> - -<synopsis><code mime="text/x-gjs"> -function new_from_file(x:String):Regress.TestObj { - // Gjs wrapper for regress_test_obj_new_from_file() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>x</code></title> - -</item> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 dfc9ef04..b9d08cf2 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/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_obj_null_out</api:name> </api:function> - </info> - <title>null_out</title> - -<synopsis><code mime="text/x-gjs"> -function null_out():void { + <title>Regress.TestObj.null_out</title> + <synopsis><code mime="text/x-gjs"> +function null_out(): <link xref="Regress.TestObj">Regress.TestObj</link> { // Gjs wrapper for regress_test_obj_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>obj</code></title> + <p>A <link xref="Regress.TestObj"/></p> +</item> </terms> - - </page> 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 b8428942..4b43596d 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestObj</title> - <synopsis><code> const Regress = imports.gi.Regress; -let test_obj = new Regress.TestObj({ - <link xref='Regress.TestObj-bare'>bare</link>: value, - <link xref='Regress.TestObj-boxed'>boxed</link>: value, - <link xref='Regress.TestObj-double'>double</link>: value, - <link xref='Regress.TestObj-float'>float</link>: value, - <link xref='Regress.TestObj-gtype'>gtype</link>: value, - <link xref='Regress.TestObj-hash-table'>hash_table</link>: value, - <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>: value, - <link xref='Regress.TestObj-int'>int</link>: value, - <link xref='Regress.TestObj-list'>list</link>: value, - <link xref='Regress.TestObj-list-old'>list_old</link>: value, - <link xref='Regress.TestObj-string'>string</link>: value, +let testObj = new Regress.TestObj({ }); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -47,8 +28,11 @@ let test_obj = new Regress.TestObj({ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -57,7 +41,7 @@ let test_obj = new Regress.TestObj({ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -68,8 +52,10 @@ let test_obj = new Regress.TestObj({ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 dca89e84..9ca9aca5 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>bare</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.set_bare</title> - -<synopsis><code mime="text/x-gjs"> -function set_bare(bare:GObject.Object):void { + <synopsis><code mime="text/x-gjs"> +function set_bare(bare: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>): void { // Gjs wrapper for regress_test_obj_set_bare() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>bare</code></title> @@ -41,6 +33,4 @@ function set_bare(bare:GObject.Object):void { </item> </terms> - - </page> 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 aee3f2c6..cd80f3ad 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,69 +13,72 @@ </api:returns> <api:name>regress_test_obj_skip_inout_param</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>c</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inout_d</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num1</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.skip_inout_param</title> - -<synopsis><code mime="text/x-gjs"> -function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>Check that the out value is skipped</p> - - <p>Check that the out value is skipped</p> - - - - <terms> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> +</item> +<item> +<title><code>ok</code></title> + +</item> +<item> +<title><code>out_b</code></title> + <p>Return value.</p> +</item> +<item> +<title><code>inout_d (out)</code></title> + <p>Will be incremented.</p> </item> <item> -<title><code>Returns</code></title> -<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p> +<title><code>out_sum</code></title> + <p>Return value.</p> </item> </terms> - - </page> 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 75b7bb2c..de9f0314 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,69 +13,72 @@ </api:returns> <api:name>regress_test_obj_skip_out_param</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>c</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inout_d</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num1</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.skip_out_param</title> - -<synopsis><code mime="text/x-gjs"> -function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>Check that the out value is skipped</p> - - <p>Check that the out value is skipped</p> - - - - <terms> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> +</item> +<item> +<title><code>ok</code></title> + +</item> +<item> +<title><code>out_b</code></title> + <p>Return value.</p> +</item> +<item> +<title><code>inout_d (out)</code></title> + <p>Will be incremented.</p> </item> <item> -<title><code>Returns</code></title> -<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p> +<title><code>out_sum</code></title> + <p>Return value.</p> </item> </terms> - - </page> 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 cd2081f8..7f764bcd 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,69 +13,72 @@ </api:returns> <api:name>regress_test_obj_skip_param</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>c</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inout_d</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num1</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.skip_param</title> - -<synopsis><code mime="text/x-gjs"> -function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>Check that a parameter is skipped</p> - - <p>Check that a parameter is skipped</p> - - - - <terms> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> +</item> +<item> +<title><code>ok</code></title> + +</item> +<item> +<title><code>out_b</code></title> + <p>Return value.</p> +</item> +<item> +<title><code>inout_d (out)</code></title> + <p>Will be incremented.</p> </item> <item> -<title><code>Returns</code></title> -<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p> +<title><code>out_sum</code></title> + <p>Return value.</p> </item> </terms> - - </page> 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 22ec5729..575dc939 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,69 +13,72 @@ </api:returns> <api:name>regress_test_obj_skip_return_val</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>c</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>inout_d</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num1</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.skip_return_val</title> - -<synopsis><code mime="text/x-gjs"> -function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>Check that the return value is skipped</p> - - <p>Check that the return value is skipped</p> - - - - <terms> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> +</item> +<item> +<title><code>ok</code></title> + +</item> +<item> +<title><code>out_b</code></title> + <p>A return value.</p> +</item> +<item> +<title><code>inout_d (out)</code></title> + <p>Will be incremented.</p> </item> <item> -<title><code>Returns</code></title> -<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p> +<title><code>out_sum</code></title> + <p>Return value.</p> </item> </terms> - - </page> 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 74701f7d..9e90bcc7 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,38 +13,29 @@ </api:returns> <api:name>regress_test_obj_skip_return_val_no_out</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.skip_return_val_no_out</title> - -<synopsis><code mime="text/x-gjs"> -function skip_return_val_no_out(a:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +function skip_return_val_no_out(a: Number(gint)): Boolean { // Gjs wrapper for regress_test_obj_skip_return_val_no_out() } -</code></synopsis> - - - <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise + </code></synopsis> + <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.</p> - - - - + <terms> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> -<title><code>Returns</code></title> -<p><code>true</code> if the call succeeds, <code>false</code> if @error is set.</p> +<title><code>ok</code></title> + </item> </terms> - - </page> 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 d1f2e59b..a2256cec 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/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> </api:returns> <api:name>regress_test_obj_static_method</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> - <title>static_method</title> - -<synopsis><code mime="text/x-gjs"> -function static_method(x:Number):Number { + <title>Regress.TestObj.static_method</title> + <synopsis><code mime="text/x-gjs"> +function static_method(x: Number(gint)): Number(gdouble) { // Gjs wrapper for regress_test_obj_static_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -45,6 +37,4 @@ function static_method(x:Number):Number { </item> </terms> - - </page> 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 13e917eb..57371f27 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/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>static_method_callback</title> - -<synopsis><code mime="text/x-gjs"> -function static_method_callback(callback:Regress.TestCallback):void { + <title>Regress.TestObj.static_method_callback</title> + <synopsis><code mime="text/x-gjs"> +function static_method_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): void { // Gjs wrapper for regress_test_obj_static_method_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function static_method_callback(callback:Regress.TestCallback):void { </item> </terms> - - </page> 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 78bf63ba..050a3260 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_obj_torture_signature_0</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> <api:arg> @@ -22,26 +21,19 @@ <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>m</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.torture_signature_0</title> - -<synopsis><code mime="text/x-gjs"> -function torture_signature_0(x:Number, foo:String, m:Number):void { + <synopsis><code mime="text/x-gjs"> +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></synopsis> - - - - - - - + </code></synopsis> + + <terms> <item> <title><code>x</code></title> @@ -55,8 +47,18 @@ function torture_signature_0(x:Number, foo:String, m:Number):void { <title><code>m</code></title> </item> +<item> +<title><code>y</code></title> + +</item> +<item> +<title><code>z</code></title> + +</item> +<item> +<title><code>q</code></title> + +</item> </terms> - - </page> 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 553ddd20..378efdce 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/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_obj_torture_signature_1</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> <api:arg> @@ -22,26 +21,19 @@ <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>m</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.prototype.torture_signature_1</title> - -<synopsis><code mime="text/x-gjs"> -function torture_signature_1(x:Number, foo:String, m:Number):Boolean { + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>This function throws an error if m is odd.</p> - - <p>This function throws an error if m is odd.</p> - - - - <terms> <item> <title><code>x</code></title> @@ -56,11 +48,21 @@ function torture_signature_1(x:Number, foo:String, m:Number):Boolean { </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> + +</item> +<item> +<title><code>y</code></title> + +</item> +<item> +<title><code>z</code></title> + +</item> +<item> +<title><code>q</code></title> </item> </terms> - - </page> 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 858e58a8..f968c9ce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestOtherError</title> - - - - - - - - + + <terms> <item> <title><code>TestOtherError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> 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 d75b6aa4..6e95aa2a 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_unconventional_error_quark</api:name> </api:function> - </info> - <title>quark</title> - -<synopsis><code mime="text/x-gjs"> -function quark():GLib.Quark { + <title>Regress.quark</title> + <synopsis><code mime="text/x-gjs"> +function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_test_unconventional_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function quark():GLib.Quark { </item> </terms> - - </page> 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 66b477d2..0cf17c13 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestPrivateEnum</title> - - - - - - - - - - - + + </page> 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 00000000..812c2f97 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_after.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestPrivateStruct-this_is_public_after" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestPrivateStruct" group="field" type="guide"/> + <title type="link" role="topic">this_is_public_after</title> + </info> + <title>Regress.TestPrivateStruct.this_is_public_after</title> + <synopsis><code mime="text/x-gjs"> +TestPrivateStruct.this_is_public_after: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..465be84a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct-this_is_public_before.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestPrivateStruct-this_is_public_before" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestPrivateStruct" group="field" type="guide"/> + <title type="link" role="topic">this_is_public_before</title> + </info> + <title>Regress.TestPrivateStruct.this_is_public_before</title> + <synopsis><code mime="text/x-gjs"> +TestPrivateStruct.this_is_public_before: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 7b1309da..7ce2a7c9 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 @@ <?xml version="1.0"?> <page id="Regress.TestPrivateStruct" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestPrivateStruct</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testPrivateStruct = new Regress.TestPrivateStruct({ + <link xref='Regress.TestPrivateStruct-this_is_public_before'>this_is_public_before</link>: value + <link xref='Regress.TestPrivateStruct-this_is_public_after'>this_is_public_after</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 2c8b1abb..afda5f30 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestReferenceEnum</title> - - - - - - - - + + <terms> <item> <title><code>TestReferenceEnum.0</code></title> @@ -46,6 +38,4 @@ </item> </terms> - - </page> 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 00000000..bbbc3a29 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_double.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + <title type="link" role="topic">some_double</title> + </info> + <title>Regress.TestSimpleBoxedA.some_double</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedA.some_double: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..770423fd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_enum.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_enum" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + <title type="link" role="topic">some_enum</title> + </info> + <title>Regress.TestSimpleBoxedA.some_enum</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedA.some_enum: <link xref="Regress.TestEnum">Regress.TestEnum</link> (Read / Write) + </code></synopsis> + + +</page> 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 00000000..03d94f63 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + <title type="link" role="topic">some_int</title> + </info> + <title>Regress.TestSimpleBoxedA.some_int</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedA.some_int: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..ec643f60 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestSimpleBoxedA.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedA.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 7f5dfde3..d096c274 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/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_simple_boxed_a_const_return</api:name> </api:function> - </info> - <title>const_return</title> - -<synopsis><code mime="text/x-gjs"> -function const_return():Regress.TestSimpleBoxedA { + <title>Regress.TestSimpleBoxedA.const_return</title> + <synopsis><code mime="text/x-gjs"> +function const_return(): <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> { // Gjs wrapper for regress_test_simple_boxed_a_const_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function const_return():Regress.TestSimpleBoxedA { </item> </terms> - - </page> 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 6aa09744..c5d349b8 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/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_simple_boxed_a_copy</api:name> </api:function> - </info> <title>Regress.TestSimpleBoxedA.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.TestSimpleBoxedA { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> { // Gjs wrapper for regress_test_simple_boxed_a_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedA { </item> </terms> - - </page> 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 52e58775..aa033e58 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/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>other_a</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSimpleBoxedA.prototype.equals</title> - -<synopsis><code mime="text/x-gjs"> -function equals(other_a:Regress.TestSimpleBoxedA):Boolean { + <synopsis><code mime="text/x-gjs"> +function equals(other_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link>): Boolean { // Gjs wrapper for regress_test_simple_boxed_a_equals() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>other_a</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 9117ddb9..1ba157a2 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 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedA" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSimpleBoxedA</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testSimpleBoxedA = new Regress.TestSimpleBoxedA({ + <link xref='Regress.TestSimpleBoxedA-some_int'>some_int</link>: value + <link xref='Regress.TestSimpleBoxedA-some_int8'>some_int8</link>: value + <link xref='Regress.TestSimpleBoxedA-some_double'>some_double</link>: value + <link xref='Regress.TestSimpleBoxedA-some_enum'>some_enum</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..932f9589 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-nested_a.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedB-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/> + <title type="link" role="topic">nested_a</title> + </info> + <title>Regress.TestSimpleBoxedB.nested_a</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedB.nested_a: <link xref="Regress.TestSimpleBoxedA">Regress.TestSimpleBoxedA</link> (Read / Write) + </code></synopsis> + + +</page> 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 00000000..9238e120 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestSimpleBoxedB.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestSimpleBoxedB.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 b1bd51aa..7c6abacf 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/"> <info> - <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_simple_boxed_b_copy</api:name> </api:function> - </info> <title>Regress.TestSimpleBoxedB.prototype.copy</title> - -<synopsis><code mime="text/x-gjs"> -function copy():Regress.TestSimpleBoxedB { + <synopsis><code mime="text/x-gjs"> +function copy(): <link xref="Regress.TestSimpleBoxedB">Regress.TestSimpleBoxedB</link> { // Gjs wrapper for regress_test_simple_boxed_b_copy() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function copy():Regress.TestSimpleBoxedB { </item> </terms> - - </page> 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 7ecc623e..34d830a1 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 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedB" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSimpleBoxedB</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testSimpleBoxedB = new Regress.TestSimpleBoxedB({ + <link xref='Regress.TestSimpleBoxedB-some_int8'>some_int8</link>: value + <link xref='Regress.TestSimpleBoxedB-nested_a'>nested_a</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 f8157820..6e31d3d9 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 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestSimpleCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-gjs"> +function onTestSimpleCallback(): void { +} + </code></synopsis> + + + </page> 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 00000000..d305919e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_double.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + <title type="link" role="topic">some_double</title> + </info> + <title>Regress.TestStructA.some_double</title> + <synopsis><code mime="text/x-gjs"> +TestStructA.some_double: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..80dd3315 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_enum.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_enum" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + <title type="link" role="topic">some_enum</title> + </info> + <title>Regress.TestStructA.some_enum</title> + <synopsis><code mime="text/x-gjs"> +TestStructA.some_enum: <link xref="Regress.TestEnum">Regress.TestEnum</link> (Read / Write) + </code></synopsis> + + +</page> 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 00000000..ab7790d5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + <title type="link" role="topic">some_int</title> + </info> + <title>Regress.TestStructA.some_int</title> + <synopsis><code mime="text/x-gjs"> +TestStructA.some_int: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..0e1611e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestStructA.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestStructA.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 ded4a799..3d185ece 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/"> <info> - <link xref="Regress.TestStructA" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_struct_a_clone</api:name> </api:function> - </info> <title>Regress.TestStructA.prototype.clone</title> - -<synopsis><code mime="text/x-gjs"> -function clone():void { + <synopsis><code mime="text/x-gjs"> +function clone(): <link xref="Regress.TestStructA">Regress.TestStructA</link> { // Gjs wrapper for regress_test_struct_a_clone() } -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructA</p> - - <p>Make a copy of a RegressTestStructA</p> - - - - <terms> +<item> +<title><code>a_out</code></title> + <p>the cloned structure</p> +</item> </terms> - - </page> 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 a6a98173..3f274913 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructA" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructA</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructA = new Regress.TestStructA({ + <link xref='Regress.TestStructA-some_int'>some_int</link>: value + <link xref='Regress.TestStructA-some_int8'>some_int8</link>: value + <link xref='Regress.TestStructA-some_double'>some_double</link>: value + <link xref='Regress.TestStructA-some_enum'>some_enum</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 38406e68..2009ef33 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/"> <info> - <link xref="Regress.TestStructA" group="function" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,24 @@ <api:name>string</api:name> </api:arg> </api:function> - </info> - <title>parse</title> - -<synopsis><code mime="text/x-gjs"> -function parse(string:String):void { + <title>Regress.TestStructA.parse</title> + <synopsis><code mime="text/x-gjs"> +function parse(string: String): <link xref="Regress.TestStructA">Regress.TestStructA</link> { // Gjs wrapper for regress_test_struct_a_parse() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>string</code></title> -<p>ignored</p> + <p>ignored</p> +</item> +<item> +<title><code>a_out</code></title> + <p>the structure that is to be filled</p> </item> </terms> - - </page> 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 00000000..4f414af1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-nested_a.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructB-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructB" group="field" type="guide"/> + <title type="link" role="topic">nested_a</title> + </info> + <title>Regress.TestStructB.nested_a</title> + <synopsis><code mime="text/x-gjs"> +TestStructB.nested_a: <link xref="Regress.TestStructA">Regress.TestStructA</link> (Read / Write) + </code></synopsis> + + +</page> 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 00000000..ba646c6d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB-some_int8.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructB" group="field" type="guide"/> + <title type="link" role="topic">some_int8</title> + </info> + <title>Regress.TestStructB.some_int8</title> + <synopsis><code mime="text/x-gjs"> +TestStructB.some_int8: Number(gint8) (Read / Write) + </code></synopsis> + + +</page> 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 20278cd2..c0d2e515 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/"> <info> - <link xref="Regress.TestStructB" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_struct_b_clone</api:name> </api:function> - </info> <title>Regress.TestStructB.prototype.clone</title> - -<synopsis><code mime="text/x-gjs"> -function clone():void { + <synopsis><code mime="text/x-gjs"> +function clone(): <link xref="Regress.TestStructB">Regress.TestStructB</link> { // Gjs wrapper for regress_test_struct_b_clone() } -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructB</p> - - <p>Make a copy of a RegressTestStructB</p> - - - - <terms> +<item> +<title><code>b_out</code></title> + <p>the cloned structure</p> +</item> </terms> - - </page> 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 21d86261..0fa28dba 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructB" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructB</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructB = new Regress.TestStructB({ + <link xref='Regress.TestStructB-some_int8'>some_int8</link>: value + <link xref='Regress.TestStructB-nested_a'>nested_a</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..b8f022f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-another_int.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructC-another_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructC" group="field" type="guide"/> + <title type="link" role="topic">another_int</title> + </info> + <title>Regress.TestStructC.another_int</title> + <synopsis><code mime="text/x-gjs"> +TestStructC.another_int: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..162697cd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructC-obj" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructC" group="field" type="guide"/> + <title type="link" role="topic">obj</title> + </info> + <title>Regress.TestStructC.obj</title> + <synopsis><code mime="text/x-gjs"> +TestStructC.obj: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> (Read) + </code></synopsis> + + +</page> 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 6bd58122..82e0ae43 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructC" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructC</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructC = new Regress.TestStructC({ + <link xref='Regress.TestStructC-another_int'>another_int</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..d957af33 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array1.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-array1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + <title type="link" role="topic">array1</title> + </info> + <title>Regress.TestStructD.array1</title> + <synopsis><code mime="text/x-gjs"> +TestStructD.array1: Array(<link xref="Regress.TestStructA">Regress.TestStructA</link>) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..13d7e875 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-array2.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-array2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + <title type="link" role="topic">array2</title> + </info> + <title>Regress.TestStructD.array2</title> + <synopsis><code mime="text/x-gjs"> +TestStructD.array2: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..4797612b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-field.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-field" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + <title type="link" role="topic">field</title> + </info> + <title>Regress.TestStructD.field</title> + <synopsis><code mime="text/x-gjs"> +TestStructD.field: <link xref="Regress.TestObj">Regress.TestObj</link> (Read) + </code></synopsis> + + +</page> 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 00000000..1eca3f39 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-garray.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-garray" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + <title type="link" role="topic">garray</title> + </info> + <title>Regress.TestStructD.garray</title> + <synopsis><code mime="text/x-gjs"> +TestStructD.garray: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..655b312d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD-list.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-list" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + <title type="link" role="topic">list</title> + </info> + <title>Regress.TestStructD.list</title> + <synopsis><code mime="text/x-gjs"> +TestStructD.list: Array(<link xref="Regress.TestObj">Regress.TestObj</link>) (Read / Write) + </code></synopsis> + + +</page> 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 aa9f131c..b8222c8b 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructD" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructD</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructD = new Regress.TestStructD({ + <link xref='Regress.TestStructD-array1'>array1</link>: value + <link xref='Regress.TestStructD-array2'>array2</link>: value + <link xref='Regress.TestStructD-list'>list</link>: value + <link xref='Regress.TestStructD-garray'>garray</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..74909cf1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_type.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE-some_type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE" group="field" type="guide"/> + <title type="link" role="topic">some_type</title> + </info> + <title>Regress.TestStructE.some_type</title> + <synopsis><code mime="text/x-gjs"> +TestStructE.some_type: GObject.Type (Read / Write) + </code></synopsis> + + +</page> 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 00000000..cafd6785 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE-some_union.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE-some_union" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE" group="field" type="guide"/> + <title type="link" role="topic">some_union</title> + </info> + <title>Regress.TestStructE.some_union</title> + <synopsis><code mime="text/x-gjs"> +TestStructE.some_union: Array(<link xref="Regress.TestStructE__some_union__union">Regress.TestStructE__some_union__union</link>) (Read / Write) + </code></synopsis> + + +</page> 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 b931c367..788803f9 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructE" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructE</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructE = new Regress.TestStructE({ + <link xref='Regress.TestStructE-some_type'>some_type</link>: value + <link xref='Regress.TestStructE-some_union'>some_union</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_double.page new file mode 100644 index 00000000..2861829b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_double.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_double</title> + </info> + <title>Regress.TestStructE__some_union__union.v_double</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_double: Number(gdouble) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_float.page new file mode 100644 index 00000000..fb1222e4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_float.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_float" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_float</title> + </info> + <title>Regress.TestStructE__some_union__union.v_float</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_float: Number(gfloat) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int.page new file mode 100644 index 00000000..91b82a8f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_int</title> + </info> + <title>Regress.TestStructE__some_union__union.v_int</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_int: Number(gint) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int64.page new file mode 100644 index 00000000..eadfcaff --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_int64.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_int64" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_int64</title> + </info> + <title>Regress.TestStructE__some_union__union.v_int64</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_int64: Number(gint64) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_long.page new file mode 100644 index 00000000..6594a30e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_long.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_long" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_long</title> + </info> + <title>Regress.TestStructE__some_union__union.v_long</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_long: Number(glong) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_pointer.page new file mode 100644 index 00000000..479865f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_pointer.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_pointer" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_pointer</title> + </info> + <title>Regress.TestStructE__some_union__union.v_pointer</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_pointer: void (Read) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint.page new file mode 100644 index 00000000..ea437b38 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_uint" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_uint</title> + </info> + <title>Regress.TestStructE__some_union__union.v_uint</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_uint: Number(guint) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint64.page new file mode 100644 index 00000000..9de3409b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_uint64.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_uint64" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_uint64</title> + </info> + <title>Regress.TestStructE__some_union__union.v_uint64</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_uint64: Number(guint64) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_ulong.page new file mode 100644 index 00000000..7b6aa205 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union-v_ulong.page @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_ulong" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + <title type="link" role="topic">v_ulong</title> + </info> + <title>Regress.TestStructE__some_union__union.v_ulong</title> + <synopsis><code mime="text/x-gjs"> +TestStructE__some_union__union.v_ulong: Number(gulong) (Read / Write) + </code></synopsis> + + +</page> 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 3b81e621..38ee2695 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,49 @@ <?xml version="1.0"?> <page id="Regress.TestStructE__some_union__union" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructE__some_union__union</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructE__some_union__union = new Regress.TestStructE__some_union__union({ + <link xref='Regress.TestStructE__some_union__union-v_int'>v_int</link>: value + <link xref='Regress.TestStructE__some_union__union-v_uint'>v_uint</link>: value + <link xref='Regress.TestStructE__some_union__union-v_long'>v_long</link>: value + <link xref='Regress.TestStructE__some_union__union-v_ulong'>v_ulong</link>: value + <link xref='Regress.TestStructE__some_union__union-v_int64'>v_int64</link>: value + <link xref='Regress.TestStructE__some_union__union-v_uint64'>v_uint64</link>: value + <link xref='Regress.TestStructE__some_union__union-v_float'>v_float</link>: value + <link xref='Regress.TestStructE__some_union__union-v_double'>v_double</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..8b5d7250 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data1.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data1</title> + </info> + <title>Regress.TestStructF.data1</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data1: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..0c49cda3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data2.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data2</title> + </info> + <title>Regress.TestStructF.data2</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data2: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..7c145305 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data3.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data3" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data3</title> + </info> + <title>Regress.TestStructF.data3</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data3: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..87831460 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data4.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data4" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data4</title> + </info> + <title>Regress.TestStructF.data4</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data4: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..84f58785 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data5.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data5" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data5</title> + </info> + <title>Regress.TestStructF.data5</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data5: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..6662c2e6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-data6.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data6" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">data6</title> + </info> + <title>Regress.TestStructF.data6</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.data6: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..85be6dda --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF-ref_count.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-ref_count" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + <title type="link" role="topic">ref_count</title> + </info> + <title>Regress.TestStructF.ref_count</title> + <synopsis><code mime="text/x-gjs"> +TestStructF.ref_count: Number(gint) (Read / Write) + </code></synopsis> + + +</page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page index cfb434b4..feae9a2c 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructF" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructF</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructF = new Regress.TestStructF({ + <link xref='Regress.TestStructF-ref_count'>ref_count</link>: value + <link xref='Regress.TestStructF-data1'>data1</link>: value + <link xref='Regress.TestStructF-data2'>data2</link>: value + <link xref='Regress.TestStructF-data3'>data3</link>: value + <link xref='Regress.TestStructF-data4'>data4</link>: value + <link xref='Regress.TestStructF-data5'>data5</link>: value + <link xref='Regress.TestStructF-data6'>data6</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 00000000..b065f89e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-array.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructFixedArray-array" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructFixedArray" group="field" type="guide"/> + <title type="link" role="topic">array</title> + </info> + <title>Regress.TestStructFixedArray.array</title> + <synopsis><code mime="text/x-gjs"> +TestStructFixedArray.array: Array(Number(gint)) (Read / Write) + </code></synopsis> + + +</page> 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 00000000..75e1e601 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray-just_int.page @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructFixedArray-just_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructFixedArray" group="field" type="guide"/> + <title type="link" role="topic">just_int</title> + </info> + <title>Regress.TestStructFixedArray.just_int</title> + <synopsis><code mime="text/x-gjs"> +TestStructFixedArray.just_int: Number(gint) (Read / Write) + </code></synopsis> + + +</page> 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 f0edd05a..4896e330 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/"> <info> - <link xref="Regress.TestStructFixedArray" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_struct_fixed_array_frob</api:name> </api:function> - </info> <title>Regress.TestStructFixedArray.prototype.frob</title> - -<synopsis><code mime="text/x-gjs"> -function frob():void { + <synopsis><code mime="text/x-gjs"> +function frob(): void { // Gjs wrapper for regress_test_struct_fixed_array_frob() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 db6e7893..12b81be1 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 @@ <?xml version="1.0"?> <page id="Regress.TestStructFixedArray" type="guide" - style="record" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructFixedArray</title> - - - - - - - - - - - + <synopsis><code> +const Regress = imports.gi.Regress; + +let testStructFixedArray = new Regress.TestStructFixedArray({ + <link xref='Regress.TestStructFixedArray-just_int'>just_int</link>: value + <link xref='Regress.TestStructFixedArray-array'>array</link>: value +}); + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> 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 26fc7905..f2ff5276 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/"> <info> - <link xref="Regress.TestSubObj" group="method" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_sub_obj_instance_method</api:name> </api:function> - </info> <title>Regress.TestSubObj.prototype.instance_method</title> - -<synopsis><code mime="text/x-gjs"> -function instance_method():Number { + <synopsis><code mime="text/x-gjs"> +function instance_method(): Number(gint) { // Gjs wrapper for regress_test_sub_obj_instance_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function instance_method():Number { </item> </terms> - - </page> 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 deleted file mode 100644 index 31deab7f..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestSubObj.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestSubObj" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestObj</api:type> - </api:returns> - <api:name>regress_test_sub_obj_new</api:name> - </api:function> - - </info> - <title>Regress.TestSubObj.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.TestObj { - // Gjs wrapper for regress_test_sub_obj_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 7147da12..d9f0885e 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSubObj</title> - <synopsis><code> const Regress = imports.gi.Regress; -let test_sub_obj = new Regress.TestSubObj(); +let testSubObj = new Regress.TestSubObj(); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -38,8 +30,11 @@ let test_sub_obj = new Regress.TestSubObj(); </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -48,7 +43,7 @@ let test_sub_obj = new Regress.TestSubObj(); <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -59,8 +54,10 @@ let test_sub_obj = new Regress.TestSubObj(); <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 a632f8f4..c2f4aa74 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/"> <info> - <link xref="Regress.TestSubObj" group="method" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_sub_obj_unset_bare</api:name> </api:function> - </info> <title>Regress.TestSubObj.prototype.unset_bare</title> - -<synopsis><code mime="text/x-gjs"> -function unset_bare():void { + <synopsis><code mime="text/x-gjs"> +function unset_bare(): void { // Gjs wrapper for regress_test_sub_obj_unset_bare() } -</code></synopsis> + </code></synopsis> + - - - - - - -<terms> -</terms> - - </page> 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 e0a7bc09..fcb2f3b4 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/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestTypeGUInt64</title> - - - - - - - - - - - + + </page> 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 256dbb6d..90d74f66 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/"> <info> - <link xref="Regress.TestWi8021x" group="property" type="guide"/> <title type="link" role="topic">testbool</title> - </info> - <title>Regress.TestWi8021x:testbool</title> - -<synopsis><code mime="text/x-python"> -"testbool" Boolean : Read / Write -</code></synopsis> + <title>Regress.TestWi8021x.testbool</title> + <synopsis><code mime="text/x-gjs"> +TestWi8021x.testbool: Boolean (Read / Write) + </code></synopsis> + - - - - - - - - - </page> 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 e42b0d74..8f8db65f 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/"> <info> - <link xref="Regress.TestWi8021x" group="method" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_wi_802_1x_get_testbool</api:name> </api:function> - </info> <title>Regress.TestWi8021x.prototype.get_testbool</title> - -<synopsis><code mime="text/x-gjs"> -function get_testbool():Boolean { + <synopsis><code mime="text/x-gjs"> +function get_testbool(): Boolean { // Gjs wrapper for regress_test_wi_802_1x_get_testbool() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 deleted file mode 100644 index b8b162cf..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<page id="Regress.TestWi8021x.new" - type="topic" - style="constructor" - xmlns="http://projectmallard.org/1.0/" - xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - <link xref="Regress.TestWi8021x" group="constructor" type="guide"/> - <api:function> - <api:returns> - <api:type>Regress.TestWi8021x</api:type> - </api:returns> - <api:name>regress_test_wi_802_1x_new</api:name> - </api:function> - - </info> - <title>Regress.TestWi8021x.new</title> - -<synopsis><code mime="text/x-gjs"> -function new():Regress.TestWi8021x { - // Gjs wrapper for regress_test_wi_802_1x_new() -} -</code></synopsis> - - - - - - - -<terms> -<item> -<title><code>Returns</code></title> - -</item> -</terms> - - - -</page> 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 d69548f3..eb702450 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/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestWi8021x</title> - <synopsis><code> const Regress = imports.gi.Regress; -let test_wi8021x = new Regress.TestWi8021x({ - <link xref='Regress.TestWi8021x-testbool'>testbool</link>: value, +let testWi8021x = new Regress.TestWi8021x({ }); </code></synopsis> - - - - - - + <synopsis> <title>Hierarchy</title> <tree> @@ -37,8 +28,11 @@ let test_wi8021x = new Regress.TestWi8021x({ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-gjs" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="method" style="linklist"> @@ -47,7 +41,7 @@ let test_wi8021x = new Regress.TestWi8021x({ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-gjs" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -58,8 +52,10 @@ let test_wi8021x = new Regress.TestWi8021x({ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> 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 e052ed5d..0c42f37e 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/"> <info> - <link xref="Regress.TestWi8021x" group="method" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>Regress.TestWi8021x.prototype.set_testbool</title> - -<synopsis><code mime="text/x-gjs"> -function set_testbool(v:Boolean):void { + <synopsis><code mime="text/x-gjs"> +function set_testbool(v: Boolean): void { // Gjs wrapper for regress_test_wi_802_1x_set_testbool() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> @@ -41,6 +33,4 @@ function set_testbool(v:Boolean):void { </item> </terms> - - </page> 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 ccfe04c6..17718333 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/"> <info> - <link xref="Regress.TestWi8021x" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_wi_802_1x_static_method</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> </api:function> - </info> - <title>static_method</title> - -<synopsis><code mime="text/x-gjs"> -function static_method(x:Number):Number { + <title>Regress.TestWi8021x.static_method</title> + <synopsis><code mime="text/x-gjs"> +function static_method(x: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_wi_802_1x_static_method() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -45,6 +37,4 @@ function static_method(x:Number):Number { </item> </terms> - - </page> 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 00000000..343ad002 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.UTF8_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.UTF8_CONSTANT</title> + + +</page> 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 de2b93b3..8ddad6d2 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_aliased_caller_alloc</api:name> </api:function> - </info> - <title>aliased_caller_alloc</title> - -<synopsis><code mime="text/x-gjs"> -function aliased_caller_alloc():void { + <title>Regress.aliased_caller_alloc</title> + <synopsis><code mime="text/x-gjs"> +function aliased_caller_alloc(): <link xref="Regress.AliasedTestBoxed">Regress.AliasedTestBoxed</link> { // Gjs wrapper for regress_aliased_caller_alloc() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>boxed</code></title> + +</item> </terms> - - </page> 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 8f00a104..dc481fa8 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_annotation_attribute_func</api:name> <api:arg> @@ -22,37 +21,28 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> - <title>annotation_attribute_func</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_attribute_func(object:Regress.AnnotationObject, data:String):Number { + <title>Regress.annotation_attribute_func</title> + <synopsis><code mime="text/x-gjs"> +function annotation_attribute_func(object: <link xref="Regress.AnnotationObject">Regress.AnnotationObject</link>, data: String): Number(gint) { // Gjs wrapper for regress_annotation_attribute_func() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>A <link xref="Regress.AnnotationObject"/>.</p> + <p>A <link xref="Regress.AnnotationObject"/>.</p> </item> <item> <title><code>data</code></title> -<p>Some data.</p> + <p>Some data.</p> </item> <item> <title><code>Returns</code></title> -<p>The return value.</p> + </item> </terms> - - </page> 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 c3e96530..cf5bc938 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,30 +17,21 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>annotation_custom_destroy</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_custom_destroy(callback:Regress.AnnotationCallback):void { + <title>Regress.annotation_custom_destroy</title> + <synopsis><code mime="text/x-gjs"> +function annotation_custom_destroy(callback: <link xref="Regress.AnnotationCallback">Regress.AnnotationCallback</link>): void { // Gjs wrapper for regress_annotation_custom_destroy() } -</code></synopsis> - - - <p>Test messing up the heuristic of closure/destroy-notification + </code></synopsis> + <p>Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations.</p> - - - - + <terms> <item> <title><code>callback</code></title> -<p>Destroy notification</p> + <p>Destroy notification</p> </item> </terms> - - </page> 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 39f6c148..6187e30f 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>filename</api:type> + <api:type>String</api:type> </api:returns> <api:name>regress_annotation_get_source_file</api:name> </api:function> - </info> - <title>annotation_get_source_file</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_get_source_file():filename { + <title>Regress.annotation_get_source_file</title> + <synopsis><code mime="text/x-gjs"> +function annotation_get_source_file(): String { // Gjs wrapper for regress_annotation_get_source_file() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>Source file</p> + </item> </terms> - - </page> 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 c75d9c27..e1b1ffea 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,28 @@ </api:returns> <api:name>regress_annotation_init</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>argv</api:name> </api:arg> </api:function> - </info> - <title>annotation_init</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_init(argv:[String]):void { + <title>Regress.annotation_init</title> + <synopsis><code mime="text/x-gjs"> +function annotation_init(argv: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_init() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>argv</code></title> -<p>The arguments.</p> + <p>The arguments.</p> +</item> +<item> +<title><code>argv (out)</code></title> + <p>The arguments.</p> </item> </terms> - - </page> 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 1997a4db..08bf226a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_invalid_regress_annotation</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>foo</api:name> </api:arg> </api:function> - </info> - <title>annotation_invalid_regress_annotation</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_invalid_regress_annotation(foo:Number):void { + <title>Regress.annotation_invalid_regress_annotation</title> + <synopsis><code mime="text/x-gjs"> +function annotation_invalid_regress_annotation(foo: Number(gint)): void { // Gjs wrapper for regress_annotation_invalid_regress_annotation() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>foo</code></title> -<p>some text (e.g. example) or else</p> + <p>some text (e.g. example) or else</p> </item> </terms> - - </page> 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 9bfb1680..07187dfa 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_ptr_array</api:name> <api:arg> - <api:type>[GObject.Value]</api:type> + <api:type>Array(GObject.Value)</api:type> <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>annotation_ptr_array</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_ptr_array(array:[GObject.Value]):void { + <title>Regress.annotation_ptr_array</title> + <synopsis><code mime="text/x-gjs"> +function annotation_ptr_array(array: Array(<link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>)): void { // Gjs wrapper for regress_annotation_ptr_array() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> -<p>the array</p> + <p>the array</p> </item> </terms> - - </page> 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 3f63c9a5..94f8f35c 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_annotation_return_array</api:name> </api:function> - </info> - <title>annotation_return_array</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_return_array():[String] { + <title>Regress.annotation_return_array</title> + <synopsis><code mime="text/x-gjs"> +function annotation_return_array(): [return_value: Array(String), length: Number(gint)] { // Gjs wrapper for regress_annotation_return_array() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> -<title><code>Returns</code></title> -<p>The return value</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>length</code></title> + <p>Number of return values</p> </item> </terms> - - </page> 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 86419455..6b8f9028 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>filename</api:type> + <api:type>String</api:type> </api:returns> <api:name>regress_annotation_return_filename</api:name> </api:function> - </info> - <title>annotation_return_filename</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_return_filename():filename { + <title>Regress.annotation_return_filename</title> + <synopsis><code mime="text/x-gjs"> +function annotation_return_filename(): String { // Gjs wrapper for regress_annotation_return_filename() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>An annotated filename</p> + </item> </terms> - - </page> 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 a5977b87..a2705aff 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,24 @@ </api:returns> <api:name>regress_annotation_set_source_file</api:name> <api:arg> - <api:type>filename</api:type> + <api:type>String</api:type> <api:name>fname</api:name> </api:arg> </api:function> - </info> - <title>annotation_set_source_file</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_set_source_file(fname:filename):void { + <title>Regress.annotation_set_source_file</title> + <synopsis><code mime="text/x-gjs"> +function annotation_set_source_file(fname: String): void { // Gjs wrapper for regress_annotation_set_source_file() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>fname</code></title> -<p>Source file</p> + <p>Source file</p> </item> </terms> - - </page> 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 675e00da..094bef21 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_annotation_space_after_comment_bug631690</api:name> </api:function> - </info> - <title>annotation_space_after_comment_bug631690</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_space_after_comment_bug631690():void { + <title>Regress.annotation_space_after_comment_bug631690</title> + <synopsis><code mime="text/x-gjs"> +function annotation_space_after_comment_bug631690(): void { // Gjs wrapper for regress_annotation_space_after_comment_bug631690() } -</code></synopsis> + </code></synopsis> + <p>Explicitly test having a space after the ** here.</p> - - <p>Explicitly test having a space after the ** here.</p> - - - - -<terms> -</terms> - - </page> 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 347eb6d2..07c63581 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_annotation_string_array_length</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>properties</api:name> </api:arg> </api:function> - </info> - <title>annotation_string_array_length</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_string_array_length(properties:[String]):void { + <title>Regress.annotation_string_array_length</title> + <synopsis><code mime="text/x-gjs"> +function annotation_string_array_length(properties: Array(String)): void { // Gjs wrapper for regress_annotation_string_array_length() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>properties</code></title> @@ -41,6 +33,4 @@ function annotation_string_array_length(properties:[String]):void { </item> </terms> - - </page> 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 741447ea..a3c2e3f4 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_annotation_string_zero_terminated</api:name> </api:function> - </info> - <title>annotation_string_zero_terminated</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_string_zero_terminated():[String] { + <title>Regress.annotation_string_zero_terminated</title> + <synopsis><code mime="text/x-gjs"> +function annotation_string_zero_terminated(): Array(String) { // Gjs wrapper for regress_annotation_string_zero_terminated() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>The return value</p> + </item> </terms> - - </page> 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 cd4d8bef..c388ad2d 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,28 @@ </api:returns> <api:name>regress_annotation_string_zero_terminated_out</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>out</api:name> </api:arg> </api:function> - </info> - <title>annotation_string_zero_terminated_out</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_string_zero_terminated_out(out:[String]):void { + <title>Regress.annotation_string_zero_terminated_out</title> + <synopsis><code mime="text/x-gjs"> +function annotation_string_zero_terminated_out(out: Array(String)): Array(String) { // Gjs wrapper for regress_annotation_string_zero_terminated_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> </item> +<item> +<title><code>out (out)</code></title> + +</item> </terms> - - </page> 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 edade5bb..0b152a77 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_annotation_test_parsing_bug630862</api:name> </api:function> - </info> - <title>annotation_test_parsing_bug630862</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_test_parsing_bug630862():GObject.Object { + <title>Regress.annotation_test_parsing_bug630862</title> + <synopsis><code mime="text/x-gjs"> +function annotation_test_parsing_bug630862(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_test_parsing_bug630862() } -</code></synopsis> + </code></synopsis> + <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p> - - <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p> - - - - <terms> <item> <title><code>Returns</code></title> -<p>An object, note the colon:in here</p> + </item> </terms> - - </page> 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 a4fceafb..07aefcbd 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_annotation_transfer_floating</api:name> </api:function> - </info> - <title>annotation_transfer_floating</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_transfer_floating():GObject.Object { + <title>Regress.annotation_transfer_floating</title> + <synopsis><code mime="text/x-gjs"> +function annotation_transfer_floating(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> { // Gjs wrapper for regress_annotation_transfer_floating() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>A floating object</p> + </item> </terms> - - </page> 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 f1d57003..52028b07 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,14 @@ </api:returns> <api:name>regress_annotation_versioned</api:name> </api:function> - </info> - <title>annotation_versioned</title> - -<synopsis><code mime="text/x-gjs"> -function annotation_versioned():void { + <title>Regress.annotation_versioned</title> + <synopsis><code mime="text/x-gjs"> +function annotation_versioned(): void { // Gjs wrapper for regress_annotation_versioned() } -</code></synopsis> + </code></synopsis> - - - - - <p>Since 0.6</p> - - -<terms> -</terms> + <p>Since 0.6</p> - - </page> 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 3aade3ca..93664962 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_atest_error_quark</api:name> </api:function> - </info> - <title>atest_error_quark</title> - -<synopsis><code mime="text/x-gjs"> -function atest_error_quark():GLib.Quark { + <title>Regress.atest_error_quark</title> + <synopsis><code mime="text/x-gjs"> +function atest_error_quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_atest_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function atest_error_quark():GLib.Quark { </item> </terms> - - </page> 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 980a9302..54040ad5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,22 +21,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>foo_async_ready_callback</title> - -<synopsis><code mime="text/x-gjs"> -function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.AsyncReadyCallback):void { + <title>Regress.foo_async_ready_callback</title> + <synopsis><code mime="text/x-gjs"> +function foo_async_ready_callback(cancellable: <link href="../Gio-2.0/Gio.Cancellable.page">Gio.Cancellable</link>, callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.page">Gio.AsyncReadyCallback</link>): void { // Gjs wrapper for regress_foo_async_ready_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>cancellable</code></title> @@ -49,6 +41,4 @@ function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.Asyn </item> </terms> - - </page> 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 d5cff2a4..32760824 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>foo_destroy_notify_callback</title> - -<synopsis><code mime="text/x-gjs"> -function foo_destroy_notify_callback(callback:Regress.FooCallback):void { + <title>Regress.foo_destroy_notify_callback</title> + <synopsis><code mime="text/x-gjs"> +function foo_destroy_notify_callback(callback: <link xref="Regress.FooCallback">Regress.FooCallback</link>): void { // Gjs wrapper for regress_foo_destroy_notify_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function foo_destroy_notify_callback(callback:Regress.FooCallback):void { </item> </terms> - - </page> 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 20eb206c..cfecea5e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_foo_init</api:name> </api:function> - </info> - <title>foo_init</title> - -<synopsis><code mime="text/x-gjs"> -function foo_init():Number { + <title>Regress.foo_init</title> + <synopsis><code mime="text/x-gjs"> +function foo_init(): Number(gint) { // Gjs wrapper for regress_foo_init() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function foo_init():Number { </item> </terms> - - </page> 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 10876aa8..1bb3afb2 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -30,22 +29,15 @@ <api:name>s</api:name> </api:arg> </api:function> - </info> - <title>foo_method_external_references</title> - -<synopsis><code mime="text/x-gjs"> -function foo_method_external_references(object:Utility.Object, e:Utility.EnumType, f:Utility.FlagType, s:Utility.Struct):void { + <title>Regress.foo_method_external_references</title> + <synopsis><code mime="text/x-gjs"> +function foo_method_external_references(object: <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link>, e: <link href="../Utility-1.0/Utility.EnumType.page">Utility.EnumType</link>, f: <link href="../Utility-1.0/Utility.FlagType.page">Utility.FlagType</link>, s: <link href="../Utility-1.0/Utility.Struct.page">Utility.Struct</link>): void { // Gjs wrapper for regress_foo_method_external_references() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -65,6 +57,4 @@ function foo_method_external_references(object:Utility.Object, e:Utility.EnumTyp </item> </terms> - - </page> 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 31f881b7..0ffa89c7 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,23 +13,16 @@ </api:returns> <api:name>regress_foo_not_a_constructor_new</api:name> </api:function> - </info> - <title>foo_not_a_constructor_new</title> - -<synopsis><code mime="text/x-gjs"> -function foo_not_a_constructor_new():Regress.FooObject { + <title>Regress.foo_not_a_constructor_new</title> + <synopsis><code mime="text/x-gjs"> +function foo_not_a_constructor_new(): <link xref="Regress.FooObject">Regress.FooObject</link> { // Gjs wrapper for regress_foo_not_a_constructor_new() } -</code></synopsis> - - - <p>This should be scanned as a top-level function, and shouldn't cause + </code></synopsis> + <p>This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning.</p> - - - - + <terms> <item> <title><code>Returns</code></title> @@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.</p> </item> </terms> - - </page> 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 989084bf..3fbf325a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_foo_test_array</api:name> </api:function> - </info> - <title>foo_test_array</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_array():[String] { + <title>Regress.foo_test_array</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_array(): Array(String) { // Gjs wrapper for regress_foo_test_array() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function foo_test_array():[String] { </item> </terms> - - </page> 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 4f095620..7b627288 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> - <title>foo_test_const_char_param</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_const_char_param(param:String):void { + <title>Regress.foo_test_const_char_param</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_const_char_param(param: String): void { // Gjs wrapper for regress_foo_test_const_char_param() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -41,6 +33,4 @@ function foo_test_const_char_param(param:String):void { </item> </terms> - - </page> 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 3ff92653..79984f6d 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_test_const_char_retval</api:name> </api:function> - </info> - <title>foo_test_const_char_retval</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_const_char_retval():String { + <title>Regress.foo_test_const_char_retval</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_const_char_retval(): String { // Gjs wrapper for regress_foo_test_const_char_retval() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function foo_test_const_char_retval():String { </item> </terms> - - </page> 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 da103fbf..4965c706 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> - <title>foo_test_const_struct_param</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_const_struct_param(param:Regress.FooStruct):void { + <title>Regress.foo_test_const_struct_param</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_const_struct_param(param: <link xref="Regress.FooStruct">Regress.FooStruct</link>): void { // Gjs wrapper for regress_foo_test_const_struct_param() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -41,6 +33,4 @@ function foo_test_const_struct_param(param:Regress.FooStruct):void { </item> </terms> - - </page> 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 9c7539c3..1495882e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_foo_test_const_struct_retval</api:name> </api:function> - </info> - <title>foo_test_const_struct_retval</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_const_struct_retval():Regress.FooStruct { + <title>Regress.foo_test_const_struct_retval</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_const_struct_retval(): <link xref="Regress.FooStruct">Regress.FooStruct</link> { // Gjs wrapper for regress_foo_test_const_struct_retval() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function foo_test_const_struct_retval():Regress.FooStruct { </item> </terms> - - </page> 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 fe3b85ac..36a5f7c2 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_test_string_array</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>foo_test_string_array</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_string_array(array:[String]):void { + <title>Regress.foo_test_string_array</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_string_array(array: Array(String)): void { // Gjs wrapper for regress_foo_test_string_array() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -41,6 +33,4 @@ function foo_test_string_array(array:[String]):void { </item> </terms> - - </page> 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 8b5c9018..daf7ac9b 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_test_string_array_with_g</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>foo_test_string_array_with_g</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_string_array_with_g(array:[String]):void { + <title>Regress.foo_test_string_array_with_g</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_string_array_with_g(array: Array(String)): void { // Gjs wrapper for regress_foo_test_string_array_with_g() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -41,6 +33,4 @@ function foo_test_string_array_with_g(array:[String]):void { </item> </terms> - - </page> 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 c35d3e99..15ef4d55 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_test_unsigned_qualifier</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> - <title>foo_test_unsigned_qualifier</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_unsigned_qualifier(unsigned_param:Number):void { + <title>Regress.foo_test_unsigned_qualifier</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_unsigned_qualifier(unsigned_param: Number(guint)): void { // Gjs wrapper for regress_foo_test_unsigned_qualifier() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -41,6 +33,4 @@ function foo_test_unsigned_qualifier(unsigned_param:Number):void { </item> </terms> - - </page> 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 9f68b516..a09d4add 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_foo_test_unsigned_type</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> - <title>foo_test_unsigned_type</title> - -<synopsis><code mime="text/x-gjs"> -function foo_test_unsigned_type(unsigned_param:Number):void { + <title>Regress.foo_test_unsigned_type</title> + <synopsis><code mime="text/x-gjs"> +function foo_test_unsigned_type(unsigned_param: Number(guint)): void { // Gjs wrapper for regress_foo_test_unsigned_type() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -41,6 +33,4 @@ function foo_test_unsigned_type(unsigned_param:Number):void { </item> </terms> - - </page> 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 446001a0..c149b294 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,20 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> - <title>func_obj_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function func_obj_null_in(obj:Regress.TestObj):void { + <title>Regress.func_obj_null_in</title> + <synopsis><code mime="text/x-gjs"> +function func_obj_null_in(obj: <link xref="Regress.TestObj">Regress.TestObj</link>): void { // Gjs wrapper for regress_func_obj_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> </terms> - - </page> 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 bafa5417..b8b18888 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_global_get_flags_out</api:name> </api:function> - </info> - <title>global_get_flags_out</title> - -<synopsis><code mime="text/x-gjs"> -function global_get_flags_out():void { + <title>Regress.global_get_flags_out</title> + <synopsis><code mime="text/x-gjs"> +function global_get_flags_out(): <link xref="Regress.TestFlags">Regress.TestFlags</link> { // Gjs wrapper for regress_global_get_flags_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>v</code></title> + <p>A flags value</p> +</item> </terms> - - </page> 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 d4f673d8..bd6dbd77 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,42 +13,33 @@ </api:returns> <api:name>regress_has_parameter_named_attrs</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>[guint32]</api:type> + <api:type>Array(Number(guint32))</api:type> <api:name>attributes</api:name> </api:arg> </api:function> - </info> - <title>has_parameter_named_attrs</title> - -<synopsis><code mime="text/x-gjs"> -function has_parameter_named_attrs(foo:Number, attributes:[guint32]):void { + <title>Regress.has_parameter_named_attrs</title> + <synopsis><code mime="text/x-gjs"> +function has_parameter_named_attrs(foo: Number(gint), attributes: Array(Number(guint32))): void { // Gjs wrapper for regress_has_parameter_named_attrs() } -</code></synopsis> - - - <p>This test case mirrors GnomeKeyringPasswordSchema from + </code></synopsis> + <p>This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.</p> - - - - + <terms> <item> <title><code>foo</code></title> -<p>some int</p> + <p>some int</p> </item> <item> <title><code>attributes</code></title> -<p>list of attributes</p> + <p>list of attributes</p> </item> </terms> - - </page> 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 aa2baa6c..486b8898 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> - <title>introspectable_via_alias</title> - -<synopsis><code mime="text/x-gjs"> -function introspectable_via_alias(data:Regress.PtrArrayAlias):void { + <title>Regress.introspectable_via_alias</title> + <synopsis><code mime="text/x-gjs"> +function introspectable_via_alias(data: <link xref="Regress.PtrArrayAlias">Regress.PtrArrayAlias</link>): void { // Gjs wrapper for regress_introspectable_via_alias() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> @@ -41,6 +33,4 @@ function introspectable_via_alias(data:Regress.PtrArrayAlias):void { </item> </terms> - - </page> 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 9b300e17..e0fd8c04 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>abort_on_error</api:name> </api:arg> </api:function> - </info> - <title>set_abort_on_error</title> - -<synopsis><code mime="text/x-gjs"> -function set_abort_on_error(abort_on_error:Boolean):void { + <title>Regress.set_abort_on_error</title> + <synopsis><code mime="text/x-gjs"> +function set_abort_on_error(abort_on_error: Boolean): void { // Gjs wrapper for regress_set_abort_on_error() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>abort_on_error</code></title> @@ -41,6 +33,4 @@ function set_abort_on_error(abort_on_error:Boolean):void { </item> </terms> - - </page> 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 112cd23f..e1b4e02c 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_array_callback</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_array_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_callback(callback:Regress.TestCallbackArray):Number { + <title>Regress.test_array_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_array_callback(callback: <link xref="Regress.TestCallbackArray">Regress.TestCallbackArray</link>): Number(gint) { // Gjs wrapper for regress_test_array_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -45,6 +37,4 @@ function test_array_callback(callback:Regress.TestCallbackArray):Number { </item> </terms> - - </page> 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 51026b59..0645559a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_array_fixed_out_objects</api:name> </api:function> - </info> - <title>test_array_fixed_out_objects</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_fixed_out_objects():void { + <title>Regress.test_array_fixed_out_objects</title> + <synopsis><code mime="text/x-gjs"> +function test_array_fixed_out_objects(): Array(<link xref="Regress.TestObj">Regress.TestObj</link>) { // Gjs wrapper for regress_test_array_fixed_out_objects() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>objs</code></title> + <p>An array of <link xref="Regress.TestObj"/></p> +</item> </terms> - - </page> 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 14a6e66e..4d74b6bc 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_array_fixed_size_int_in</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_fixed_size_int_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_fixed_size_int_in(ints:[Number]):Number { + <title>Regress.test_array_fixed_size_int_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_fixed_size_int_in(ints: Array(Number(gint))): Number(gint) { // Gjs wrapper for regress_test_array_fixed_size_int_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>a list of 5 integers</p> + <p>a list of 5 integers</p> </item> <item> <title><code>Returns</code></title> -<p>the sum of the items in <code>ints</code></p> + </item> </terms> - - </page> 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 ce62153d..37c5aed4 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_array_fixed_size_int_out</api:name> </api:function> - </info> - <title>test_array_fixed_size_int_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_fixed_size_int_out():void { + <title>Regress.test_array_fixed_size_int_out</title> + <synopsis><code mime="text/x-gjs"> +function test_array_fixed_size_int_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_fixed_size_int_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>ints</code></title> + <p>a list of 5 integers ranging from 0 to 4</p> +</item> </terms> - - </page> 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 1e2c6786..27f8360a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> </api:returns> <api:name>regress_test_array_fixed_size_int_return</api:name> </api:function> - </info> - <title>test_array_fixed_size_int_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_fixed_size_int_return():[Number] { + <title>Regress.test_array_fixed_size_int_return</title> + <synopsis><code mime="text/x-gjs"> +function test_array_fixed_size_int_return(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_fixed_size_int_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>a list of 5 integers ranging from 0 to 4</p> + </item> </terms> - - </page> 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 e4b957e7..a1d52a4a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_array_gint16_in</api:name> <api:arg> - <api:type>[gint16]</api:type> + <api:type>Array(Number(gint16))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_gint16_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_gint16_in(ints:[gint16]):Number { + <title>Regress.test_array_gint16_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_gint16_in(ints: Array(Number(gint16))): Number(gint) { // Gjs wrapper for regress_test_array_gint16_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -45,6 +37,4 @@ function test_array_gint16_in(ints:[gint16]):Number { </item> </terms> - - </page> 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 171ad11e..a578d564 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gint32</api:type> + <api:type>Number(gint32)</api:type> </api:returns> <api:name>regress_test_array_gint32_in</api:name> <api:arg> - <api:type>[gint32]</api:type> + <api:type>Array(Number(gint32))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_gint32_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_gint32_in(ints:[gint32]):gint32 { + <title>Regress.test_array_gint32_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_gint32_in(ints: Array(Number(gint32))): Number(gint32) { // Gjs wrapper for regress_test_array_gint32_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -45,6 +37,4 @@ function test_array_gint32_in(ints:[gint32]):gint32 { </item> </terms> - - </page> 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 a8b51a6b..da730c8d 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint64)</api:type> </api:returns> <api:name>regress_test_array_gint64_in</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint64))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_gint64_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_gint64_in(ints:[Number]):Number { + <title>Regress.test_array_gint64_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_gint64_in(ints: Array(Number(gint64))): Number(gint64) { // Gjs wrapper for regress_test_array_gint64_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -45,6 +37,4 @@ function test_array_gint64_in(ints:[Number]):Number { </item> </terms> - - </page> 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 16ddc7c5..617f7a4e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_array_gint8_in</api:name> <api:arg> - <api:type>[gint8]</api:type> + <api:type>Array(Number(gint8))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_gint8_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_gint8_in(ints:[gint8]):Number { + <title>Regress.test_array_gint8_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_gint8_in(ints: Array(Number(gint8))): Number(gint) { // Gjs wrapper for regress_test_array_gint8_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -45,6 +37,4 @@ function test_array_gint8_in(ints:[gint8]):Number { </item> </terms> - - </page> 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 61e1d0a4..7206bead 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,37 +13,28 @@ </api:returns> <api:name>regress_test_array_gtype_in</api:name> <api:arg> - <api:type>[GType]</api:type> + <api:type>Array(GObject.Type)</api:type> <api:name>types</api:name> </api:arg> </api:function> - </info> - <title>test_array_gtype_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_gtype_in(types:[GType]):String { + <title>Regress.test_array_gtype_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_gtype_in(types: Array(GObject.Type)): String { // Gjs wrapper for regress_test_array_gtype_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>types</code></title> -<p>List of types</p> + <p>List of types</p> </item> <item> <title><code>Returns</code></title> -<p>string representation of provided types</p> + </item> </terms> - - </page> 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 5f580ad7..73f6250e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> </api:returns> <api:name>regress_test_array_int_full_out</api:name> </api:function> - </info> - <title>test_array_int_full_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_full_out():[Number] { + <title>Regress.test_array_int_full_out</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_full_out(): [return_value: Array(Number(gint)), len: Number(gint)] { // Gjs wrapper for regress_test_array_int_full_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> -<title><code>Returns</code></title> -<p>a new array of integers.</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>len</code></title> + <p>length of the returned array.</p> </item> </terms> - - </page> 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 3d41dca7..af070d4a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_array_int_in</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_int_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_in(ints:[Number]):Number { + <title>Regress.test_array_int_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_in(ints: Array(Number(gint))): Number(gint) { // Gjs wrapper for regress_test_array_int_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -45,6 +37,4 @@ function test_array_int_in(ints:[Number]):Number { </item> </terms> - - </page> 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 b4094cd8..6624efef 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,28 @@ </api:returns> <api:name>regress_test_array_int_inout</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>test_array_int_inout</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_inout(ints:[Number]):void { + <title>Regress.test_array_int_inout</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_inout(ints: Array(Number(gint))): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_inout() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p> + <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p> +</item> +<item> +<title><code>ints (out)</code></title> + <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p> </item> </terms> - - </page> 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 ac105214..392f4fed 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> </api:returns> <api:name>regress_test_array_int_none_out</api:name> </api:function> - </info> - <title>test_array_int_none_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_none_out():[Number] { + <title>Regress.test_array_int_none_out</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_none_out(): [return_value: Array(Number(gint)), len: Number(gint)] { // Gjs wrapper for regress_test_array_int_none_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> -<title><code>Returns</code></title> -<p>a static array of integers.</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>len</code></title> + <p>length of the returned array.</p> </item> </terms> - - </page> 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 33b27a00..05059f40 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_array_int_null_in</api:name> <api:arg> - <api:type>[Number]</api:type> + <api:type>Array(Number(gint))</api:type> <api:name>arr</api:name> </api:arg> </api:function> - </info> - <title>test_array_int_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_null_in(arr:[Number]):void { + <title>Regress.test_array_int_null_in</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_null_in(arr: Array(Number(gint))): void { // Gjs wrapper for regress_test_array_int_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -41,6 +33,4 @@ function test_array_int_null_in(arr:[Number]):void { </item> </terms> - - </page> 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 1e1a3640..d48aafda 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_array_int_null_out</api:name> </api:function> - </info> - <title>test_array_int_null_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_null_out():void { + <title>Regress.test_array_int_null_out</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_null_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>arr</code></title> + +</item> </terms> - - </page> 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 78953ec6..0707b8d6 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_array_int_out</api:name> </api:function> - </info> - <title>test_array_int_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_array_int_out():void { + <title>Regress.test_array_int_out</title> + <synopsis><code mime="text/x-gjs"> +function test_array_int_out(): Array(Number(gint)) { // Gjs wrapper for regress_test_array_int_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>ints</code></title> + <p>a list of 5 integers, from 0 to 4 in consecutive order</p> +</item> </terms> - - </page> 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 89d737c7..c4625e05 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_async_ready_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { + <title>Regress.test_async_ready_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_async_ready_callback(callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.page">Gio.AsyncReadyCallback</link>): void { // Gjs wrapper for regress_test_async_ready_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { </item> </terms> - - </page> 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 e165db21..1ecb4154 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_boolean</title> - -<synopsis><code mime="text/x-gjs"> -function test_boolean(in:Boolean):Boolean { + <title>Regress.test_boolean</title> + <synopsis><code mime="text/x-gjs"> +function test_boolean(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 21e169c0..cff83c60 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_boolean_false</title> - -<synopsis><code mime="text/x-gjs"> -function test_boolean_false(in:Boolean):Boolean { + <title>Regress.test_boolean_false</title> + <synopsis><code mime="text/x-gjs"> +function test_boolean_false(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean_false() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 e525a2f8..26f4ba92 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_boolean_true</title> - -<synopsis><code mime="text/x-gjs"> -function test_boolean_true(in:Boolean):Boolean { + <title>Regress.test_boolean_true</title> + <synopsis><code mime="text/x-gjs"> +function test_boolean_true(in: Boolean): Boolean { // Gjs wrapper for regress_test_boolean_true() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 1c222c6c..2c6a5aad 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_context_full_return</api:name> </api:function> - </info> - <title>test_cairo_context_full_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_context_full_return():cairo.Context { + <title>Regress.test_cairo_context_full_return</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_context_full_return(): <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link> { // Gjs wrapper for regress_test_cairo_context_full_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_cairo_context_full_return():cairo.Context { </item> </terms> - - </page> 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 f710ac0a..66a02d68 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>context</api:name> </api:arg> </api:function> - </info> - <title>test_cairo_context_none_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_context_none_in(context:cairo.Context):void { + <title>Regress.test_cairo_context_none_in</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_context_none_in(context: <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link>): void { // Gjs wrapper for regress_test_cairo_context_none_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>context</code></title> @@ -41,6 +33,4 @@ function test_cairo_context_none_in(context:cairo.Context):void { </item> </terms> - - </page> 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 dcec607e..18d52ed9 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_cairo_surface_full_out</api:name> </api:function> - </info> - <title>test_cairo_surface_full_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_surface_full_out():void { + <title>Regress.test_cairo_surface_full_out</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_surface_full_out(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> { // Gjs wrapper for regress_test_cairo_surface_full_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>surface</code></title> + +</item> </terms> - - </page> 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 f1b0f96c..efe27fab 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_surface_full_return</api:name> </api:function> - </info> - <title>test_cairo_surface_full_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_surface_full_return():cairo.Surface { + <title>Regress.test_cairo_surface_full_return</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_surface_full_return(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> { // Gjs wrapper for regress_test_cairo_surface_full_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_cairo_surface_full_return():cairo.Surface { </item> </terms> - - </page> 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 783576a0..4c10e3ca 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>surface</api:name> </api:arg> </api:function> - </info> - <title>test_cairo_surface_none_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_surface_none_in(surface:cairo.Surface):void { + <title>Regress.test_cairo_surface_none_in</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_surface_none_in(surface: <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link>): void { // Gjs wrapper for regress_test_cairo_surface_none_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>surface</code></title> @@ -41,6 +33,4 @@ function test_cairo_surface_none_in(surface:cairo.Surface):void { </item> </terms> - - </page> 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 72e602ef..688dbe22 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_surface_none_return</api:name> </api:function> - </info> - <title>test_cairo_surface_none_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_cairo_surface_none_return():cairo.Surface { + <title>Regress.test_cairo_surface_none_return</title> + <synopsis><code mime="text/x-gjs"> +function test_cairo_surface_none_return(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> { // Gjs wrapper for regress_test_cairo_surface_none_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_cairo_surface_none_return():cairo.Surface { </item> </terms> - - </page> 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 869dd98c..d63f4670 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback(callback:Regress.TestCallback):Number { + <title>Regress.test_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): Number(gint) { // Gjs wrapper for regress_test_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -45,6 +37,4 @@ function test_callback(callback:Regress.TestCallback):Number { </item> </terms> - - </page> 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 7b9ef5b6..f4a3142f 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_callback_async</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_async(callback:Regress.TestCallbackUserData):void { + <title>Regress.test_callback_async</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_async(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): void { // Gjs wrapper for regress_test_callback_async() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_callback_async(callback:Regress.TestCallbackUserData):void { </item> </terms> - - </page> 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 d147c974..654a4c17 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback_destroy_notify</api:name> <api:arg> @@ -18,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_callback_destroy_notify</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_destroy_notify(callback:Regress.TestCallbackUserData):Number { + <title>Regress.test_callback_destroy_notify</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_destroy_notify(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) { // Gjs wrapper for regress_test_callback_destroy_notify() } -</code></synopsis> - - - <p>Notified - callback persists until a DestroyNotify delegate + </code></synopsis> + <p>Notified - callback persists until a DestroyNotify delegate is invoked.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ is invoked.</p> </item> </terms> - - </page> 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 7fa31a30..c6741408 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback_destroy_notify_no_user_data</api:name> <api:arg> @@ -18,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_callback_destroy_notify_no_user_data</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_destroy_notify_no_user_data(callback:Regress.TestCallbackUserData):Number { + <title>Regress.test_callback_destroy_notify_no_user_data</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_destroy_notify_no_user_data(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) { // Gjs wrapper for regress_test_callback_destroy_notify_no_user_data() } -</code></synopsis> - - - <p>Adds a scope notified callback with no user data. This can invoke an error + </code></synopsis> + <p>Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ condition in bindings which needs to be tested.</p> </item> </terms> - - </page> 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 66dec18b..011b9e9b 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback_thaw_async</api:name> </api:function> - </info> - <title>test_callback_thaw_async</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_thaw_async():Number { + <title>Regress.test_callback_thaw_async</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_thaw_async(): Number(gint) { // Gjs wrapper for regress_test_callback_thaw_async() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_callback_thaw_async():Number { </item> </terms> - - </page> 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 9a8b57e1..b65b71d9 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback_thaw_notifications</api:name> </api:function> - </info> - <title>test_callback_thaw_notifications</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_thaw_notifications():Number { + <title>Regress.test_callback_thaw_notifications</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_thaw_notifications(): Number(gint) { // Gjs wrapper for regress_test_callback_thaw_notifications() } -</code></synopsis> - - - <p>Invokes all callbacks installed by #test_callback_destroy_notify(), + </code></synopsis> + <p>Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>Sum of the return values of the invoked callbacks.</p> + </item> </terms> - - </page> 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 dd9f5977..bae0cbc5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_callback_user_data</api:name> <api:arg> @@ -18,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_callback_user_data</title> - -<synopsis><code mime="text/x-gjs"> -function test_callback_user_data(callback:Regress.TestCallbackUserData):Number { + <title>Regress.test_callback_user_data</title> + <synopsis><code mime="text/x-gjs"> +function test_callback_user_data(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): Number(gint) { // Gjs wrapper for regress_test_callback_user_data() } -</code></synopsis> - - - <p>Call - callback parameter persists for the duration of the method + </code></synopsis> + <p>Call - callback parameter persists for the duration of the method call and can be released on return.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ call and can be released on return.</p> </item> </terms> - - </page> 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 a9545447..1b68fd0d 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,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_closure</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>closure</api:name> </api:arg> </api:function> - </info> - <title>test_closure</title> - -<synopsis><code mime="text/x-gjs"> -function test_closure(closure:GObject.Closure):Number { + <title>Regress.test_closure</title> + <synopsis><code mime="text/x-gjs"> +function test_closure(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>): Number(gint) { // Gjs wrapper for regress_test_closure() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -45,6 +37,4 @@ function test_closure(closure:GObject.Closure):Number { </item> </terms> - - </page> 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 3c37f7ac..77503426 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,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_closure_one_arg</api:name> <api:arg> @@ -18,26 +17,19 @@ <api:name>closure</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>arg</api:name> </api:arg> </api:function> - </info> - <title>test_closure_one_arg</title> - -<synopsis><code mime="text/x-gjs"> -function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { + <title>Regress.test_closure_one_arg</title> + <synopsis><code mime="text/x-gjs"> +function test_closure_one_arg(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>, arg: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_closure_one_arg() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -53,6 +45,4 @@ function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { </item> </terms> - - </page> 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 2bdbfe6d..6051b9d8 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,37 +21,28 @@ <api:name>arg</api:name> </api:arg> </api:function> - </info> - <title>test_closure_variant</title> - -<synopsis><code mime="text/x-gjs"> -function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Variant { + <title>Regress.test_closure_variant</title> + <synopsis><code mime="text/x-gjs"> +function test_closure_variant(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>, arg: <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link>): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_closure_variant() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> -<p>GClosure which takes one GVariant and returns a GVariant</p> + <p>GClosure which takes one GVariant and returns a GVariant</p> </item> <item> <title><code>arg</code></title> -<p>a GVariant passed as argument to <code>closure</code></p> + <p>a GVariant passed as argument to <code>closure</code></p> </item> <item> <title><code>Returns</code></title> -<p>the return value of <code>closure</code></p> + </item> </terms> - - </page> 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 acb379e7..9c4a1d73 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_date_in_gvalue</api:name> </api:function> - </info> - <title>test_date_in_gvalue</title> - -<synopsis><code mime="text/x-gjs"> -function test_date_in_gvalue():GObject.Value { + <title>Regress.test_date_in_gvalue</title> + <synopsis><code mime="text/x-gjs"> +function test_date_in_gvalue(): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> { // Gjs wrapper for regress_test_date_in_gvalue() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_date_in_gvalue():GObject.Value { </item> </terms> - - </page> 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 5a82a3f5..6038e26c 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_def_error_quark</api:name> </api:function> - </info> - <title>test_def_error_quark</title> - -<synopsis><code mime="text/x-gjs"> -function test_def_error_quark():GLib.Quark { + <title>Regress.test_def_error_quark</title> + <synopsis><code mime="text/x-gjs"> +function test_def_error_quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> { // Gjs wrapper for regress_test_def_error_quark() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_def_error_quark():GLib.Quark { </item> </terms> - - </page> 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 0ed75f62..66560803 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> </api:returns> <api:name>regress_test_double</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_double</title> - -<synopsis><code mime="text/x-gjs"> -function test_double(in:Number):Number { + <title>Regress.test_double</title> + <synopsis><code mime="text/x-gjs"> +function test_double(in: Number(gdouble)): Number(gdouble) { // Gjs wrapper for regress_test_double() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_double(in:Number):Number { </item> </terms> - - </page> 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 b26b613e..e52cd253 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[filename]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_filename_return</api:name> </api:function> - </info> - <title>test_filename_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_filename_return():[filename] { + <title>Regress.test_filename_return</title> + <synopsis><code mime="text/x-gjs"> +function test_filename_return(): Array(String) { // Gjs wrapper for regress_test_filename_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>list of strings</p> + </item> </terms> - - </page> 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 30f2ef76..a9430d5e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gfloat)</api:type> </api:returns> <api:name>regress_test_float</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gfloat)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_float</title> - -<synopsis><code mime="text/x-gjs"> -function test_float(in:Number):Number { + <title>Regress.test_float</title> + <synopsis><code mime="text/x-gjs"> +function test_float(in: Number(gfloat)): Number(gfloat) { // Gjs wrapper for regress_test_float() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_float(in:Number):Number { </item> </terms> - - </page> 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 a4196285..5c19831f 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_garray_container_return</api:name> </api:function> - </info> - <title>test_garray_container_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_garray_container_return():[String] { + <title>Regress.test_garray_container_return</title> + <synopsis><code mime="text/x-gjs"> +function test_garray_container_return(): Array(String) { // Gjs wrapper for regress_test_garray_container_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_garray_container_return():[String] { </item> </terms> - - </page> 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 86b1b78b..eb46a618 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_garray_full_return</api:name> </api:function> - </info> - <title>test_garray_full_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_garray_full_return():[String] { + <title>Regress.test_garray_full_return</title> + <synopsis><code mime="text/x-gjs"> +function test_garray_full_return(): Array(String) { // Gjs wrapper for regress_test_garray_full_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_garray_full_return():[String] { </item> </terms> - - </page> 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 31ab83c2..d59da0f9 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_gerror_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_gerror_callback(callback:Regress.TestCallbackGError):void { + <title>Regress.test_gerror_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_gerror_callback(callback: <link xref="Regress.TestCallbackGError">Regress.TestCallbackGError</link>): void { // Gjs wrapper for regress_test_gerror_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_gerror_callback(callback:Regress.TestCallbackGError):void { </item> </terms> - - </page> 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 b002deb8..44e46f92 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_container_return</api:name> </api:function> - </info> - <title>test_ghash_container_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_container_return():{String: String} { + <title>Regress.test_ghash_container_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_container_return(): {String: String} { // Gjs wrapper for regress_test_ghash_container_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_container_return():{String: String} { </item> </terms> - - </page> 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 1c1a0a91..d12e41a1 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_everything_return</api:name> </api:function> - </info> - <title>test_ghash_everything_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_everything_return():{String: String} { + <title>Regress.test_ghash_everything_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_everything_return(): {String: String} { // Gjs wrapper for regress_test_ghash_everything_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_everything_return():{String: String} { </item> </terms> - - </page> 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 b12b8f8b..ee7851cc 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,30 +17,21 @@ <api:name>hash</api:name> </api:arg> </api:function> - </info> - <title>test_ghash_gvalue_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_gvalue_in(hash:{String: GObject.Value}):void { + <title>Regress.test_ghash_gvalue_in</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_gvalue_in(hash: {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>}): void { // Gjs wrapper for regress_test_ghash_gvalue_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>hash</code></title> -<p>the hash table returned by + <p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p> </item> </terms> - - </page> 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 08748ea5..3c734ef0 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_gvalue_return</api:name> </api:function> - </info> - <title>test_ghash_gvalue_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_gvalue_return():{String: GObject.Value} { + <title>Regress.test_ghash_gvalue_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_gvalue_return(): {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>} { // Gjs wrapper for regress_test_ghash_gvalue_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_gvalue_return():{String: GObject.Value} { </item> </terms> - - </page> 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 4dece432..b8858432 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return</api:name> </api:function> - </info> - <title>test_ghash_nested_everything_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nested_everything_return():{String: {String: String}} { + <title>Regress.test_ghash_nested_everything_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nested_everything_return(): {String: {String: String}} { // Gjs wrapper for regress_test_ghash_nested_everything_return() } -</code></synopsis> + </code></synopsis> + <p>Specify nested parameterized types directly with the (type ) annotation.</p> - - <p>Specify nested parameterized types directly with the (type ) annotation.</p> - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_nested_everything_return():{String: {String: String}} { </item> </terms> - - </page> 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 8aa4da37..e422fe54 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,23 +13,16 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return2</api:name> </api:function> - </info> - <title>test_ghash_nested_everything_return2</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nested_everything_return2():{String: {String: String}} { + <title>Regress.test_ghash_nested_everything_return2</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nested_everything_return2(): {String: {String: String}} { // Gjs wrapper for regress_test_ghash_nested_everything_return2() } -</code></synopsis> - - - <p>Another way of specifying nested parameterized types: using the + </code></synopsis> + <p>Another way of specifying nested parameterized types: using the element-type annotation.</p> - - - - + <terms> <item> <title><code>Returns</code></title> @@ -38,6 +30,4 @@ element-type annotation.</p> </item> </terms> - - </page> 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 62990fce..e1ced280 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ghash_nothing_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nothing_in(in:{String: String}):void { + <title>Regress.test_ghash_nothing_in</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nothing_in(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_nothing_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_ghash_nothing_in(in:{String: String}):void { </item> </terms> - - </page> 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 72d774d8..15a291a3 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ghash_nothing_in2</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nothing_in2(in:{String: String}):void { + <title>Regress.test_ghash_nothing_in2</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nothing_in2(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_nothing_in2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_ghash_nothing_in2(in:{String: String}):void { </item> </terms> - - </page> 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 e3729a57..2f1e2f90 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nothing_return</api:name> </api:function> - </info> - <title>test_ghash_nothing_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nothing_return():{String: String} { + <title>Regress.test_ghash_nothing_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nothing_return(): {String: String} { // Gjs wrapper for regress_test_ghash_nothing_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_nothing_return():{String: String} { </item> </terms> - - </page> 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 7777ab42..e0319aa5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nothing_return2</api:name> </api:function> - </info> - <title>test_ghash_nothing_return2</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_nothing_return2():{String: String} { + <title>Regress.test_ghash_nothing_return2</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_nothing_return2(): {String: String} { // Gjs wrapper for regress_test_ghash_nothing_return2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_nothing_return2():{String: String} { </item> </terms> - - </page> 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 413a75bf..091d9e00 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ghash_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_null_in(in:{String: String}):void { + <title>Regress.test_ghash_null_in</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_null_in(in: {String: String}): void { // Gjs wrapper for regress_test_ghash_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_ghash_null_in(in:{String: String}):void { </item> </terms> - - </page> 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 2c272530..8ddcc159 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_ghash_null_out</api:name> </api:function> - </info> - <title>test_ghash_null_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_null_out():void { + <title>Regress.test_ghash_null_out</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_null_out(): {String: String} { // Gjs wrapper for regress_test_ghash_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>out</code></title> + +</item> </terms> - - </page> 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 df6d6860..8f4de6e4 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_null_return</api:name> </api:function> - </info> - <title>test_ghash_null_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_ghash_null_return():{String: String} { + <title>Regress.test_ghash_null_return</title> + <synopsis><code mime="text/x-gjs"> +function test_ghash_null_return(): {String: String} { // Gjs wrapper for regress_test_ghash_null_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_ghash_null_return():{String: String} { </item> </terms> - - </page> 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 c3ac7cb1..f6bc25a8 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_glist_container_return</api:name> </api:function> - </info> - <title>test_glist_container_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_container_return():[String] { + <title>Regress.test_glist_container_return</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_container_return(): Array(String) { // Gjs wrapper for regress_test_glist_container_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_glist_container_return():[String] { </item> </terms> - - </page> 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 fb31f77e..e560ff0f 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_glist_everything_return</api:name> </api:function> - </info> - <title>test_glist_everything_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_everything_return():[String] { + <title>Regress.test_glist_everything_return</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_everything_return(): Array(String) { // Gjs wrapper for regress_test_glist_everything_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_glist_everything_return():[String] { </item> </terms> - - </page> 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 3c85d190..952f527a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_glist_nothing_in</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_glist_nothing_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_nothing_in(in:[String]):void { + <title>Regress.test_glist_nothing_in</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_nothing_in(in: Array(String)): void { // Gjs wrapper for regress_test_glist_nothing_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_glist_nothing_in(in:[String]):void { </item> </terms> - - </page> 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 f160d126..ae7f1821 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_glist_nothing_in2</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_glist_nothing_in2</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_nothing_in2(in:[String]):void { + <title>Regress.test_glist_nothing_in2</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_nothing_in2(in: Array(String)): void { // Gjs wrapper for regress_test_glist_nothing_in2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_glist_nothing_in2(in:[String]):void { </item> </terms> - - </page> 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 e741d906..65b44637 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_glist_nothing_return</api:name> </api:function> - </info> - <title>test_glist_nothing_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_nothing_return():[String] { + <title>Regress.test_glist_nothing_return</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_nothing_return(): Array(String) { // Gjs wrapper for regress_test_glist_nothing_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_glist_nothing_return():[String] { </item> </terms> - - </page> 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 0fccdbbf..8b91dc33 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_glist_nothing_return2</api:name> </api:function> - </info> - <title>test_glist_nothing_return2</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_nothing_return2():[String] { + <title>Regress.test_glist_nothing_return2</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_nothing_return2(): Array(String) { // Gjs wrapper for regress_test_glist_nothing_return2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_glist_nothing_return2():[String] { </item> </terms> - - </page> 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 dfedc288..5725aea5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_glist_null_in</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_glist_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_null_in(in:[String]):void { + <title>Regress.test_glist_null_in</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_null_in(in: Array(String)): void { // Gjs wrapper for regress_test_glist_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_glist_null_in(in:[String]):void { </item> </terms> - - </page> 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 a1c7c684..057dc682 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_glist_null_out</api:name> </api:function> - </info> - <title>test_glist_null_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_glist_null_out():void { + <title>Regress.test_glist_null_out</title> + <synopsis><code mime="text/x-gjs"> +function test_glist_null_out(): Array(String) { // Gjs wrapper for regress_test_glist_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>out_list</code></title> + +</item> </terms> - - </page> 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 5133d114..1d535395 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_gslist_container_return</api:name> </api:function> - </info> - <title>test_gslist_container_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_container_return():[String] { + <title>Regress.test_gslist_container_return</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_container_return(): Array(String) { // Gjs wrapper for regress_test_gslist_container_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_gslist_container_return():[String] { </item> </terms> - - </page> 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 f82b1ce6..159a9680 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_gslist_everything_return</api:name> </api:function> - </info> - <title>test_gslist_everything_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_everything_return():[String] { + <title>Regress.test_gslist_everything_return</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_everything_return(): Array(String) { // Gjs wrapper for regress_test_gslist_everything_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_gslist_everything_return():[String] { </item> </terms> - - </page> 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 34096195..fc97e1c6 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_gslist_nothing_in</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_gslist_nothing_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_nothing_in(in:[String]):void { + <title>Regress.test_gslist_nothing_in</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_nothing_in(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_nothing_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_gslist_nothing_in(in:[String]):void { </item> </terms> - - </page> 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 05e0b569..2cf15e9a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_gslist_nothing_in2</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_gslist_nothing_in2</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_nothing_in2(in:[String]):void { + <title>Regress.test_gslist_nothing_in2</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_nothing_in2(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_nothing_in2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_gslist_nothing_in2(in:[String]):void { </item> </terms> - - </page> 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 03597fb4..c85963ab 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_gslist_nothing_return</api:name> </api:function> - </info> - <title>test_gslist_nothing_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_nothing_return():[String] { + <title>Regress.test_gslist_nothing_return</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_nothing_return(): Array(String) { // Gjs wrapper for regress_test_gslist_nothing_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_gslist_nothing_return():[String] { </item> </terms> - - </page> 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 0331f922..92c39d22 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_gslist_nothing_return2</api:name> </api:function> - </info> - <title>test_gslist_nothing_return2</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_nothing_return2():[String] { + <title>Regress.test_gslist_nothing_return2</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_nothing_return2(): Array(String) { // Gjs wrapper for regress_test_gslist_nothing_return2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_gslist_nothing_return2():[String] { </item> </terms> - - </page> 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 34168c85..6942e101 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,19 @@ </api:returns> <api:name>regress_test_gslist_null_in</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_gslist_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_null_in(in:[String]):void { + <title>Regress.test_gslist_null_in</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_null_in(in: Array(String)): void { // Gjs wrapper for regress_test_gslist_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_gslist_null_in(in:[String]):void { </item> </terms> - - </page> 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 4c9f3ca2..438473dc 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_gslist_null_out</api:name> </api:function> - </info> - <title>test_gslist_null_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_gslist_null_out():void { + <title>Regress.test_gslist_null_out</title> + <synopsis><code mime="text/x-gjs"> +function test_gslist_null_out(): Array(String) { // Gjs wrapper for regress_test_gslist_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>out_list</code></title> + +</item> </terms> - - </page> 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 824689a2..ed44d941 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>GType</api:type> + <api:type>GObject.Type</api:type> </api:returns> <api:name>regress_test_gtype</api:name> <api:arg> - <api:type>GType</api:type> + <api:type>GObject.Type</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_gtype</title> - -<synopsis><code mime="text/x-gjs"> -function test_gtype(in:GType):GType { + <title>Regress.test_gtype</title> + <synopsis><code mime="text/x-gjs"> +function test_gtype(in: GObject.Type): GObject.Type { // Gjs wrapper for regress_test_gtype() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_gtype(in:GType):GType { </item> </terms> - - </page> 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 1eedc344..b6e67505 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_gvariant_as</api:name> </api:function> - </info> - <title>test_gvariant_as</title> - -<synopsis><code mime="text/x-gjs"> -function test_gvariant_as():GLib.Variant { + <title>Regress.test_gvariant_as</title> + <synopsis><code mime="text/x-gjs"> +function test_gvariant_as(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_gvariant_as() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + </item> </terms> - - </page> 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 a5709df4..e17b3358 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_gvariant_asv</api:name> </api:function> - </info> - <title>test_gvariant_asv</title> - -<synopsis><code mime="text/x-gjs"> -function test_gvariant_asv():GLib.Variant { + <title>Regress.test_gvariant_asv</title> + <synopsis><code mime="text/x-gjs"> +function test_gvariant_asv(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_gvariant_asv() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + </item> </terms> - - </page> 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 e1e7dc0d..3bf68570 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_gvariant_i</api:name> </api:function> - </info> - <title>test_gvariant_i</title> - -<synopsis><code mime="text/x-gjs"> -function test_gvariant_i():GLib.Variant { + <title>Regress.test_gvariant_i</title> + <synopsis><code mime="text/x-gjs"> +function test_gvariant_i(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_gvariant_i() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + </item> </terms> - - </page> 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 139e0c61..40741bc3 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_gvariant_s</api:name> </api:function> - </info> - <title>test_gvariant_s</title> - -<synopsis><code mime="text/x-gjs"> -function test_gvariant_s():GLib.Variant { + <title>Regress.test_gvariant_s</title> + <synopsis><code mime="text/x-gjs"> +function test_gvariant_s(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_gvariant_s() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + </item> </terms> - - </page> 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 cec12de7..3a5cfe7b 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_gvariant_v</api:name> </api:function> - </info> - <title>test_gvariant_v</title> - -<synopsis><code mime="text/x-gjs"> -function test_gvariant_v():GLib.Variant { + <title>Regress.test_gvariant_v</title> + <synopsis><code mime="text/x-gjs"> +function test_gvariant_v(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> { // Gjs wrapper for regress_test_gvariant_v() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + </item> </terms> - - </page> 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 a49c65c1..2ac3ba73 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_hash_table_callback</api:name> <api:arg> - <api:type>{String: Number}</api:type> + <api:type>{String: Number(gint)}</api:type> <api:name>data</api:name> </api:arg> <api:arg> @@ -22,26 +21,19 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_hash_table_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCallbackHashtable):void { + <title>Regress.test_hash_table_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_hash_table_callback(data: {String: Number(gint)}, callback: <link xref="Regress.TestCallbackHashtable">Regress.TestCallbackHashtable</link>): void { // Gjs wrapper for regress_test_hash_table_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> -<p>GHashTable that gets passed to callback</p> + <p>GHashTable that gets passed to callback</p> </item> <item> <title><code>callback</code></title> @@ -49,6 +41,4 @@ function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCa </item> </terms> - - </page> 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 6193dd8a..3bb1e7e8 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_int</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int</title> - -<synopsis><code mime="text/x-gjs"> -function test_int(in:Number):Number { + <title>Regress.test_int</title> + <synopsis><code mime="text/x-gjs"> +function test_int(in: Number(gint)): Number(gint) { // Gjs wrapper for regress_test_int() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_int(in:Number):Number { </item> </terms> - - </page> 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 d8efb0b3..d34ea70d 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gint16</api:type> + <api:type>Number(gint16)</api:type> </api:returns> <api:name>regress_test_int16</api:name> <api:arg> - <api:type>gint16</api:type> + <api:type>Number(gint16)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int16</title> - -<synopsis><code mime="text/x-gjs"> -function test_int16(in:gint16):gint16 { + <title>Regress.test_int16</title> + <synopsis><code mime="text/x-gjs"> +function test_int16(in: Number(gint16)): Number(gint16) { // Gjs wrapper for regress_test_int16() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_int16(in:gint16):gint16 { </item> </terms> - - </page> 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 8015b377..044fa801 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gint32</api:type> + <api:type>Number(gint32)</api:type> </api:returns> <api:name>regress_test_int32</api:name> <api:arg> - <api:type>gint32</api:type> + <api:type>Number(gint32)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int32</title> - -<synopsis><code mime="text/x-gjs"> -function test_int32(in:gint32):gint32 { + <title>Regress.test_int32</title> + <synopsis><code mime="text/x-gjs"> +function test_int32(in: Number(gint32)): Number(gint32) { // Gjs wrapper for regress_test_int32() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_int32(in:gint32):gint32 { </item> </terms> - - </page> 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 24a69e96..79f3e639 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint64)</api:type> </api:returns> <api:name>regress_test_int64</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint64)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int64</title> - -<synopsis><code mime="text/x-gjs"> -function test_int64(in:Number):Number { + <title>Regress.test_int64</title> + <synopsis><code mime="text/x-gjs"> +function test_int64(in: Number(gint64)): Number(gint64) { // Gjs wrapper for regress_test_int64() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_int64(in:Number):Number { </item> </terms> - - </page> 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 ab573a0d..0f18bca0 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gint8</api:type> + <api:type>Number(gint8)</api:type> </api:returns> <api:name>regress_test_int8</api:name> <api:arg> - <api:type>gint8</api:type> + <api:type>Number(gint8)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int8</title> - -<synopsis><code mime="text/x-gjs"> -function test_int8(in:gint8):gint8 { + <title>Regress.test_int8</title> + <synopsis><code mime="text/x-gjs"> +function test_int8(in: Number(gint8)): Number(gint8) { // Gjs wrapper for regress_test_int8() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_int8(in:gint8):gint8 { </item> </terms> - - </page> 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 020f9e22..7141cacb 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,24 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_int_out_utf8</title> - -<synopsis><code mime="text/x-gjs"> -function test_int_out_utf8(in:String):void { + <title>Regress.test_int_out_utf8</title> + <synopsis><code mime="text/x-gjs"> +function test_int_out_utf8(in: String): Number(gint) { // Gjs wrapper for regress_test_int_out_utf8() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> </item> +<item> +<title><code>length</code></title> + +</item> </terms> - - </page> 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 cb84a3c9..64d400e3 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,11 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_int_value_arg</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> - <title>test_int_value_arg</title> - -<synopsis><code mime="text/x-gjs"> -function test_int_value_arg(v:GObject.Value):Number { + <title>Regress.test_int_value_arg</title> + <synopsis><code mime="text/x-gjs"> +function test_int_value_arg(v: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>): Number(gint) { // Gjs wrapper for regress_test_int_value_arg() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> @@ -45,6 +37,4 @@ function test_int_value_arg(v:GObject.Value):Number { </item> </terms> - - </page> 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 12bc1aec..d0432060 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(glong)</api:type> </api:returns> <api:name>regress_test_long</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(glong)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_long</title> - -<synopsis><code mime="text/x-gjs"> -function test_long(in:Number):Number { + <title>Regress.test_long</title> + <synopsis><code mime="text/x-gjs"> +function test_long(in: Number(glong)): Number(glong) { // Gjs wrapper for regress_test_long() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_long(in:Number):Number { </item> </terms> - - </page> 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 ea0646f6..18c89eef 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> </api:returns> <api:name>regress_test_multi_callback</api:name> <api:arg> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_multi_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_multi_callback(callback:Regress.TestCallback):Number { + <title>Regress.test_multi_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_multi_callback(callback: <link xref="Regress.TestCallback">Regress.TestCallback</link>): Number(gint) { // Gjs wrapper for regress_test_multi_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -45,6 +37,4 @@ function test_multi_callback(callback:Regress.TestCallback):Number { </item> </terms> - - </page> 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 378ace73..c5d1f8c5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,33 +13,32 @@ </api:returns> <api:name>regress_test_multi_double_args</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gdouble)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_multi_double_args</title> - -<synopsis><code mime="text/x-gjs"> -function test_multi_double_args(in:Number):void { + <title>Regress.test_multi_double_args</title> + <synopsis><code mime="text/x-gjs"> +function test_multi_double_args(in: Number(gdouble)): [one: Number(gdouble), two: Number(gdouble)] { // Gjs wrapper for regress_test_multi_double_args() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> </item> +<item> +<title><code>one</code></title> + +</item> +<item> +<title><code>two</code></title> + +</item> </terms> - - </page> 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 38a75e75..828f5843 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,14 @@ </api:returns> <api:name>regress_test_multiline_doc_comments</api:name> </api:function> - </info> - <title>test_multiline_doc_comments</title> - -<synopsis><code mime="text/x-gjs"> -function test_multiline_doc_comments():void { + <title>Regress.test_multiline_doc_comments</title> + <synopsis><code mime="text/x-gjs"> +function test_multiline_doc_comments(): void { // Gjs wrapper for regress_test_multiline_doc_comments() } -</code></synopsis> + </code></synopsis> + <p>This is a function.</p> <p>It has multiple lines in the documentation.</p> <p>The sky is blue.</p> <p>You will give me your credit card number.</p> - - <p>This is a function.</p><p>It has multiple lines in the documentation.</p><p>The sky is blue.</p><p>You will give me your credit card number.</p> - - - - -<terms> -</terms> - - </page> 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 54bda89f..a436fa76 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,18 @@ </api:returns> <api:name>regress_test_nested_parameter</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>a</api:name> </api:arg> </api:function> - </info> - <title>test_nested_parameter</title> - -<synopsis><code mime="text/x-gjs"> -function test_nested_parameter(a:Number):void { + <title>Regress.test_nested_parameter</title> + <synopsis><code mime="text/x-gjs"> +function test_nested_parameter(a: Number(gint)): void { // Gjs wrapper for regress_test_nested_parameter() } -</code></synopsis> - - - <p><informaltable> + </code></synopsis> + <p><informaltable> <tgroup cols="3"> <thead> <row> @@ -54,18 +49,13 @@ rgb(20%, 30%, 0%)</literallayout></entry> </row> </tbody> </tgroup> -</informaltable></p><p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p> - - - - +</informaltable></p> <p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p> + <terms> <item> <title><code>a</code></title> -<p>An integer</p> + <p>An integer</p> </item> </terms> - - </page> 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 5af4d58c..da0ee2be 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_null_gerror_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { + <title>Regress.test_null_gerror_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_null_gerror_callback(callback: <link xref="Regress.TestCallbackGError">Regress.TestCallbackGError</link>): void { // Gjs wrapper for regress_test_null_gerror_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { </item> </terms> - - </page> 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 206ac215..00e7f0e4 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_owned_gerror_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):void { + <title>Regress.test_owned_gerror_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_owned_gerror_callback(callback: <link xref="Regress.TestCallbackOwnedGError">Regress.TestCallbackOwnedGError</link>): void { // Gjs wrapper for regress_test_owned_gerror_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):vo </item> </terms> - - </page> 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 59381ae1..55262c7e 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gshort</api:type> + <api:type>Number(gshort)</api:type> </api:returns> <api:name>regress_test_short</api:name> <api:arg> - <api:type>gshort</api:type> + <api:type>Number(gshort)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_short</title> - -<synopsis><code mime="text/x-gjs"> -function test_short(in:gshort):gshort { + <title>Regress.test_short</title> + <synopsis><code mime="text/x-gjs"> +function test_short(in: Number(gshort)): Number(gshort) { // Gjs wrapper for regress_test_short() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_short(in:gshort):gshort { </item> </terms> - - </page> 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 9d8198f7..741b80da 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>test_simple_callback</title> - -<synopsis><code mime="text/x-gjs"> -function test_simple_callback(callback:Regress.TestSimpleCallback):void { + <title>Regress.test_simple_callback</title> + <synopsis><code mime="text/x-gjs"> +function test_simple_callback(callback: <link xref="Regress.TestSimpleCallback">Regress.TestSimpleCallback</link>): void { // Gjs wrapper for regress_test_simple_callback() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -41,6 +33,4 @@ function test_simple_callback(callback:Regress.TestSimpleCallback):void { </item> </terms> - - </page> 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 bc6896d3..75b70638 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gsize</api:type> + <api:type>Number(gsize)</api:type> </api:returns> <api:name>regress_test_size</api:name> <api:arg> - <api:type>gsize</api:type> + <api:type>Number(gsize)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_size</title> - -<synopsis><code mime="text/x-gjs"> -function test_size(in:gsize):gsize { + <title>Regress.test_size</title> + <synopsis><code mime="text/x-gjs"> +function test_size(in: Number(gsize)): Number(gsize) { // Gjs wrapper for regress_test_size() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_size(in:gsize):gsize { </item> </terms> - - </page> 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 ccc011da..bed41673 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>gssize</api:type> + <api:type>Number(gssize)</api:type> </api:returns> <api:name>regress_test_ssize</api:name> <api:arg> - <api:type>gssize</api:type> + <api:type>Number(gssize)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ssize</title> - -<synopsis><code mime="text/x-gjs"> -function test_ssize(in:gssize):gssize { + <title>Regress.test_ssize</title> + <synopsis><code mime="text/x-gjs"> +function test_ssize(in: Number(gssize)): Number(gssize) { // Gjs wrapper for regress_test_ssize() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_ssize(in:gssize):gssize { </item> </terms> - - </page> 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 7659a72a..b427f9d8 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,37 +13,28 @@ </api:returns> <api:name>regress_test_strv_in</api:name> <api:arg> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> <api:name>arr</api:name> </api:arg> </api:function> - </info> - <title>test_strv_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_in(arr:[String]):Boolean { + <title>Regress.test_strv_in</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_in(arr: Array(String)): Boolean { // Gjs wrapper for regress_test_strv_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> </item> </terms> - - </page> 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 20617c09..83cbe066 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,22 +13,15 @@ </api:returns> <api:name>regress_test_strv_in_gvalue</api:name> </api:function> - </info> - <title>test_strv_in_gvalue</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_in_gvalue():GObject.Value { + <title>Regress.test_strv_in_gvalue</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_in_gvalue(): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> { // Gjs wrapper for regress_test_strv_in_gvalue() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_strv_in_gvalue():GObject.Value { </item> </terms> - - </page> 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 477a46fa..3df60792 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_strv_out</api:name> </api:function> - </info> - <title>test_strv_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_out():[String] { + <title>Regress.test_strv_out</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_out(): Array(String) { // Gjs wrapper for regress_test_strv_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_strv_out():[String] { </item> </terms> - - </page> 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 d393946c..824d190c 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_strv_out_c</api:name> </api:function> - </info> - <title>test_strv_out_c</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_out_c():[String] { + <title>Regress.test_strv_out_c</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_out_c(): Array(String) { // Gjs wrapper for regress_test_strv_out_c() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_strv_out_c():[String] { </item> </terms> - - </page> 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 f9bec391..ba50c9ff 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>[String]</api:type> + <api:type>Array(String)</api:type> </api:returns> <api:name>regress_test_strv_out_container</api:name> </api:function> - </info> - <title>test_strv_out_container</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_out_container():[String] { + <title>Regress.test_strv_out_container</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_out_container(): Array(String) { // Gjs wrapper for regress_test_strv_out_container() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ function test_strv_out_container():[String] { </item> </terms> - - </page> 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 01bcba42..04ce85f0 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_strv_outarg</api:name> </api:function> - </info> - <title>test_strv_outarg</title> - -<synopsis><code mime="text/x-gjs"> -function test_strv_outarg():void { + <title>Regress.test_strv_outarg</title> + <synopsis><code mime="text/x-gjs"> +function test_strv_outarg(): Array(String) { // Gjs wrapper for regress_test_strv_outarg() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>retp</code></title> + +</item> </terms> - - </page> 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 65ccab57..09aa430f 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(glong)</api:type> </api:returns> <api:name>regress_test_timet</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(glong)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_timet</title> - -<synopsis><code mime="text/x-gjs"> -function test_timet(in:Number):Number { + <title>Regress.test_timet</title> + <synopsis><code mime="text/x-gjs"> +function test_timet(in: Number(glong)): Number(glong) { // Gjs wrapper for regress_test_timet() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_timet(in:Number):Number { </item> </terms> - - </page> 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 16965833..f90dfcac 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_torture_signature_0</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> <api:arg> @@ -22,26 +21,19 @@ <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>test_torture_signature_0</title> - -<synopsis><code mime="text/x-gjs"> -function test_torture_signature_0(x:Number, foo:String, m:Number):void { + <title>Regress.test_torture_signature_0</title> + <synopsis><code mime="text/x-gjs"> +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></synopsis> - - - - - - - + </code></synopsis> + + <terms> <item> <title><code>x</code></title> @@ -55,8 +47,18 @@ function test_torture_signature_0(x:Number, foo:String, m:Number):void { <title><code>m</code></title> </item> +<item> +<title><code>y</code></title> + +</item> +<item> +<title><code>z</code></title> + +</item> +<item> +<title><code>q</code></title> + +</item> </terms> - - </page> 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 a10b0ab5..a270b7ea 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_torture_signature_1</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> <api:arg> @@ -22,26 +21,19 @@ <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>test_torture_signature_1</title> - -<synopsis><code mime="text/x-gjs"> -function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { + <title>Regress.test_torture_signature_1</title> + <synopsis><code mime="text/x-gjs"> +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() } -</code></synopsis> + </code></synopsis> + <p>This function throws an error if m is odd.</p> - - <p>This function throws an error if m is odd.</p> - - - - <terms> <item> <title><code>x</code></title> @@ -56,11 +48,21 @@ function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { </item> <item> -<title><code>Returns</code></title> +<title><code>ok</code></title> + +</item> +<item> +<title><code>y</code></title> + +</item> +<item> +<title><code>z</code></title> + +</item> +<item> +<title><code>q</code></title> </item> </terms> - - </page> 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 3a3eb39a..efc91d6a 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,7 +13,7 @@ </api:returns> <api:name>regress_test_torture_signature_2</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>x</api:name> </api:arg> <api:arg> @@ -26,26 +25,19 @@ <api:name>foo</api:name> </api:arg> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>test_torture_signature_2</title> - -<synopsis><code mime="text/x-gjs"> -function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserData, foo:String, m:Number):void { + <title>Regress.test_torture_signature_2</title> + <synopsis><code mime="text/x-gjs"> +function test_torture_signature_2(x: Number(gint), callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>, foo: String, m: Number(guint)): [y: Number(gdouble), z: Number(gint), q: Number(gint)] { // Gjs wrapper for regress_test_torture_signature_2() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -63,8 +55,18 @@ function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserDat <title><code>m</code></title> </item> +<item> +<title><code>y</code></title> + +</item> +<item> +<title><code>z</code></title> + +</item> +<item> +<title><code>q</code></title> + +</item> </terms> - - </page> 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 ac1653a1..178bc037 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> </api:returns> <api:name>regress_test_uint</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_uint</title> - -<synopsis><code mime="text/x-gjs"> -function test_uint(in:Number):Number { + <title>Regress.test_uint</title> + <synopsis><code mime="text/x-gjs"> +function test_uint(in: Number(guint)): Number(guint) { // Gjs wrapper for regress_test_uint() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_uint(in:Number):Number { </item> </terms> - - </page> 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 93faff4d..54c19af1 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>guint16</api:type> + <api:type>Number(guint16)</api:type> </api:returns> <api:name>regress_test_uint16</api:name> <api:arg> - <api:type>guint16</api:type> + <api:type>Number(guint16)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_uint16</title> - -<synopsis><code mime="text/x-gjs"> -function test_uint16(in:guint16):guint16 { + <title>Regress.test_uint16</title> + <synopsis><code mime="text/x-gjs"> +function test_uint16(in: Number(guint16)): Number(guint16) { // Gjs wrapper for regress_test_uint16() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_uint16(in:guint16):guint16 { </item> </terms> - - </page> 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 ebab4d6f..9d33d736 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>guint32</api:type> + <api:type>Number(guint32)</api:type> </api:returns> <api:name>regress_test_uint32</api:name> <api:arg> - <api:type>guint32</api:type> + <api:type>Number(guint32)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_uint32</title> - -<synopsis><code mime="text/x-gjs"> -function test_uint32(in:guint32):guint32 { + <title>Regress.test_uint32</title> + <synopsis><code mime="text/x-gjs"> +function test_uint32(in: Number(guint32)): Number(guint32) { // Gjs wrapper for regress_test_uint32() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_uint32(in:guint32):guint32 { </item> </terms> - - </page> 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 942d786f..3eb7a883 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(guint64)</api:type> </api:returns> <api:name>regress_test_uint64</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(guint64)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_uint64</title> - -<synopsis><code mime="text/x-gjs"> -function test_uint64(in:Number):Number { + <title>Regress.test_uint64</title> + <synopsis><code mime="text/x-gjs"> +function test_uint64(in: Number(guint64)): Number(guint64) { // Gjs wrapper for regress_test_uint64() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_uint64(in:Number):Number { </item> </terms> - - </page> 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 f39dcc12..f7b89003 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>guint8</api:type> + <api:type>Number(guint8)</api:type> </api:returns> <api:name>regress_test_uint8</api:name> <api:arg> - <api:type>guint8</api:type> + <api:type>Number(guint8)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_uint8</title> - -<synopsis><code mime="text/x-gjs"> -function test_uint8(in:guint8):guint8 { + <title>Regress.test_uint8</title> + <synopsis><code mime="text/x-gjs"> +function test_uint8(in: Number(guint8)): Number(guint8) { // Gjs wrapper for regress_test_uint8() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_uint8(in:guint8):guint8 { </item> </terms> - - </page> 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 76f33101..7f345b10 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> - <api:type>Number</api:type> + <api:type>Number(gulong)</api:type> </api:returns> <api:name>regress_test_ulong</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gulong)</api:type> <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ulong</title> - -<synopsis><code mime="text/x-gjs"> -function test_ulong(in:Number):Number { + <title>Regress.test_ulong</title> + <synopsis><code mime="text/x-gjs"> +function test_ulong(in: Number(gulong)): Number(gulong) { // Gjs wrapper for regress_test_ulong() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_ulong(in:Number):Number { </item> </terms> - - </page> 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 25465b37..54d98f4b 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_unichar</title> - -<synopsis><code mime="text/x-gjs"> -function test_unichar(in:String):String { + <title>Regress.test_unichar</title> + <synopsis><code mime="text/x-gjs"> +function test_unichar(in: String): String { // Gjs wrapper for regress_test_unichar() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_unichar(in:String):String { </item> </terms> - - </page> 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 8b7348e8..f2701d08 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> - <title>test_unsigned_enum_param</title> - -<synopsis><code mime="text/x-gjs"> -function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { + <title>Regress.test_unsigned_enum_param</title> + <synopsis><code mime="text/x-gjs"> +function test_unsigned_enum_param(e: <link xref="Regress.TestEnumUnsigned">Regress.TestEnumUnsigned</link>): String { // Gjs wrapper for regress_test_unsigned_enum_param() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -45,6 +37,4 @@ function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { </item> </terms> - - </page> 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 74ada4ba..207181c9 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_ushort</title> - -<synopsis><code mime="text/x-gjs"> -function test_ushort(in:gushort):gushort { + <title>Regress.test_ushort</title> + <synopsis><code mime="text/x-gjs"> +function test_ushort(in: gushort): gushort { // Gjs wrapper for regress_test_ushort() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -45,6 +37,4 @@ function test_ushort(in:gushort):gushort { </item> </terms> - - </page> 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 63fedb9f..9d7f4905 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_utf8_const_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_const_in(in:String):void { + <title>Regress.test_utf8_const_in</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_const_in(in: String): void { // Gjs wrapper for regress_test_utf8_const_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_utf8_const_in(in:String):void { </item> </terms> - - </page> 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 a63dc22c..a323e446 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_utf8_const_return</api:name> </api:function> - </info> - <title>test_utf8_const_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_const_return():String { + <title>Regress.test_utf8_const_return</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_const_return(): String { // Gjs wrapper for regress_test_utf8_const_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>UTF-8 string</p> + </item> </terms> - - </page> 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 1f282c2f..48463ac1 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,29 +17,24 @@ <api:name>inout</api:name> </api:arg> </api:function> - </info> - <title>test_utf8_inout</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_inout(inout:String):void { + <title>Regress.test_utf8_inout</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_inout(inout: String): String { // Gjs wrapper for regress_test_utf8_inout() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>inout</code></title> </item> +<item> +<title><code>inout (out)</code></title> + +</item> </terms> - - </page> 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 2fec9e8c..05e2fb42 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_utf8_nonconst_return</api:name> </api:function> - </info> - <title>test_utf8_nonconst_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_nonconst_return():String { + <title>Regress.test_utf8_nonconst_return</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_nonconst_return(): String { // Gjs wrapper for regress_test_utf8_nonconst_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>UTF-8 string</p> + </item> </terms> - - </page> 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 14f3a550..bfcd72d6 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,22 +17,15 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>test_utf8_null_in</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_null_in(in:String):void { + <title>Regress.test_utf8_null_in</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_null_in(in: String): void { // Gjs wrapper for regress_test_utf8_null_in() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -41,6 +33,4 @@ function test_utf8_null_in(in:String):void { </item> </terms> - - </page> 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 66632ffd..b4e23a54 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_utf8_null_out</api:name> </api:function> - </info> - <title>test_utf8_null_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_null_out():void { + <title>Regress.test_utf8_null_out</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_null_out(): String { // Gjs wrapper for regress_test_utf8_null_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>char_out</code></title> + +</item> </terms> - - </page> 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 b1a40622..c3e4cac5 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,20 @@ </api:returns> <api:name>regress_test_utf8_out</api:name> </api:function> - </info> - <title>test_utf8_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_out():void { + <title>Regress.test_utf8_out</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_out(): String { // Gjs wrapper for regress_test_utf8_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>out</code></title> + +</item> </terms> - - </page> 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 e8a097ea..0966cee2 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,24 @@ </api:returns> <api:name>regress_test_utf8_out_nonconst_return</api:name> </api:function> - </info> - <title>test_utf8_out_nonconst_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_out_nonconst_return():String { + <title>Regress.test_utf8_out_nonconst_return</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_out_nonconst_return(): [return_value: String, out: String] { // Gjs wrapper for regress_test_utf8_out_nonconst_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> -<title><code>Returns</code></title> -<p>a copy of "first"</p> +<title><code>return_value</code></title> + +</item> +<item> +<title><code>out</code></title> + <p>a copy of "second"</p> </item> </terms> - - </page> 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 07107ed8..d250ca0b 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,25 +13,24 @@ </api:returns> <api:name>regress_test_utf8_out_out</api:name> </api:function> - </info> - <title>test_utf8_out_out</title> - -<synopsis><code mime="text/x-gjs"> -function test_utf8_out_out():void { + <title>Regress.test_utf8_out_out</title> + <synopsis><code mime="text/x-gjs"> +function test_utf8_out_out(): [out0: String, out1: String] { // Gjs wrapper for regress_test_utf8_out_out() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> +<item> +<title><code>out0</code></title> + <p>a copy of "first"</p> +</item> +<item> +<title><code>out1</code></title> + <p>a copy of "second"</p> +</item> </terms> - - </page> 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 59f03b78..e9dfd23f 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,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,37 +13,28 @@ </api:returns> <api:name>regress_test_value_return</api:name> <api:arg> - <api:type>Number</api:type> + <api:type>Number(gint)</api:type> <api:name>i</api:name> </api:arg> </api:function> - </info> - <title>test_value_return</title> - -<synopsis><code mime="text/x-gjs"> -function test_value_return(i:Number):GObject.Value { + <title>Regress.test_value_return</title> + <synopsis><code mime="text/x-gjs"> +function test_value_return(i: Number(gint)): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> { // Gjs wrapper for regress_test_value_return() } -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> -<p>an int</p> + <p>an int</p> </item> <item> <title><code>Returns</code></title> -<p>the int wrapped in a GValue.</p> + </item> </terms> - - </page> 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 eb6ce0f2..4cd4b2cc 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/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,26 +13,14 @@ </api:returns> <api:name>regress_test_versioning</api:name> </api:function> - </info> - <title>test_versioning</title> - -<synopsis><code mime="text/x-gjs"> -function test_versioning():void { + <title>Regress.test_versioning</title> + <synopsis><code mime="text/x-gjs"> +function test_versioning(): void { // Gjs wrapper for regress_test_versioning() } -</code></synopsis> + </code></synopsis> - - - - - <p>Since 1.32.1</p> - - -<terms> -</terms> + <p>Since 1.32.1</p> - - </page> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/index.page b/tests/scanner/Regress-1.0-Gjs-expected/index.page index a5426d89..426ebedf 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/"> - <info> - - - </info> - <title>Index</title> - - - - - - - - - - <links type="topic" ui:expanded="true" groups="class" style="linklist"> + <info> </info> + <title>Regress</title> + <links type="topic" ui:expanded="true" groups="class interface" style="linklist"> <title>Classes</title> </links> <links type="topic" ui:expanded="true" groups="function" style="linklist"> |