Skip to content

Commit

Permalink
v0.12-preview.120.18+252
Browse files Browse the repository at this point in the history
  • Loading branch information
xclerc committed Jan 16, 2019
1 parent 0f729c6 commit a4c2a41
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 57 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2005--2018 Jane Street Group, LLC <[email protected]>
Copyright (c) 2005--2019 Jane Street Group, LLC <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)

# Default rule
default:
jbuilder build @install
dune build

install:
jbuilder install $(INSTALL_ARGS)
dune install $(INSTALL_ARGS)

uninstall:
jbuilder uninstall $(INSTALL_ARGS)
dune uninstall $(INSTALL_ARGS)

reinstall: uninstall install

clean:
rm -rf _build
dune clean

.PHONY: default install uninstall reinstall clean
7 changes: 3 additions & 4 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ s-expressions. S-expressions are defined by the following type:
type sexp = Atom of string | List of sexp list
#+end_src


** Usage example

In this example we build an Sexp expression that corresponds to
=(This (is an) (s expression))=, serialize a Sexp expression into a string,
and then parse a string into an Sexp.
In this example we build an s-expression that corresponds to =(This
(is an) (s expression))=, serialize that into a string, and then parse
the string back into an s-expression.

#+begin_src ocaml
open Sexplib
Expand Down
1 change: 1 addition & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(lang dune 1.5)
2 changes: 2 additions & 0 deletions num/lib/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(library (name sexplib_num) (public_name sexplib.num) (libraries num sexplib)
(preprocess no_preprocessing))
8 changes: 0 additions & 8 deletions num/lib/jbuild

This file was deleted.

14 changes: 7 additions & 7 deletions sexplib.opam
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
opam-version: "1.2"
opam-version: "2.0"
maintainer: "[email protected]"
authors: ["Jane Street Group, LLC <[email protected]>"]
homepage: "https://github.com/janestreet/sexplib"
bug-reports: "https://github.com/janestreet/sexplib/issues"
dev-repo: "git+https://github.com/janestreet/sexplib.git"
doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib/index.html"
license: "MIT"
build: [
["jbuilder" "build" "-p" name "-j" jobs]
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.04.2"}
"parsexp"
"sexplib0"
"jbuilder" {build & >= "1.0+beta18.1"}
"dune" {build & >= "1.5.1"}
"num"
]
available: [ ocaml-version >= "4.04.2" ]
descr: "
Library for serializing OCaml values to and from S-expressions

synopsis: "Library for serializing OCaml values to and from S-expressions"
description: "
Part of Jane Street's Core library
The Core suite of libraries is an industrial strength alternative to
OCaml's standard library that was developed by Jane Street, the
Expand Down
6 changes: 6 additions & 0 deletions src/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(library (name sexplib) (libraries bigarray parsexp sexplib0)
(public_name sexplib) (preprocess no_preprocessing))

(ocamllex lexer)

(ocamlyacc parser parser_with_layout)
12 changes: 0 additions & 12 deletions src/jbuild

This file was deleted.

2 changes: 2 additions & 0 deletions src/sexp_intf.ml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ module type S = sig

val compare : t -> t -> int

val equal : t -> t -> bool

(** {6 Defaults} *)

val default_indent : int ref
Expand Down
3 changes: 3 additions & 0 deletions test/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(library (name sexplib_ounit_tests)
(libraries expect_test_helpers_kernel sexplib str unix)
(preprocess (pps ppx_jane)))
12 changes: 0 additions & 12 deletions test/jbuild

This file was deleted.

2 changes: 2 additions & 0 deletions unix/lib/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(library (name sexplib_unix) (public_name sexplib.unix)
(libraries sexplib unix) (preprocess no_preprocessing))
8 changes: 0 additions & 8 deletions unix/lib/jbuild

This file was deleted.

0 comments on commit a4c2a41

Please sign in to comment.