[gobject-introspection] giscanner: allow (nullable) and (optional)

[Ryan Lortie <desrt src gnome org>]

commit 7089775023ccf4ea788b9b7ca34283bfffa3648b
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed May 7 22:30:05 2014 -0400

    giscanner: allow (nullable) and (optional)
    
    Add (nullable) and (optional) as recognised annotations in the same places that
    (allow-none) is allowed.  This should have been done in the previous
    commits but the tests were passing because the only ill effect was that
    a warning was issued.

 giscanner/annotationparser.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index ecbfdce..20861dc 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -959,7 +959,7 @@ class GtkDocParameter(GtkDocAnnotatable):
 
     valid_annotations = (ANN_ALLOW_NONE, ANN_ARRAY, ANN_ATTRIBUTES, ANN_CLOSURE, ANN_DESTROY,
                          ANN_ELEMENT_TYPE, ANN_IN, ANN_INOUT, ANN_OUT, ANN_SCOPE, ANN_SKIP,
-                         ANN_TRANSFER, ANN_TYPE)
+                         ANN_TRANSFER, ANN_TYPE, ANN_OPTIONAL, ANN_NULLABLE)
 
     def __init__(self, name, position=None):
         GtkDocAnnotatable.__init__(self, position)
@@ -982,7 +982,7 @@ class GtkDocTag(GtkDocAnnotatable):
     __slots__ = ('name', 'value', 'description')
 
     valid_annotations = (ANN_ALLOW_NONE, ANN_ARRAY, ANN_ATTRIBUTES, ANN_ELEMENT_TYPE, ANN_SKIP,
-                         ANN_TRANSFER, ANN_TYPE)
+                         ANN_TRANSFER, ANN_TYPE, ANN_NULLABLE, ANN_OPTIONAL)
 
     def __init__(self, name, position=None):
         GtkDocAnnotatable.__init__(self, position)