docwriter: Skip non-introspectable nodes in introspectable languages

diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 9b27e0d9ad66f3db8a1097432b3726dfd3671c84..bf0ca20d157684e6f3bbb3beb1de1bf1b91b47dc 100644 (file)
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -391,6 +391,9 @@ class DocFormatterIntrospectableBase(DocFormatter):
         if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None:
             return False
 
+        if not getattr(node, "introspectable", True):
+            return False
+
         return True
 
 class DocFormatterPython(DocFormatterIntrospectableBase):

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page
deleted file mode 100644 (file)
index 085bf0a..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch"
-      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 type="guide" xref="Regress.AnnotationObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_annotation_object_watch</api:name>
-      <api:arg>
-        <api:type>Regress.AnnotationForeachFunc</api:type>
-        <api:name>func</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>AnnotationObject.prototype.watch</title>
-  
-<synopsis><code mime="text/x-gjs">
-function watch(func:Regress.AnnotationForeachFunc):void {
-    // Gjs wrapper for regress_annotation_object_watch()
-}
-</code></synopsis>
-
-  
-    <p>This is here just for the sake of being overriden by its
-<link xref="Regress.AnnotationObject.watch_full"/>.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page
deleted file mode 100644 (file)
index b751ddb..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject-hidden"
-      type="topic"
-      style="property"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="Regress.FooObject" group="property"/>
-    <title type="link" role="topic">hidden</title>
-
-  </info>
-  <title>Regress.FooObject:hidden</title>
-  
-<synopsis><code mime="text/x-python">
-"hidden"             None                : Read / Write / Construct Only
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page
deleted file mode 100644 (file)
index 71c12ff..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.new_cookie"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.FooObjectCookie</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_new_cookie</api:name>
-      <api:arg>
-        <api:type>String</api:type>
-        <api:name>target</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>FooObject.prototype.new_cookie</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new_cookie(target:String):Regress.FooObjectCookie {
-    // Gjs wrapper for regress_foo_object_new_cookie()
-}
-</code></synopsis>
-
-  
-    <p>Not sure why this test is here...</p>
-  
-  
-  
-  
-<dl>
-<dt><p>target :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page
deleted file mode 100644 (file)
index b60c677..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.skipped_method"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_skipped_method</api:name>
-    </api:function>
-
-  </info>
-  <title>FooObject.prototype.skipped_method</title>
-  
-<synopsis><code mime="text/x-gjs">
-function skipped_method():void {
-    // Gjs wrapper for regress_foo_object_skipped_method()
-}
-</code></synopsis>
-
-  
-    <p>This is only useful from C.</p>
-  
-  
-  
-  
-<dl>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page
deleted file mode 100644 (file)
index 35c2a7e..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.take_all"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_take_all</api:name>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:varargs/>
-    </api:function>
-
-  </info>
-  <title>FooObject.prototype.take_all</title>
-  
-<synopsis><code mime="text/x-gjs">
-function take_all(x:Number, None:<varargs>):void {
-    // Gjs wrapper for regress_foo_object_take_all()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>None :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page
deleted file mode 100644 (file)
index 80a242d..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooRectangle.new"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="Regress.FooRectangle" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.FooRectangle</api:type>
-      </api:returns>
-      <api:name>regress_foo_rectangle_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:arg>
-        <api:type>Number</api:type>
-        <api:name>width</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>height</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>new</title>
-  
-<synopsis><code mime="text/x-gjs">
-function new(x:Number, y:Number, width:Number, height:Number):Regress.FooRectangle {
-    // Gjs wrapper for regress_foo_rectangle_new()
-}
-</code></synopsis>
-
-  
-    <p>This is a C convenience constructor; we have to (skip)
-it because it's not a boxed type.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page
deleted file mode 100644 (file)
index 605ccf5..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooSkippable"
-      type="topic"
-      style="enum"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-      <link type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.FooSkippable</title>
-  
-  
-  
-    <p>Some type that is only interesting from C and should not be
-exposed to language bindings.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>FooSkippable.ONE :</p></dt>
-<dd><p>a skippable enum value</p></dd>
-<dt><p>FooSkippable.TWO :</p></dt>
-<dd><p>another skippable enum value</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page
deleted file mode 100644 (file)
index d477638..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooVarargsCallback"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.FooVarargsCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page
deleted file mode 100644 (file)
index e285bc2..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.IntSet"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.IntSet</title>
-  
-  
-  
-    <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page
deleted file mode 100644 (file)
index 2e67ac0..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.SkippedStructure"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-      <link type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.SkippedStructure</title>
-  
-  
-  
-    <p>This should be skipped, and moreover, all function which
-use it should be.</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page
deleted file mode 100644 (file)
index bfd52d2..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.VaListAlias"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.VaListAlias</title>
-  
-  
-  
-    <p>Typedef'd va_list for additional reasons</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page
deleted file mode 100644 (file)
index 1458b27..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_skip_me"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_skip_me</api:name>
-      <api:arg>
-        <api:type>Regress.FooSkippable</api:type>
-        <api:name>fs</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_skip_me</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_skip_me(fs:Regress.FooSkippable):void {
-    // Gjs wrapper for regress_foo_skip_me()
-}
-</code></synopsis>
-
-  
-    <p>Does something that's only interesting from C and should not be
-exposed to language bindings.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>fs :</p></dt>
-<dd><p>a <link xref="Regress.FooSkippable"/></p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page
deleted file mode 100644 (file)
index 0974061..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_some_variant"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_some_variant</api:name>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>va_list</api:type>
-        <api:name>args</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_some_variant</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_some_variant(x:Number, args:va_list):void {
-    // Gjs wrapper for regress_foo_some_variant()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page
deleted file mode 100644 (file)
index d63650f..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_some_variant_ptr"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_some_variant_ptr</api:name>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>va_list</api:type>
-        <api:name>args</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_some_variant_ptr</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_some_variant_ptr(x:Number, args:va_list):void {
-    // Gjs wrapper for regress_foo_some_variant_ptr()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page
deleted file mode 100644 (file)
index 4ae258f..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback</api:name>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>i</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_varargs_callback(i:Number, callback:Regress.FooVarargsCallback):void {
-    // Gjs wrapper for regress_foo_test_varargs_callback()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page
deleted file mode 100644 (file)
index c65a818..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback2"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback2</api:name>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback2</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_varargs_callback2(callback:Regress.FooVarargsCallback):void {
-    // Gjs wrapper for regress_foo_test_varargs_callback2()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page
deleted file mode 100644 (file)
index 56cc6c0..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback3"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback3</api:name>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback2</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback3</title>
-  
-<synopsis><code mime="text/x-gjs">
-function foo_test_varargs_callback3(callback:Regress.FooVarargsCallback, callback2:Regress.FooVarargsCallback):void {
-    // Gjs wrapper for regress_foo_test_varargs_callback3()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>callback2 :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page
deleted file mode 100644 (file)
index b1192a9..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.not_introspectable_via_alias"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_not_introspectable_via_alias</api:name>
-      <api:arg>
-        <api:type>Regress.VaListAlias</api:type>
-        <api:name>ok</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>not_introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-gjs">
-function not_introspectable_via_alias(ok:Regress.VaListAlias):void {
-    // Gjs wrapper for regress_not_introspectable_via_alias()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>ok :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page
deleted file mode 100644 (file)
index 5981e90..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.random_function_with_skipped_structure"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_random_function_with_skipped_structure</api:name>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.SkippedStructure</api:type>
-        <api:name>foo</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Number</api:type>
-        <api:name>v</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>random_function_with_skipped_structure</title>
-  
-<synopsis><code mime="text/x-gjs">
-function random_function_with_skipped_structure(x:Number, foo:Regress.SkippedStructure, v:Number):void {
-    // Gjs wrapper for regress_random_function_with_skipped_structure()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page
deleted file mode 100644 (file)
index 0107162..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_skip_unannotated_callback"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_test_skip_unannotated_callback</api:name>
-      <api:arg>
-        <api:type>Regress.TestCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_skip_unannotated_callback</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_skip_unannotated_callback(callback:Regress.TestCallback):void {
-    // Gjs wrapper for regress_test_skip_unannotated_callback()
-}
-</code></synopsis>
-
-  
-    <p>Should not emit a warning:
-https://bugzilla.gnome.org/show_bug.cgi?id=685399</p>
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>No annotation here</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page
deleted file mode 100644 (file)
index e3b85a8..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_value_get_fundamental_object"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.TestFundamentalObject</api:type>
-      </api:returns>
-      <api:name>regress_test_value_get_fundamental_object</api:name>
-      <api:arg>
-        <api:type>GObject.Value</api:type>
-        <api:name>value</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_value_get_fundamental_object</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_value_get_fundamental_object(value:GObject.Value):Regress.TestFundamentalObject {
-    // Gjs wrapper for regress_test_value_get_fundamental_object()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page
deleted file mode 100644 (file)
index 1c8b445..0000000
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_value_set_fundamental_object"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_test_value_set_fundamental_object</api:name>
-      <api:arg>
-        <api:type>GObject.Value</api:type>
-        <api:name>value</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.TestFundamentalObject</api:type>
-        <api:name>fundamental_object</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_value_set_fundamental_object</title>
-  
-<synopsis><code mime="text/x-gjs">
-function test_value_set_fundamental_object(value:GObject.Value, fundamental_object:Regress.TestFundamentalObject):void {
-    // Gjs wrapper for regress_test_value_set_fundamental_object()
-}
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>fundamental_object :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page
deleted file mode 100644 (file)
index 87fbe04..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch"
-      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 type="guide" xref="Regress.AnnotationObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_annotation_object_watch</api:name>
-      <api:arg>
-        <api:type>Regress.AnnotationObject</api:type>
-        <api:name>self</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.AnnotationForeachFunc</api:type>
-        <api:name>func</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>gpointer</api:type>
-        <api:name>user_data</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>AnnotationObject.watch</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer)
-@returns(none)
-def watch(self, func, user_data):
-    # Python wrapper for regress_annotation_object_watch()
-</code></synopsis>
-
-  
-    <p>This is here just for the sake of being overriden by its
-<link xref="Regress.AnnotationObject.watch_full"/>.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>The callback data</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page
deleted file mode 100644 (file)
index b751ddb..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject-hidden"
-      type="topic"
-      style="property"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="Regress.FooObject" group="property"/>
-    <title type="link" role="topic">hidden</title>
-
-  </info>
-  <title>Regress.FooObject:hidden</title>
-  
-<synopsis><code mime="text/x-python">
-"hidden"             None                : Read / Write / Construct Only
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page
deleted file mode 100644 (file)
index aadefdf..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.new_cookie"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.FooObjectCookie</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_new_cookie</api:name>
-      <api:arg>
-        <api:type>Regress.FooObject</api:type>
-        <api:name>self</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>unicode</api:type>
-        <api:name>target</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>FooObject.new_cookie</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooObject, unicode)
-@returns(Regress.FooObjectCookie)
-def new_cookie(self, target):
-    # Python wrapper for regress_foo_object_new_cookie()
-</code></synopsis>
-
-  
-    <p>Not sure why this test is here...</p>
-  
-  
-  
-  
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>target :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page
deleted file mode 100644 (file)
index 7a56e3c..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.skipped_method"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_skipped_method</api:name>
-      <api:arg>
-        <api:type>Regress.FooObject</api:type>
-        <api:name>self</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>FooObject.skipped_method</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooObject)
-@returns(none)
-def skipped_method(self):
-    # Python wrapper for regress_foo_object_skipped_method()
-</code></synopsis>
-
-  
-    <p>This is only useful from C.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>obj</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page
deleted file mode 100644 (file)
index be7b23f..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooObject.take_all"
-      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 type="guide" xref="Regress.FooObject" group="method"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_object_take_all</api:name>
-      <api:arg>
-        <api:type>Regress.FooObject</api:type>
-        <api:name>self</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:varargs/>
-    </api:function>
-
-  </info>
-  <title>FooObject.take_all</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooObject, int, <varargs>)
-@returns(none)
-def take_all(self, x, ...):
-    # Python wrapper for regress_foo_object_take_all()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>... :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page
deleted file mode 100644 (file)
index 392f67a..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooRectangle.new"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="Regress.FooRectangle" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.FooRectangle</api:type>
-      </api:returns>
-      <api:name>regress_foo_rectangle_new</api:name>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>y</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>width</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>height</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>FooRectangle.new</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(int, int, int, int)
-@returns(Regress.FooRectangle)
-def new(x, y, width, height):
-    # Python wrapper for regress_foo_rectangle_new()
-</code></synopsis>
-
-  
-    <p>This is a C convenience constructor; we have to (skip)
-it because it's not a boxed type.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page
deleted file mode 100644 (file)
index 605ccf5..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooSkippable"
-      type="topic"
-      style="enum"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-      <link type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.FooSkippable</title>
-  
-  
-  
-    <p>Some type that is only interesting from C and should not be
-exposed to language bindings.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>FooSkippable.ONE :</p></dt>
-<dd><p>a skippable enum value</p></dd>
-<dt><p>FooSkippable.TWO :</p></dt>
-<dd><p>another skippable enum value</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page
deleted file mode 100644 (file)
index d477638..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.FooVarargsCallback"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.FooVarargsCallback</title>
-  
-  
-  
-    
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page
deleted file mode 100644 (file)
index e285bc2..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.IntSet"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.IntSet</title>
-  
-  
-  
-    <p>Compatibility typedef, like telepathy-glib's TpIntSet</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page
deleted file mode 100644 (file)
index 2e67ac0..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.SkippedStructure"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-      <link type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.SkippedStructure</title>
-  
-  
-  
-    <p>This should be skipped, and moreover, all function which
-use it should be.</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page
deleted file mode 100644 (file)
index bfd52d2..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.VaListAlias"
-      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 type="guide" xref="index"/>
-    
-  </info>
-  <title>Regress.VaListAlias</title>
-  
-  
-  
-    <p>Typedef'd va_list for additional reasons</p>
-  
-  
-  
-  
-  
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page
deleted file mode 100644 (file)
index 8dc4a72..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_skip_me"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_skip_me</api:name>
-      <api:arg>
-        <api:type>Regress.FooSkippable</api:type>
-        <api:name>fs</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_skip_me</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooSkippable)
-@returns(none)
-def foo_skip_me(fs):
-    # Python wrapper for regress_foo_skip_me()
-</code></synopsis>
-
-  
-    <p>Does something that's only interesting from C and should not be
-exposed to language bindings.</p>
-  
-  
-  
-  
-<dl>
-<dt><p>fs :</p></dt>
-<dd><p>a <link xref="Regress.FooSkippable"/></p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page
deleted file mode 100644 (file)
index 3933beb..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_some_variant"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_some_variant</api:name>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>va_list</api:type>
-        <api:name>args</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_some_variant</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(int, va_list)
-@returns(none)
-def foo_some_variant(x, args):
-    # Python wrapper for regress_foo_some_variant()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page
deleted file mode 100644 (file)
index dbe2d59..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_some_variant_ptr"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_some_variant_ptr</api:name>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>va_list</api:type>
-        <api:name>args</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_some_variant_ptr</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(int, va_list)
-@returns(none)
-def foo_some_variant_ptr(x, args):
-    # Python wrapper for regress_foo_some_variant_ptr()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>args :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page
deleted file mode 100644 (file)
index 3b2f1f3..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback</api:name>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>i</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(int, Regress.FooVarargsCallback)
-@returns(none)
-def foo_test_varargs_callback(i, callback):
-    # Python wrapper for regress_foo_test_varargs_callback()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>i :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page
deleted file mode 100644 (file)
index 3a20a84..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback2"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback2</api:name>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback2</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooVarargsCallback)
-@returns(none)
-def foo_test_varargs_callback2(callback):
-    # Python wrapper for regress_foo_test_varargs_callback2()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page
deleted file mode 100644 (file)
index b2380f3..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.foo_test_varargs_callback3"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_foo_test_varargs_callback3</api:name>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.FooVarargsCallback</api:type>
-        <api:name>callback2</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>foo_test_varargs_callback3</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.FooVarargsCallback, Regress.FooVarargsCallback)
-@returns(none)
-def foo_test_varargs_callback3(callback, callback2):
-    # Python wrapper for regress_foo_test_varargs_callback3()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>callback2 :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page
deleted file mode 100644 (file)
index 174a866..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.not_introspectable_via_alias"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_not_introspectable_via_alias</api:name>
-      <api:arg>
-        <api:type>Regress.VaListAlias</api:type>
-        <api:name>ok</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>not_introspectable_via_alias</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.VaListAlias)
-@returns(none)
-def not_introspectable_via_alias(ok):
-    # Python wrapper for regress_not_introspectable_via_alias()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>ok :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page
deleted file mode 100644 (file)
index e175dec..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.random_function_with_skipped_structure"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_random_function_with_skipped_structure</api:name>
-      <api:arg>
-        <api:type>int</api:type>
-        <api:name>x</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.SkippedStructure</api:type>
-        <api:name>foo</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>float</api:type>
-        <api:name>v</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>random_function_with_skipped_structure</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(int, Regress.SkippedStructure, float)
-@returns(none)
-def random_function_with_skipped_structure(x, foo, v):
-    # Python wrapper for regress_random_function_with_skipped_structure()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page
deleted file mode 100644 (file)
index 8dc6a48..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_skip_unannotated_callback"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_test_skip_unannotated_callback</api:name>
-      <api:arg>
-        <api:type>Regress.TestCallback</api:type>
-        <api:name>callback</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_skip_unannotated_callback</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(Regress.TestCallback)
-@returns(none)
-def test_skip_unannotated_callback(callback):
-    # Python wrapper for regress_test_skip_unannotated_callback()
-</code></synopsis>
-
-  
-    <p>Should not emit a warning:
-https://bugzilla.gnome.org/show_bug.cgi?id=685399</p>
-  
-  
-  
-  
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>No annotation here</p></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page
deleted file mode 100644 (file)
index 2f13d40..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_value_get_fundamental_object"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>Regress.TestFundamentalObject</api:type>
-      </api:returns>
-      <api:name>regress_test_value_get_fundamental_object</api:name>
-      <api:arg>
-        <api:type>GObject.Value</api:type>
-        <api:name>value</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_value_get_fundamental_object</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(GObject.Value)
-@returns(Regress.TestFundamentalObject)
-def test_value_get_fundamental_object(value):
-    # Python wrapper for regress_test_value_get_fundamental_object()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page
deleted file mode 100644 (file)
index e1efb48..0000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.test_value_set_fundamental_object"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    
-    <link type="guide" xref="index" group="function"/>
-    <api:function>
-      <api:returns>
-        <api:type>none</api:type>
-      </api:returns>
-      <api:name>regress_test_value_set_fundamental_object</api:name>
-      <api:arg>
-        <api:type>GObject.Value</api:type>
-        <api:name>value</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>Regress.TestFundamentalObject</api:type>
-        <api:name>fundamental_object</api:name>
-      </api:arg>
-    </api:function>
-
-  </info>
-  <title>test_value_set_fundamental_object</title>
-  
-<synopsis><code mime="text/x-python">
-@accepts(GObject.Value, Regress.TestFundamentalObject)
-@returns(none)
-def test_value_set_fundamental_object(value, fundamental_object):
-    # Python wrapper for regress_test_value_set_fundamental_object()
-</code></synopsis>
-
-  
-    
-  
-  
-  
-  
-<dl>
-<dt><p>value :</p></dt>
-<dd></dd>
-<dt><p>fundamental_object :</p></dt>
-<dd></dd>
-</dl>
-
-  
-  
-</page>