Try to upgrade OCaml branch with the last changes of OxCaml one

[Tim-ats-d]

No description provided.

[lyrm]

Tests are not working the same for me.

  $ merlin-mockup &
$ merlin-mockup > /dev/null 2>&1 &

I need to uncomment the second line and comment out the first one for it to work.

Also, I don't get exactly the same result: some tests show one extra line computed. This is probably due to some normal nondeterminism: the typer had time to type one more line than your computer did before the response was shared.

[lyrm]

Hi! test_cache.t is still not working for me. I need to have a deeper look. I might actually come from deeper than the test file or the server.

  $ merlin-mockup > /dev/null 2>&1 &
  $ PID=$!
  $ sleep 0.1

  $ printf "./defs/math\npart 1" | nc localhost 8453
  Value of "alpha" is 4.
  Value of "beta" is 3.
  Value of "gamma" is 7.
  Value of "delta" is 21.
  Value of "epsilon" is 6.
  
  $ printf "./defs/math\npart 3" | nc localhost 8453
  Value of "alpha" is 4.
  Value of "beta" is 3.
  Value of "gamma" is 7.
  Value of "delta" is 21.
  Value of "epsilon" is 6.
  
  $ printf "./defs/math\npart 12" | nc localhost 8453
  Value of "alpha" is 4.
  Value of "beta" is 3.
  Value of "gamma" is 7.
  Value of "delta" is 21.
  Value of "epsilon" is 6.
  Value of "zeta" is 18.
  Value of "eta" is 12.
  Value of "theta" is 19.
  Value of "iota" is 9.
  Value of "kappa" is 23.
  Value of "lambda" is -250.
  Value of "mu" is 32.
  Value of "nu" is -750.
  Value of "xi" is -756.
  Value of "omicron" is 96.
  
  $ printf "./defs/math\npart 20" | nc localhost 8453
  [1]
  $ printf "./defs/math\npart 10" | nc localhost 8453
  [1]
  $ printf '.\nclose' | nc localhost 8453
  [1]