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

diff --git a/generator-macros/pa_wrap.ml b/generator-macros/pa_wrap.ml
index 54e3676..5ce6d08 100644
--- a/generator-macros/pa_wrap.ml
+++ b/generator-macros/pa_wrap.ml
@@ -39,28 +39,63 @@ let expr_of_option _loc = function
   | None -> <:expr< None >>
   | Some x -> <:expr< Some $x$ >>
 
-let add_entry_point _loc name parameters return_type code =
+(* 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 local name parameters rtype code includes =
+  let loc = expr_of_loc _loc _loc in
+
+  let local =
+    match local with None -> <:expr< false >> | _ -> <:expr< true >> in
+
   let parameters = List.map (
-    fun (name, t) -> <:expr< ($str:name$, $t$) >>
+    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
 
+  let includes = match includes with None -> <:expr< [] >> | Some xs -> xs in
+
   <:str_item<
-    let ep = { Wrappi_types.ep_name = $str:name$;
-               ep_params = $parameters$;
-               ep_return = $return_type$;
-               ep_code = $code$ } in
-    Wrappi_globals.add_entry_point ep
+    let ep = { Wrappi_types.ep_loc = $loc$;
+               ep_local = $local$;
+               ep_name = $str:name$;
+               ep_ftype = ($rtype$, $parameters$, []);
+               ep_code = $code$;
+               ep_includes = $includes$ } 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 =
+    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;
 
@@ -74,27 +109,47 @@ EXTEND Gram
   GLOBAL: str_item;
 
   (* A parameter or return type. *)
-  any_type: [
-    [ "int32" -> <:expr< Wrappi_types.TInt32 >> ]
+  ptype: [
+    [ "bool" -> <:expr< Wrappi_types.TBool >> ]
+  | [ "buffer" -> <:expr< Wrappi_types.TBuffer >> ]
+      (* enum XXX *)
+  | [ "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 >> ]
-  | [ t = LIDENT -> <:expr< Wrappi_types.Type $str:t$ >> ]
+  | [ "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 >> ]
+      (* union XXX *)
+  | [ name = LIDENT -> <:expr< Wrappi_types.TTypedef $str:name$ >> ]
   ];
 
   (* A return type. *)
-  return_type: [
-    [ "err" -> <:expr< Wrappi_types.RErr >> ]
-  | [ t = any_type -> <:expr< Wrappi_types.Return $t$ >> ]
+  rtype: [
+    [ "void" -> <:expr< Wrappi_types.RVoid >> ]
+  | [ "static_string" -> <:expr< Wrappi_types.RStaticString >> ]
+  | [ t = ptype -> <:expr< Wrappi_types.Return $t$ >> ]
   ];
 
-  (* A single function parameter. *)
-  parameter: [[ t = any_type; name = LIDENT -> (name, t) ]];
+  (* 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;
+      local = OPT "local";
+      rtype = rtype; name = LIDENT;
       "("; parameters = LIST0 parameter SEP ","; ")";
-      code = OPT [ code = expr -> code ] ->
-      add_entry_point _loc name parameters return_type code
+      code = OPT [ code = expr -> code ];
+      includes = OPT [ "includes"; includes = expr -> includes ]
+      ->
+      add_entry_point _loc local name parameters rtype code includes
+    ]
+  | [ "typedef"; t = ptype; name = LIDENT ->
+      add_typedef _loc name t
     ]
   ];