IDL: Use IdlNullableType wrapper to represent nullable types

Source/bindings/scripts/idl_definitions.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 44 matching lines @@
     IdlException < IdlInterface
         (same contents as IdlInterface)
 
 TypedObject :: mixin for typedef resolution
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-compiler
 """
 
 import abc
 
-from idl_types import IdlType, IdlUnionType, IdlArrayType, IdlSequenceType
+from idl_types import IdlType, IdlUnionType, IdlArrayType, IdlSequenceType, IdlNullableType
 
 SPECIAL_KEYWORD_LIST = ['GETTER', 'SETTER', 'DELETER']
 STANDARD_TYPEDEFS = {
     # http://www.w3.org/TR/WebIDL/#common-DOMTimeStamp
     'DOMTimeStamp': 'unsigned long long',
 }
 
 
 ################################################################################
 # TypedObject (mixin for typedef resolution)
@@ skipping 672 matching lines @@
 
 ################################################################################
 # Types
 ################################################################################
 
 def type_node_to_type(node):
     children = node.GetChildren()
     if len(children) < 1 or len(children) > 2:
         raise ValueError('Type node expects 1 or 2 children (type + optional array []), got %s (multi-dimensional arrays are not supported).' % len(children))
 
-    is_nullable = node.GetProperty('NULLABLE') or False  # syntax: T?
-    type_node_child = children[0]
-    base_type = type_node_inner_to_type(type_node_child, is_nullable=is_nullable)
+    base_type = type_node_inner_to_type(children[0])
+
+    if node.GetProperty('NULLABLE'):
+        base_type = IdlNullableType(base_type)
 
     if len(children) == 2:
         array_node = children[1]
         array_node_class = array_node.GetClass()
         if array_node_class != 'Array':
             raise ValueError('Expected Array node as TypeSuffix, got %s node.' % array_node_class)
-        array_is_nullable = array_node.GetProperty('NULLABLE') or False
-        return IdlArrayType(base_type, is_nullable=array_is_nullable)
+        array_type = IdlArrayType(base_type)
+        if array_node.GetProperty('NULLABLE'):
+            return IdlNullableType(array_type)
+        return array_type
 
     return base_type
 
 
-def type_node_inner_to_type(node, is_nullable=False):
-    # FIXME: remove is_nullable once have IdlNullableType
+def type_node_inner_to_type(node):
     node_class = node.GetClass()
     # Note Type*r*ef, not Typedef, meaning the type is an identifier, thus
     # either a typedef shorthand (but not a Typedef declaration itself) or an
     # interface type. We do not distinguish these, and just use the type name.
     if node_class in ['PrimitiveType', 'Typeref']:
         # unrestricted syntax: unrestricted double | unrestricted float
         is_unrestricted = node.GetProperty('UNRESTRICTED') or False
-        return IdlType(node.GetName(), is_nullable=is_nullable, is_unrestricted=is_unrestricted)
+        return IdlType(node.GetName(), is_unrestricted=is_unrestricted)
     elif node_class == 'Any':
-        return IdlType('any', is_nullable=is_nullable)
+        return IdlType('any')
     elif node_class == 'Sequence':
-        sequence_is_nullable = node.GetProperty('NULLABLE') or False
-        return sequence_node_to_type(node, is_nullable=sequence_is_nullable)
+        return sequence_node_to_type(node)
     elif node_class == 'UnionType':
-        return union_type_node_to_idl_union_type(node, is_nullable=is_nullable)
+        return union_type_node_to_idl_union_type(node)
     raise ValueError('Unrecognized node class: %s' % node_class)
 
 
-def sequence_node_to_type(node, is_nullable=False):
+def sequence_node_to_type(node):
     children = node.GetChildren()
     if len(children) != 1:
         raise ValueError('Sequence node expects exactly 1 child, got %s' % len(children))
     sequence_child = children[0]
     sequence_child_class = sequence_child.GetClass()
     if sequence_child_class != 'Type':
         raise ValueError('Unrecognized node class: %s' % sequence_child_class)
     element_type = type_node_to_type(sequence_child)

[haraken, 2014/08/15 07:43:57]

Nit: element_type => sequence_type (or remove element_type)

[Jens Widell, 2014/08/15 08:00:08]

It *is* the element type of the sequence (i.e. sequence_type.element_type). But
dropping the local variable would be fine.

-    return IdlSequenceType(element_type, is_nullable=is_nullable)
+    sequence_type = IdlSequenceType(element_type)
+    if node.GetProperty('NULLABLE'):
+        return IdlNullableType(sequence_type)
+    return sequence_type
 
 
 def typedef_node_to_type(node):
     children = node.GetChildren()
     if len(children) != 1:
         raise ValueError('Typedef node with %s children, expected 1' % len(children))
     child = children[0]
     child_class = child.GetClass()
     if child_class != 'Type':
         raise ValueError('Unrecognized node class: %s' % child_class)
     return type_node_to_type(child)
 
 
-def union_type_node_to_idl_union_type(node, is_nullable=False):
+def union_type_node_to_idl_union_type(node):
     member_types = [type_node_to_type(member_type_node)
                     for member_type_node in node.GetChildren()]
-    return IdlUnionType(member_types, is_nullable=is_nullable)
+    return IdlUnionType(member_types)