giscanner: change some internal field logic

Replace the 'allow_none' field on parameters with two separate fields:
'nullable' and 'optional'.

Currently, we use 'nullable' to mean the same thing as 'allow-none' for
normal (non-out) parameters.  For out parameters, we use the 'optional'
field instead.

Note that the special case for GCancellable and GAsyncReadyCallback is
already guarded by a check for being an in parameter, so we always use
'nullable' here.

On the .gir writer side, we decide which variable to consult when
writing the allow-none attribute depending on the parameter direction.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index 8fad0d70..5f4788a3 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -580,12 +580,15 @@ class MainTransformer(object):
         self._adjust_container_type(parent, node, annotations)
 
         if ANN_ALLOW_NONE in annotations:
-            node.allow_none = True
+            if node.direction == ast.PARAM_DIRECTION_OUT:
+                node.optional = True
+            else:
+                node.nullable = True
 
         if (node.direction == ast.PARAM_DIRECTION_IN and
                 (node.type.target_giname == 'Gio.AsyncReadyCallback' or
                  node.type.target_giname == 'Gio.Cancellable')):
-            node.allow_none = True
+            node.nullable = True
 
         if tag and tag.description:
             node.doc = tag.description