v0.12-preview.120.18+252

Author: xclerc

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2016--2018 Jane Street Group, LLC <[email protected]>
+Copyright (c) 2016--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

Makefile

@@ -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

README.org

@@ -20,7 +20,7 @@ $ opam install base
 #+end_src
 
 Base has no runtime dependencies and is fast to build. Its sole build
-dependency is [[https://github.com/janestreet/jbuilder][jbuilder]], which itself requires nothing more than the
+dependency is [[https://github.com/ocaml/dune][dune]], which itself requires nothing more than the
 compiler.
 
 ** Using the OCaml standard library with Base
@@ -159,8 +159,8 @@ The Base specific coding rules are checked by =ppx_base_lint=, in the
 =lint= subfolder. The indentation rules are checked by a wrapper around
 =ocp-indent= and the coding style rules are checked by =ppx_js_style=.
 
-These checks are currently not run by =jbuilder=, but it will soon get
-a =-dev= flag to run them automatically.
+These checks are currently not run by =dune=, but it will soon get a
+=-dev= flag to run them automatically.
 
 ** Roadmap
 

ROADMAP.md

@@ -91,7 +91,7 @@
     and to maintain it on an ongoing basis. See `bench/bench_int.ml` for
     examples.
 
-  - [ ] Optimize `Lazy.compare` by performing a `phys_equal` check before
+  - [X] Optimize `Lazy.compare` by performing a `phys_equal` check before
     forcing the lazy value. Note that this will also change the semantics of
     `compare` and should be documented and rolled out with care.
 

base.opam

@@ -1,24 +1,24 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "[email protected]"
 authors: ["Jane Street Group, LLC <[email protected]>"]
 homepage: "https://github.com/janestreet/base"
 bug-reports: "https://github.com/janestreet/base/issues"
 dev-repo: "git+https://github.com/janestreet/base.git"
+doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/base/index.html"
 license: "MIT"
 build: [
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
+  "ocaml" {>= "4.04.2"}
   "sexplib0"
-  "jbuilder" {build & >= "1.0+beta18.1"}
+  "dune"     {build & >= "1.5.1"}
 ]
 depopts: [
   "base-native-int63"
 ]
-available: [ ocaml-version >= "4.04.2" ]
-descr: "
-Full standard library replacement for OCaml
-
+synopsis: "Full standard library replacement for OCaml"
+description: "
 Full standard library replacement for OCaml
 
 Base is a complete and portable alternative to the OCaml standard

compiler-stdlib/gen/dune

@@ -0,0 +1,3 @@
+(executables (names gen)
+ (libraries compiler-libs.common compiler-libs.bytecomp)
+ (preprocess no_preprocessing))

compiler-stdlib/gen/jbuild

@@ -0,0 +1,4 @@
+(library (name caml) (public_name base.caml) (preprocess no_preprocessing))
+
+(rule (targets caml.ml) (deps (:first_dep ../gen/gen.exe))
+ (action (run %{first_dep} -ocaml-where %{ocaml_where} -o %{targets})))

compiler-stdlib/src/dune

@@ -0,0 +1 @@
+(lang dune 1.5)

compiler-stdlib/src/jbuild

@@ -0,0 +1,2 @@
+(executables (names generate_pow_overflow_bounds) (libraries num)
+ (preprocess no_preprocessing))

dune-project

@@ -0,0 +1,3 @@
+(library (name ppx_base_lint) (kind ppx_rewriter)
+ (libraries compiler-libs.common base ppxlib)
+ (preprocess no_preprocessing))

generate/dune

@@ -0,0 +1,2 @@
+(library (name md5_lib) (public_name base.md5) (preprocess no_preprocessing)
+ (libraries) (js_of_ocaml (javascript_files)))

generate/jbuild

@@ -0,0 +1,4 @@
+(executables (names gen) (libraries str compiler-libs.common caml)
+ (link_flags -linkall) (preprocess no_preprocessing))
+
+(ocamllex mapper)

lint/dune

@@ -15,7 +15,7 @@ let deprecated_msg what =
   sprintf
     "[@@deprecated \"\\\n\
      [2016-09] this element comes from the stdlib distributed with OCaml.\n\
-     Refering to the stdlib directly is discouraged by Base. You should either\n\
+     Referring to the stdlib directly is discouraged by Base. You should either\n\
      use the equivalent functionality offered by Base, or if you really want to\n\
      refer to the stdlib, use Caml.%s instead\"]"
     what

lint/jbuild

@@ -0,0 +1,9 @@
+(library (name shadow_stdlib) (public_name base.shadow_stdlib)
+ (libraries caml) (preprocess no_preprocessing))
+
+(rule (targets shadow_stdlib.mli)
+ (deps (:first_dep ../gen/gen.exe)
+  ../../compiler-stdlib/src/.caml.objs/caml.cmi)
+ (action
+  (run %{first_dep} -caml-cmi ../../compiler-stdlib/src/.caml.objs/caml.cmi
+   -o %{targets})))

md5/src/dune

@@ -1,5 +1,8 @@
 #include <caml/mlvalues.h>
 
+/* The default [Base_am_testing] value is [false]. [ppx_inline_test] overrides
+   the default by linking against an implementation of [Base_am_testing] that 
+   returns [true]. */
 CAMLprim CAMLweakdef value Base_am_testing()
 {
   return Val_false;

md5/src/jbuild

@@ -0,0 +1,11 @@
+#ifndef BASE_AM_TESTING_H
+#define BASE_AM_TESTING_H
+#include <caml/mlvalues.h>
+
+CAMLprim value Base_am_testing ();
+
+static inline int am_testing () {
+  return Bool_val (Base_am_testing ());
+}
+
+#endif

shadow-stdlib/gen/dune

@@ -98,7 +98,7 @@ module Make_args' (X : S2) = struct
 
   type ('f, 'r, 'e) t_ = { applyN : ('f, 'e) X.t -> ('r, 'e) X.t }
 
-  let nil = { applyN = fun x -> x }
+  let nil = { applyN = Fn.id }
 
   let cons arg t = { applyN = fun d -> t.applyN (apply d arg) }
 

shadow-stdlib/gen/jbuild

@@ -66,11 +66,14 @@ module Sort = struct
   (* http://en.wikipedia.org/wiki/Insertion_sort *)
   module Insertion_sort : Sort = struct
     let sort arr ~compare ~left ~right =
-      let insert pos v =
+      (* loop invariant:
+         [arr] is sorted from [left] to [pos - 1], inclusive *)
+      for pos = left + 1 to right do
         (* loop invariants:
            1.  the subarray arr[left .. i-1] is sorted
            2.  the subarray arr[i+1 .. pos] is sorted and contains only elements > v
            3.  arr[i] may be thought of as containing v *)
+        let v = get arr pos in
         let rec loop i =
           let i_next = i - 1 in
           if i_next >= left && compare (get arr i_next) v > 0 then begin
@@ -81,11 +84,6 @@ module Sort = struct
         in
         let final_pos = loop pos in
         set arr final_pos v
-      in
-      (* loop invariant:
-         arr is sorted from left to i-1, inclusive *)
-      for i = left + 1 to right do
-        insert i (get arr i)
       done
     ;;
   end