Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge commit 'v1.4.1' into release

  • Loading branch information...
commit ad31c4663c5b084169f7887e1822e6dbd607eed7 2 parents 0949b1c + 1252460
@thelema thelema authored
View
11 Makefile
@@ -17,6 +17,7 @@ OCAMLFIND_DEST += -destdir $(DESTDIR)
endif
OCAMLBUILD ?= ocamlbuild
+OCAMLBUILDFLAGS ?= -no-links
ifeq ($(uname_S),Darwin)
BATTERIES_NATIVE ?= yes
@@ -60,7 +61,7 @@ endif
all: src/batCamomile.ml
@echo "Build mode:" $(MODE)
- $(OCAMLBUILD) $(TARGETS)
+ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) $(TARGETS)
clean:
${RM} apidocs
@@ -109,10 +110,10 @@ TESTABLE ?= $(filter-out $(DONTTEST), $(wildcard src/*.ml))
TESTDEPS = src/batCamomile.ml $(patsubst src/%.ml,qtest/%_t.ml, $(TESTABLE)) qtest/test_mods.mllib
_build/testsuite/main.byte _build/qtest/test_runner.byte: $(TESTDEPS)
- $(OCAMLBUILD) testsuite/main.byte qtest/test_runner.byte
+ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) testsuite/main.byte qtest/test_runner.byte
_build/testsuite/main.native _build/qtest/test_runner.native: $(TESTDEPS)
- $(OCAMLBUILD) testsuite/main.byte qtest/test_runner.byte testsuite/main.native qtest/test_runner.native
+ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) testsuite/main.byte qtest/test_runner.byte testsuite/main.native qtest/test_runner.native
test-byte: _build/testsuite/main.byte _build/qtest/test_runner.byte
_build/testsuite/main.byte
@@ -127,7 +128,7 @@ test-native: _build/testsuite/main.native _build/qtest/test_runner.native
test: $(TEST_TARGET)
bench:
- $(OCAMLBUILD) $(TARGETS) $(BENCH_TARGETS)
+ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) $(TARGETS) $(BENCH_TARGETS)
$(foreach BENCH, $(BENCH_TARGETS), _build/$(BENCH); )
release: clean all test
@@ -174,7 +175,7 @@ camfailunk:
##
_build/build/make_suite.$(EXT): build/make_suite.mll
- $(OCAMLBUILD) -no-links make_suite.$(EXT)
+ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) make_suite.$(EXT)
#convert a source file to a test suite by filtering special comments
qtest/%_t.ml: src/%.ml _build/build/make_suite.$(EXT)
View
2  VERSION
@@ -1 +1 @@
-1.4.0
+1.4.1
View
2  _oasis
@@ -1,7 +1,7 @@
OASISFormat: 0.2
OCamlVersion: >= 3.11.0
Name: batteries
-Version: 1.4.0
+Version: 1.4.1
Authors: Batteries Included Team
License: LGPL-2.1 with OCaml linking exception
LicenseFile: LICENSE
View
1  examples/benchmark/myocamlbuild.ml
@@ -54,6 +54,7 @@ struct
(* When one link an OCaml library/binary/package, one should use -linkpkg *)
flag ["ocaml"; "byte"; "link"; "program"] & A"-linkpkg";
flag ["ocaml"; "native"; "link"; "program"] & A"-linkpkg";
+ flag ["ocaml"; "native"; "link"; "toplevel"] & A"-linkpkg";
(* For each ocamlfind package one inject the -package option when
View
8 src/batEnum.mli
@@ -235,9 +235,11 @@ val group : ('a -> 'b) -> 'a t -> 'a t t
where each sub-enumeration is the longest continuous enumeration
of elements whose [test] results are the same.
- Enum.group (x -> x mod 2) [!1;2;4;1] = [![!1];[!2;4];[!1]]
- Enum.group (fun x -> x mod 3) [1;2;4;1] = [![!1];[!2];[!4;1]]
- Enum.group (fun s -> s.[0]) [!"cat"; "canary"; "dog"; "dodo"; "ant"; "cow"] = [![!"cat"; "canary"];[!"dog";"dodo"];[!"ant"];[!"cow"]]
+ [Enum.group (x -> x mod 2) [1;2;4;1] = [[1];[2;4];[1]]]
+
+ [Enum.group (fun x -> x mod 3) [1;2;4;1] = [[1];[2];[4;1]]]
+
+ [Enum.group (fun s -> s.[0]) ["cat"; "canary"; "dog"; "dodo"; "ant"; "cow"] = [["cat"; "canary"];["dog";"dodo"];["ant"];["cow"]]]
*)
View
3  src/batInnerIO.ml
@@ -852,7 +852,7 @@ let iter_on_format_args fmt add_conv add_char =
and scan_conv skip i =
if i > lim then incomplete_format fmt else
match Sformat.unsafe_get fmt i with
- | '%' | '!' -> succ i
+ | '%' | '!' | ',' -> succ i
| 's' | 'S' | '[' -> add_conv skip i 's'
| 'c' | 'C' -> add_conv skip i 'c'
| 'd' | 'i' |'o' | 'u' | 'x' | 'X' | 'N' -> add_conv skip i 'i'
@@ -1090,6 +1090,7 @@ let scan_format fmt args n pos cont_s cont_a cont_t cont_f cont_m =
let s = format_int (extract_format_int 'n' fmt pos i widths) x in
cont_s (next_index n) s (succ i)
end
+ | ',' -> cont_s n "" (succ i)
| '!' -> cont_f n (succ i)
| '{' | '(' as conv (* ')' '}' *) ->
let (xf : ('a, 'b, 'c, 'd, 'e, 'f) format6) = get_arg n in
View
2  src/batInnerIO.mli
@@ -549,7 +549,7 @@ type ('a, 'b, 'c) t = ('a, 'b, 'c) Pervasives.format
the format specified by the second letter.
- [!]: take no argument and flush the output.
- [%]: take no argument and output one [%] character.
-
+ - [,]: the no-op delimiter for conversion specifications
{7 Unparsers}
View
1  src/batPrintf.mli
@@ -133,6 +133,7 @@ type ('a, 'b, 'c) t = ('a, 'b, 'c) Pervasives.format
the format specified by the second letter.
- [!]: take no argument and flush the output.
- [%]: take no argument and output one [%] character.
+ - [,]: the no-op delimiter for conversion specifications
{7 Unparsers}
View
2  src/batSet.ml
@@ -476,7 +476,7 @@ struct
let union s1 s2 = t_of_impl (Concrete.union Ord.compare (impl_of_t s1) (impl_of_t s2))
let diff s1 s2 = t_of_impl (Concrete.diff Ord.compare (impl_of_t s1) (impl_of_t s2))
- let inter s1 s2 = t_of_impl (Concrete.diff Ord.compare (impl_of_t s1) (impl_of_t s2))
+ let inter s1 s2 = t_of_impl (Concrete.inter Ord.compare (impl_of_t s1) (impl_of_t s2))
let subset t1 t2 = Concrete.subset Ord.compare (impl_of_t t1) (impl_of_t t2)
Please sign in to comment.
Something went wrong with that request. Please try again.