Expose the underlying record type and add fieldslib getters/setters

For mirage#38

Author: avsm

cohttp/request.ml

@@ -16,18 +16,12 @@
  *)
 
 type t = { 
-  headers: Header.t;
-  meth: Code.meth;
-  uri: Uri.t;
-  version: Code.version;
-  encoding: Transfer.encoding;
-}
-
-let headers r = r.headers
-let meth r = r.meth
-let uri r = r.uri
-let version r = r.version
-let encoding r = r.encoding
+  mutable headers: Header.t;
+  mutable meth: Code.meth;
+  mutable uri: Uri.t;
+  mutable version: Code.version;
+  mutable encoding: Transfer.encoding;
+} with fields
 
 let make ?(meth=`GET) ?(version=`HTTP_1_1) ?encoding ?headers uri =
   let headers = 
@@ -58,36 +52,6 @@ let make_for_client ?headers ?(chunked=true) ?(body_length=0) meth uri =
   in
   make ~meth ~encoding ?headers uri
 
-module type T = sig
-  val headers : t -> Header.t
-  val meth : t -> Code.meth
-  (** Retrieve full HTTP request uri *)
-  val uri : t -> Uri.t
-
-  (** Retrieve HTTP version, usually 1.1 *)
-  val version : t -> Code.version
-
-  (** Retrieve the transfer encoding of this HTTP request *)
-  val encoding : t -> Transfer.encoding
-
-  (** TODO *)
-  val params : t -> (string * string list) list
-
-  (** TODO *)
-  val get_param : t -> string -> string option
-
-  val make : ?meth:Code.meth -> ?version:Code.version -> 
-    ?encoding:Transfer.encoding -> ?headers:Header.t ->
-    Uri.t -> t
-
-  val make_for_client:
-    ?headers:Header.t ->
-    ?chunked:bool ->
-    ?body_length:int ->
-    Code.meth -> Uri.t -> t
-end
-
-
 module type S = sig
   module IO : IO.S
 

cohttp/request.mli

@@ -21,7 +21,13 @@
     the {!headers}, {!version}, {!meth} and {!uri}.  The body is handled by
     the separate {!S} module type, as it is dependent on the IO 
     implementation. *)
-type t
+type t = {
+  mutable headers: Header.t;
+  mutable meth: Code.meth;
+  mutable uri: Uri.t;
+  mutable version: Code.version;
+  mutable encoding: Transfer.encoding;
+} with fields
 
 (** Retrieve the HTTP request headers *)
 val headers : t -> Header.t

cohttp/response.ml

@@ -1,5 +1,5 @@
 (*
- * Copyright (c) 2012 Anil Madhavapeddy <[email protected]>
+ * Copyright (c) 2012-2013 Anil Madhavapeddy <[email protected]>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,12 +20,7 @@ type t = {
   headers: Header.t;
   version: Code.version;
   status: Code.status_code;
-}
-
-let headers r = r.headers
-let encoding r = r.encoding
-let version r = r.version
-let status r = r.status
+} with fields
 
 let make ?(version=`HTTP_1_1) ?(status=`OK) ?(encoding=Transfer.Chunked) ?headers () =
   let headers = match headers with None -> Header.init () |Some h -> h in

cohttp/response.mli

@@ -15,7 +15,12 @@
  *
  *)
 
-type t
+type t = {
+  encoding: Transfer.encoding;
+  headers: Header.t;
+  version: Code.version;
+  status: Code.status_code;
+} with fields
 
 (** Retrieve response HTTP headers *)
 val headers : t -> Header.t