Merge pull request mirage#4 from avsm/master

add sexp representation

.travis-ci.sh

@@ -1,4 +1,4 @@
-OPAM_DEPENDS="ocamlfind ounit re"
+OPAM_DEPENDS="ocamlfind ounit re sexplib"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
 3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;

.travis.yml

@@ -1,9 +1,6 @@
 language: c
 script: bash -ex .travis-ci.sh
 env:
-  - OCAML_VERSION=4.01.0 OPAM_VERSION=1.0.0
   - OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
-  - OCAML_VERSION=4.00.1 OPAM_VERSION=1.0.0
   - OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
-  - OCAML_VERSION=3.12.1 OPAM_VERSION=1.0.0
   - OCAML_VERSION=3.12.1 OPAM_VERSION=1.1.0

CHANGES

@@ -1,3 +1,7 @@
+1.3.13 (2014-01-16):
+* Remove internal use of Scanf.
+* Expose `with sexp` for the Uri types.
+
 1.3.12 (2013-12-28):
 * Be lenient about decoding incorrect encoded percent-strings (#31).
 * Improve ocamldoc for `Uri.of_string`.

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        uri
-Version:     1.3.12
+Version:     1.3.13
 Synopsis:    RFC3986 URI parsing library
 Description: Uniform Resource Identifier (URI) parsing and encoding.
   This is pure OCaml code.
@@ -19,7 +19,7 @@ Flag allservices
 Library uri
   Path:       lib
   Modules:    Uri,Uri_re,Uri_IP
-  BuildDepends: re.posix,re.str
+  builddepends: re.posix,re.str,sexplib.syntax,sexplib
 
 Library services
   Path:       lib
@@ -68,7 +68,7 @@ Executable test_runner
   Custom:             true
   CompiledObject:     best
   Install:            false
-  BuildDepends:       uri,oUnit (>= 1.0.2)
+  BuildDepends:       uri,oUnit (>= 1.0.2), sexplib
 
 Test test_runner
   Run$:               flag(tests)

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 4cc617d0bcf5be70c3a5568962317839)
+# DO NOT EDIT (digest: 5e2045283b9231f462754a8c50f83611)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -20,19 +20,25 @@
 # Library services_full
 "lib/services_full.cmxs": use_services_full
 <lib/*.ml{,i}>: use_uri
+<lib/*.ml{,i}>: pkg_sexplib
 <lib/*.ml{,i}>: pkg_re.posix
 <lib/*.ml{,i}>: pkg_re.str
+<lib/*.ml{,i}>: pkg_sexplib.syntax
 # Library uri_top
 "top/uri_top.cmxs": use_uri_top
 # Executable test_runner
 <lib_test/test_runner.{native,byte}>: use_uri
 <lib_test/test_runner.{native,byte}>: pkg_oUnit
+<lib_test/test_runner.{native,byte}>: pkg_sexplib
 <lib_test/test_runner.{native,byte}>: pkg_re.posix
 <lib_test/test_runner.{native,byte}>: pkg_re.str
+<lib_test/test_runner.{native,byte}>: pkg_sexplib.syntax
 <lib_test/*.ml{,i}>: use_uri
 <lib_test/*.ml{,i}>: pkg_oUnit
+<lib_test/*.ml{,i}>: pkg_sexplib
 <lib_test/*.ml{,i}>: pkg_re.posix
 <lib_test/*.ml{,i}>: pkg_re.str
+<lib_test/*.ml{,i}>: pkg_sexplib.syntax
 <lib_test/test_runner.{native,byte}>: custom
 # OASIS_STOP
 true: annot

lib/META

@@ -1,15 +1,15 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9b6e0da7a42d6e5e18efd4d1644cd1e5)
-version = "1.3.12"
+# DO NOT EDIT (digest: 5c02b18662382143aa950ceed60f41c9)
+version = "1.3.13"
 description = "RFC3986 URI parsing library"
-requires = "re.posix re.str"
+requires = "re.posix re.str sexplib.syntax sexplib"
 archive(byte) = "uri.cma"
 archive(byte, plugin) = "uri.cma"
 archive(native) = "uri.cmxa"
 archive(native, plugin) = "uri.cmxs"
 exists_if = "uri.cma"
 package "top" (
- version = "1.3.12"
+ version = "1.3.13"
  description = "Toplevel printers for URIs"
  requires = "uri"
  archive(byte) = "uri_top.cma"
@@ -20,7 +20,7 @@ package "top" (
 )
 
 package "services_full" (
- version = "1.3.12"
+ version = "1.3.13"
  description = "RFC3986 URI parsing library"
  requires = "uri"
  archive(byte) = "services_full.cma"
@@ -31,7 +31,7 @@ package "services_full" (
 )
 
 package "services" (
- version = "1.3.12"
+ version = "1.3.13"
  description = "RFC3986 URI parsing library"
  requires = "uri"
  archive(byte) = "services.cma"