X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator-macros%2Fpa_wrap.ml;fp=generator-macros%2Fpa_wrap.ml;h=a31497a89899ccb08af7adee07b9c31c69f2bc4e;hb=9388e0b0ef1053a05122f6d6b8bb89339bdf2998;hp=5ce6d08a344d2cbeff309b95ed3e336413b1c9b5;hpb=53126578ee08c0bd3b3987959fb7d768deb5aedc;p=wrappi.git

diff --git a/generator-macros/pa_wrap.ml b/generator-macros/pa_wrap.ml
index 5ce6d08..a31497a 100644
--- a/generator-macros/pa_wrap.ml
+++ b/generator-macros/pa_wrap.ml
@@ -86,6 +86,16 @@ let add_typedef _loc name t =
     Wrappi_accumulator.add_typedef td
   >>
 
+let add_enum _loc name identifiers =
+  let loc = expr_of_loc _loc _loc in
+
+  <:str_item<
+    let en = { Wrappi_types.en_loc = $loc$;
+               en_name = $str:name$;
+               en_identifiers = Array.of_list $identifiers$ } in
+    Wrappi_accumulator.add_enum en
+  >>
+
 let () =
   (* Quotation expander for C code. *)
   let c_quotation_expander _loc _ code =
@@ -112,7 +122,7 @@ EXTEND Gram
   ptype: [
     [ "bool" -> <:expr< Wrappi_types.TBool >> ]
   | [ "buffer" -> <:expr< Wrappi_types.TBuffer >> ]
-      (* enum XXX *)
+  | [ "enum"; name = LIDENT -> <:expr< Wrappi_types.TEnum $str:name$ >> ]
   | [ "file" -> <:expr< Wrappi_types.TFile >> ]
   | [ "hash"; "("; t = ptype; ")" -> <:expr< Wrappi_types.THash $t$ >> ]
   | [ "int" -> <:expr< Wrappi_types.TInt >> ]
@@ -124,7 +134,7 @@ EXTEND Gram
   | [ "struct"; name = LIDENT -> <:expr< Wrappi_types.TStruct $str:name$ >> ]
   | [ "uint32" -> <:expr< Wrappi_types.TUInt32 >> ]
   | [ "uint64" -> <:expr< Wrappi_types.TUInt64 >> ]
-      (* union XXX *)
+  | [ "union"; name = LIDENT -> <:expr< Wrappi_types.TUnion $str:name$ >> ]
   | [ name = LIDENT -> <:expr< Wrappi_types.TTypedef $str:name$ >> ]
   ];
 
@@ -148,6 +158,11 @@ EXTEND Gram
       ->
       add_entry_point _loc local name parameters rtype code includes
     ]
+
+  | [ "enum"; name = LIDENT; identifiers = expr ->
+      add_enum _loc name identifiers
+    ]
+
   | [ "typedef"; t = ptype; name = LIDENT ->
       add_typedef _loc name t
     ]