X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator-macros%2Fpa_wrap.ml;h=bfe28fba82d9719b9d377a77be7302bb58228309;hb=6d0ffdb7821c34fb807ddd277c216a050a479284;hp=c176fe2abd1f6ff70f1b47c8eedc50ca451cff9c;hpb=f4ef980b13bde6e00fa918e35fd834a9fe824d0e;p=wrappi.git

diff --git a/generator-macros/pa_wrap.ml b/generator-macros/pa_wrap.ml
index c176fe2..bfe28fb 100644
--- a/generator-macros/pa_wrap.ml
+++ b/generator-macros/pa_wrap.ml
@@ -86,12 +86,41 @@ 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 add_struct _loc name fields =
+  let loc = expr_of_loc _loc _loc in
+
+  let fields = List.map (
+    fun (name, t) -> <:expr< ($str:name$, $t$) >>
+  ) fields in
+  let fields = expr_of_list _loc fields in
+
+  <:str_item<
+    let sd = { Wrappi_types.sd_loc = $loc$;
+               sd_name = $str:name$;
+               sd_fields = Array.of_list $fields$ } in
+    Wrappi_accumulator.add_struct sd
+  >>
+
 let () =
   (* Quotation expander for C code. *)
   let c_quotation_expander _loc _ code =
+    let loc = expr_of_loc _loc _loc in
+
     (* XXX Expand %- or $- expressions in code. *)
     (* XXX Escape >> in code. *)
-    ExStr (_loc, code)
+
+    <:expr< { Wrappi_types.cc_loc = $loc$;
+              cc_code = $str:code$ } >>
   in
   Quotation.add "c" Quotation.DynAst.expr_tag c_quotation_expander;
 
@@ -108,7 +137,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 >> ]
@@ -120,19 +149,23 @@ 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$ >> ]
   ];
 
   (* A return type. *)
   rtype: [
     [ "void" -> <:expr< Wrappi_types.RVoid >> ]
+  | [ "static_string" -> <:expr< Wrappi_types.RStaticString >> ]
   | [ t = ptype -> <:expr< Wrappi_types.Return $t$ >> ]
   ];
 
   (* A single function parameter.  XXX Preconditions. *)
   parameter: [[ t = ptype; name = LIDENT -> (name, t) ]];
 
+  (* A single struct field.  XXX Preconditions. *)
+  struct_field: [[ t = ptype; name = LIDENT -> (name, t) ]];
+
   str_item: LEVEL "top" [
     [ "entry_point";
       local = OPT "local";
@@ -143,6 +176,17 @@ EXTEND Gram
       ->
       add_entry_point _loc local name parameters rtype code includes
     ]
+
+  | [ "enum"; name = LIDENT; identifiers = expr ->
+      add_enum _loc name identifiers
+    ]
+
+  | [ "struct"; name = LIDENT; "{";
+      fields = LIST0 struct_field SEP ";";
+      "}" ->
+      add_struct _loc name fields
+    ]
+
   | [ "typedef"; t = ptype; name = LIDENT ->
       add_typedef _loc name t
     ]