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, 9 insertions, 1 deletions

diff --git a/giscanner/ast.py b/giscanner/ast.py
index 130f50c5..35a764a7 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -780,7 +780,15 @@ class Parameter(TypeContainer):
         TypeContainer.__init__(self, typenode, transfer)
         self.argname = argname
         self.direction = direction
-        self.allow_none = allow_none
+        self.nullable = False
+        self.optional = False
+
+        if allow_none:
+            if self.direction == PARAM_DIRECTION_OUT:
+                self.optional = True
+            else:
+                self.nullable = True
+
         self.scope = scope
         self.caller_allocates = caller_allocates
         self.closure_name = None