X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator-macros%2Fpa_wrap.ml;h=b4fea3a7275d4afab0e84db210986d61e56aa429;hb=6964a24290a2d645b3155353e08750f37930146a;hp=c8e8af897b91ed7ca16361293bae70ee16afc7e3;hpb=dd0daf1a3b75447fe5d1317e2e65e027d10e7697;p=wrappi.git

diff --git a/generator-macros/pa_wrap.ml b/generator-macros/pa_wrap.ml
index c8e8af8..b4fea3a 100644
--- a/generator-macros/pa_wrap.ml
+++ b/generator-macros/pa_wrap.ml
@@ -18,6 +18,7 @@
 
 (* For general information about camlp4, see:
  * http://brion.inria.fr/gallium/index.php/Camlp4
+ *
  * For information about quotations, see:
  * http://brion.inria.fr/gallium/index.php/Quotation
  *)
@@ -28,14 +29,61 @@ open Ast
 
 open Wrappi_types
 
-let add_entry_point _loc name parameters return_type code =
-  (* XXX *)
-  <:str_item< >>
+(* Convert a plain list into a list AST. *)
+let rec expr_of_list _loc = function
+  | [] -> <:expr< [] >>
+  | h::t -> let t = expr_of_list _loc t in <:expr< $h$ :: $t$ >>
+
+(* Convert an optional type into an option AST. *)
+let expr_of_option _loc = function
+  | None -> <:expr< None >>
+  | Some x -> <:expr< Some $x$ >>
+
+(* Convert a _loc to an AST. *)
+let expr_of_loc _loc loc =
+  let file_name,
+    start_line, start_bol, start_off,
+    stop_line, stop_bol, stop_off,
+    ghost = Loc.to_tuple loc in
+  <:expr< Camlp4.PreCast.Loc.of_tuple
+    ($str:file_name$,
+     $`int:start_line$, $`int:start_bol$, $`int:start_off$,
+     $`int:stop_line$, $`int:stop_bol$, $`int:stop_off$,
+     $`bool:ghost$) >>
+
+let add_entry_point _loc name parameters rtype code =
+  let loc = expr_of_loc _loc _loc in
+
+  let parameters = List.map (
+    fun (name, t) -> <:expr< ($str:name$, $t$, None) >>
+  ) parameters in
+  let parameters = expr_of_list _loc parameters in
+
+  let code = expr_of_option _loc code in
+
+  <:str_item<
+    let ep = { Wrappi_types.ep_loc = $loc$;
+               ep_name = $str:name$;
+               ep_ftype = ($rtype$, $parameters$, []);
+               ep_code = $code$ } in
+    Wrappi_accumulator.add_entry_point ep
+  >>
+
+let add_typedef _loc name t =
+  let loc = expr_of_loc _loc _loc in
+
+  <:str_item<
+    let td = { Wrappi_types.td_loc = $loc$;
+               td_name = $str:name$;
+               td_type = $t$ } in
+    Wrappi_accumulator.add_typedef td
+  >>
 
 let () =
   (* Quotation expander for C code. *)
   let c_quotation_expander _loc _ code =
     (* XXX Expand %- or $- expressions in code. *)
+    (* XXX Escape >> in code. *)
     ExStr (_loc, code)
   in
   Quotation.add "c" Quotation.DynAst.expr_tag c_quotation_expander;
@@ -50,27 +98,40 @@ EXTEND Gram
   GLOBAL: str_item;
 
   (* A parameter or return type. *)
-  any_type: [
-    [ "int32" -> TInt32 ]
-  | [ "int64" -> TInt64 ]
-  | [ t = LIDENT -> Type t ]
+  ptype: [
+    [ "buffer" -> <:expr< Wrappi_types.TBuffer >> ]
+  | [ "file" -> <:expr< Wrappi_types.TFile >> ]
+  | [ "hash"; "("; t = ptype; ")" -> <:expr< Wrappi_types.THash $t$ >> ]
+  | [ "int" -> <:expr< Wrappi_types.TInt >> ]
+  | [ "int32" -> <:expr< Wrappi_types.TInt32 >> ]
+  | [ "int64" -> <:expr< Wrappi_types.TInt64 >> ]
+  | [ "list"; "("; t = ptype; ")" -> <:expr< Wrappi_types.TList $t$ >> ]
+  | [ "nullable"; "("; t = ptype; ")" -> <:expr< Wrappi_types.TNullable $t$ >> ]
+  | [ "string" -> <:expr< Wrappi_types.TString >> ]
+  | [ "struct"; name = LIDENT -> <:expr< Wrappi_types.TStruct $str:name$ >> ]
+  | [ "uint32" -> <:expr< Wrappi_types.TUInt32 >> ]
+  | [ "uint64" -> <:expr< Wrappi_types.TUInt64 >> ]
+  | [ name = LIDENT -> <:expr< Wrappi_types.TTypedef $str:name$ >> ]
   ];
 
   (* A return type. *)
-  return_type: [
-    [ "err" -> RErr ]
-  | [ t = any_type -> Return t ]
+  rtype: [
+    [ "err" -> <:expr< Wrappi_types.RErr >> ]
+  | [ t = ptype -> <:expr< Wrappi_types.Return $t$ >> ]
   ];
 
-  (* A single function parameter. *)
-  parameter: [[ t = any_type; name = LIDENT -> (t, name) ]];
+  (* A single function parameter.  XXX Preconditions. *)
+  parameter: [[ t = ptype; name = LIDENT -> (name, t) ]];
 
   str_item: LEVEL "top" [
     [ "entry_point";
-      return_type = return_type; name = LIDENT;
+      rtype = rtype; name = LIDENT;
       "("; parameters = LIST0 parameter SEP ","; ")";
       code = OPT [ code = expr -> code ] ->
-      add_entry_point _loc name parameters return_type code
+      add_entry_point _loc name parameters rtype code
+    ]
+  | [ "typedef"; t = ptype; name = LIDENT ->
+      add_typedef _loc name t
     ]
   ];