Skip to content

Rebase on 4.02.3#2

Open
let-def wants to merge 814 commits intocharguer:trunkfrom
let-def:improverror
Open

Rebase on 4.02.3#2
let-def wants to merge 814 commits intocharguer:trunkfrom
let-def:improverror

Conversation

@let-def
Copy link

@let-def let-def commented Jun 16, 2016

In ocaml/merlin#545, @ysalmon would like to use your patches together with merlin.

Merlin cannot build with 4.02.0. We decided to not support this version as it received bug fixes shortly after release.

However your patches are only available on top of 4.02.0 in opam switches. This pull request is a rebase on top of 4.02.3. I checked simple cases but I cannot assess that it works as expected.

Damien Doligez and others added 30 commits October 29, 2014 21:16
fix a bug where the .annot files were truncated because of a missing …
55b1bb2 
…"close"

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15564 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
fix for ocamlbuild on cygwin cannot find ocamlfind
17bc3ea 
ocamlbuild should append .exe extension to filename when looking for
executables and Sys.cygiwn is set (not only Sys.win32).

From: algoriddle <szilvasy@gmail.com>

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15578 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
update Changes for PR#6661
3ab396e 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15597 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
fix regression in toplevel printing of lazy values
9730b9b 
(fix from Leo White)

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15599 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
update Changes
a481638 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15600 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
testsuite/lib-hashtbl: use LICENSE rather than /usr/share/dict/words …
abcb863 
…to avoid excessive test time

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15601 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
PR#6640: add 'precious' as a builtin-useful tag
cf58e78 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15605 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
fix PR#6690
fac2d98 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15638 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
revert wrongly commited files
2790ba1 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15639 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Fix PR#6680
6216eed 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15641 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
fix an incorrect assertion in the documentation of Gc.finalise
3289598 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15642 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
fix a bug where some GC counters are not updated when the GC is calle…
588af24 
…d explicity from OCaml

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
apply GPR123: fix stupid bug in opttoploop
d7a486d 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15648 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
update .gitignore
7e557c2 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15674 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
Change 'List' to 'ListLabels' in the ListLabels documentation.
3840c30 
From: Jeremy Yallop <yallop@gmail.com>

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15688 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
Change 'Array' to 'ArrayLabels' in the ArrayLabels documentation.
c0b5858 
From: Jeremy Yallop <yallop@gmail.com>

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15689 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
Add @SInCE tags on stdlib functions new in 4.02
ddd90c9 
make_float was added in 4.02
Buffer.(to_bytes, add_bytes, add_subbytes) were added in 4.02.
BytesLabels was added in 4.02.
Digest.(bytes, subbytes) were added in 4.02.
Marshal.(to_bytes, from_bytes) were added in 4.02.
various Pervasives functions were added in 4.02: print_bytes prerr_bytes output_bytes output_substring really_input_string
Printexc.(backtrace_slots, raw_backtrace_slot) were added in 4.02.
Scanf.(ksscanf, kfscanf) were added in 4.02.
Stream.of_bytes was added in 4.02.

From: Jeremy Yallop <yallop@gmail.com>

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
ocamlbuild: refine circular dependency errors
79d804d 
When reporting a circular dependency, refine the printed filenames to
those that are really part of the cycle -- instead of those that
happened to be traversed during the DFS that found a cycle. This gives
much more readable error messages.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15691 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
ocamlbuild: use sets rather than list for cycle-checking
09ce831 
I'm worried the previous algorithmically-naive implementation may
behave badly on larger-scale projects. We still keep a list around to
return results in the exact same order as previously.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15692 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
PR#6466: use "extensible variant" rather than "open" types in error m…
93ebda1 
…essage

(Leo White)

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15695 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
testsuite/Makefile.toplevel: make terminal DUMB by default (tests rel…
e388652 
…y on this)

Currently it is not equivalent to do:
  cd testsuite; make one DIR=tests/$foo
