Union support

2 files changed, 14 insertions, 5 deletions

diff --git a/ffi/cparser.py b/ffi/cparser.py
index c0f9bf8..f3d7a80 100644
--- a/ffi/cparser.py
+++ b/ffi/cparser.py
@@ -42,9 +42,8 @@ class Parser(object):
                 if node.decls is not None:
                     self._get_struct_or_union_type('struct', node)
             elif isinstance(node, pycparser.c_ast.Union):
-                xxx
                 if node.decls is not None:
-                    self._declare('union ' + node.name, node)
+                    self._get_struct_or_union_type('union', node)
             elif isinstance(node, pycparser.c_ast.Enum):
                 if node.values is not None:
                     xxx
@@ -178,7 +177,11 @@ class Parser(object):
         #
         decls = type.decls
         # create an empty type for now
-        tp = model.StructType(name, None, None, None)
+        if kind == 'struct':
+            tp = model.StructType(name, None, None, None)
+        else:
+            assert kind == 'union'
+            tp = model.UnionType(name, None, None, None)
         self._declarations[key] = tp
 
         #if decls is None and name is not None:
diff --git a/ffi/model.py b/ffi/model.py
index a91fed9..91a6239 100644
--- a/ffi/model.py
+++ b/ffi/model.py
@@ -76,9 +76,9 @@ class ArrayType(BaseType):
         return ffi._backend.new_array_type(ffi._get_cached_btype(self.item),
                                            self.length)
 
-class StructType(BaseType):
+class StructOrUnion(BaseType):
     _attrs_ = ('name',)
-    
+        
     is_struct_or_union_type = True
     
     def __init__(self, name, fldnames, fldtypes, fldbitsize):
@@ -94,5 +94,11 @@ class StructType(BaseType):
                              zip(self.fldnames, self.fldtypes)])
         return '<struct %s {%s}>' % (self.name, fldrepr)
 
+class StructType(StructOrUnion):
     def new_backend_type(self, ffi):
         return ffi._backend.new_struct_type(self.name)
+
+class UnionType(StructOrUnion):
+    def new_backend_type(self, ffi):
+        return ffi._backend.new_union_type(self.name)
+