and
  cd testsuite/tests/$foo; make
because the latter will not set TERM=dumb and toplevel tests will use
nice escape-code location highlighting instead of ASCII-made squiggly
lines, which breaks the tests.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15696 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
missing @SInCE on List.sort_uniq
11570a4 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
ocamlbuild: add an explicit "infer" tag for menhir (Patch by Hugo Heu…
2bcf907 
…zard)

This allows to prevent the --infer option from being passed to Menhir
by using the negative tag -infer.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15698 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
toplevel: allows the extension of 'genprintval.ml' with parameterised…
d67a128 
… printer.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15699 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
toplevel: extends #install_printer to accept parameterised printers
58b96e1 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15700 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
toplevel: generic printers are only allowed with 'new' printer style.
e782237 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15701 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
toplevel: be explicit about what path are used for
c549786 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15702 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
update Changes
356aa87 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15703 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
rewrite the printing of Lazy values in toplevel/genprintval.ml
c8a5d63 
The code previously used Lazy.is_val to know whether the value was
already-evaluated (and, in this case, Lazy.force to extract this value
and print it more precisely). But it lies inside a functor that is
instantiated over different implementations of Obj, while
Lazy.{is_val,force} force the use of the Obj module of the standard
library. This could cause segfaults when this code is called from the
debugger, which instantiates it with a different Obj module talking
over a socket.

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15704 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@gasche
rewrite cycle-detection in genprintval.ml to use O instead of Obj
0a7819f 
(see previous commit)

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@15705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Damien Doligez and others added 27 commits July 20, 2015 14:10
PR#6691: install .cmt[i] files for stdlib and compiler-libs
1f24874 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@16223 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
move GC hooks to a safe place for callbacks
7ad5340 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@16224 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
PR#6926: Regression: ocamldoc lost unattached comment
126bc62 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@16229 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
bootstrap
357304f 
git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@16231 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
tagging release 4.02.3
bee55c4 
git-svn-id: http://caml.inria.fr/svn/ocaml/release/4.02.3@16239 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
@charguer @let-def
seqerror
150dcfe
@charguer @let-def
fix
d73c86d
@charguer @let-def
typing conditional
667c1c9
@charguer @let-def
progress
f9cdedc
@charguer @let-def
progress
b201cae
@charguer @let-def
pasfini
0e5a7b4
@charguer @let-def
apply
7110674
@charguer @let-def
recursion
811454a
@charguer @let-def
displayfunc
0ddb45f
@charguer @let-def
recursion
9e02ddc
@charguer @let-def
matching
4a263ce
@charguer @let-def
display
aff0b51
@charguer @let-def
finish
5d77283
@charguer @let-def
top
5425a3c
@charguer @let-def
fix
c923564
@charguer @let-def
ok
e26a86b
@charguer @let-def
fixed
ad9d9ef
@charguer @let-def
typo
6498daa
@charguer @let-def
printfworkaround
db900cd
@charguer @let-def
Missing check in Array.sub which allows to read arbitrary data and se…
43c97d5 
…gfault
@let-def
FIX typecore
a9d141e
@let-def
FIX odoc_args
f12da49
@charguer
Copy link
Owner

charguer commented Jan 4, 2017

Hi,

My branch improved-errors is already based on 4.02.2.
Is this good enough for you?
Else, we could try to port the branch to 4.02.3.
+
Arthur

@let-def
Copy link
Author

let-def commented Jan 9, 2017

I don't have use for this branch. Feel free to use the code available here if you want or close this PR :).

@ysalmon
Copy link

ysalmon commented Jan 9, 2017

Hello,
merlin seems to compile with 4.02.2+improved-errors, so everything seems great from my point of view (4.02.3 is not needed per se) !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@let-def @charguer @ysalmon @gasche @jeremiedimino @alainfrisch @lefessan @mshinwell @xavierleroy @lpw25