576ff5293e
Re-indent string_with_vars with ocp-indent
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-01 19:48:19 +07:00
f0e448dc36
Strengthen the parsing of the (lang ...) line
...
It now has to be the first line of the dune-project file and the
lexical conventions are stricter than the rest of the syntax.
This will allow making changes to the lexical conventions of the
language in the future.
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-06-01 08:42:45 +01:00
39e74826f4
Simplify the parser
...
Replace the current generated parser by an ocamllex lexer + a simple
parser.
The new code is:
- much simpler and smaller
- shouldn't cause ocamlopt to stack overflow anymore on BSD systems
- slightly slower but not that much
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-06-01 08:42:45 +01:00
2e86529ece
Merge branch 'master' into little-cleanups
2018-06-01 02:37:09 +07:00
f07dff5696
Merge branch 'master' into sexpable
2018-06-01 02:33:54 +07:00
f9a215921b
Wait for deps and sdeps at once
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-01 01:28:14 +07:00
e97d0c5ad6
Rename Path.readdir to Path.readdir_unsorted ( #828 )
...
As `Sys.readdir`, it returns entries in an nondeterministic order.
This can cause problems if caller relies on the list being sorted.
See #820 .
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-05-31 14:52:10 +01:00
5bfacf766a
Move sexpable signature to Stdune.Sexp
...
Also tweak Syntax.Version to match this signature
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-31 13:17:52 +07:00
03c5ffb805
Merge branch 'master' into merlin-fix
2018-05-30 21:51:58 +07:00
29f711985d
Make "path already scanned" message deterministic ( #820 )
...
When a symlink loop is detected, the following message is printed:
> Path X has already been scanned. Cannot scan it again through symlink Y
However, the actual symlink that is displayed depends on the order in
with `readdir` outputs the contents (which depends on FS internals).
This sorts the directory list so that the message is deterministic.
It can be tested by adding for example a `List.rev` call after
`Path.readdir`: the affected version will return a different version in
the `github764` test.
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-05-30 12:57:23 +01:00
171c22614d
Use Marshal for the incremental and digest databases ( #817 )
...
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-30 11:54:04 +01:00
0d3bdf34fc
Small cleanup of merlin generation
...
Use the the known src/obj dirs as the initial value for accumulation
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-30 14:41:56 +07:00
8f16afe293
Fix merlin generation
...
The optional build contexts were being dropped from the obj dirs instead of the
source dirs.
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-30 14:39:47 +07:00
85e4b13780
Change Paths_glob to return a set of paths
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-29 02:24:52 +07:00
d2b66279f6
Use Sys.{win32,cygwin} rather than Sys.os_type
...
The former functions are optimized away while the latter isn't.
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-28 17:02:51 +01:00
547998d6c6
Fix an issue when a file is part of several packages
...
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-28 13:47:55 +01:00
2b7ee377af
Merge branch 'master' into no-interning
2018-05-28 19:18:21 +07:00
665c251678
Merge branch 'master' into remove-path-set-conversion
2018-05-28 18:38:04 +07:00
4a0e5a76af
Remove more Path <-> List conversion in rules_for_files
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 18:04:48 +07:00
836b27ae2b
Remove an extra conversion in rules_for_files
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 17:52:05 +07:00
da8064893c
Add No_interning module for easy experimentation
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 14:51:37 +07:00
2bb9895817
Make explode_path work in 1 pass
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 14:38:35 +07:00
da469e66f0
Fix explode_path to work on absolute paths
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 14:36:40 +07:00
7b824febf3
Merge branch 'master' into suffix-prefix-fast
2018-05-28 14:30:53 +07:00
fe9e6fb8c9
Make Interned generative again ( #808 )
...
I accidentally removed this in the last PR. I think it should probably be brought back.
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-28 14:18:10 +07:00
6f3467ad96
Merge branch 'master' into suffix-prefix-fast
2018-05-28 14:16:13 +07:00
b31d281949
Add Module_compilation.ocamlc_i
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
3bd9addeb2
Use Compilation_context in menhir
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
c9ead23c7d
Add Compilation_context
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
69af40dced
Compute includes outside of build_modules
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
634cd25b1b
Allow to compute the deps of an auxiliary module
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
cc7bd5ebb1
Allow modules to be only preprocessed and not linted
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
ac1c407cab
Split Preproressing.pp_and... in two functions
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-05-28 08:10:12 +01:00
5c4027aff8
Re-work the code to handle (include ...)
...
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-28 07:59:05 +01:00
d211272d24
Ignore jbuild_version stanzas
...
These are no longer necessary as they are super-seeded by (lang
...) stanzas in dune-project files
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-28 07:59:05 +01:00
cb6baa6c96
Make Stanza.t an open type
...
Signed-off-by: Jeremie Dimino <jdimino@janestreet.com>
2018-05-28 07:59:05 +01:00
89b0e397f7
Check suffix and prefix without allocation
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-27 01:23:55 +07:00
e5f873da15
Make Interned generative again
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-26 17:14:00 +07:00
88e71c3432
Speed up merlin generation ( #805 )
...
Improve merlin generation by minimizing intermediate strings and reusing a buffer.
2018-05-26 11:04:21 +07:00
15ce5211b8
Merge branch 'master' into remove-extra-conversion
2018-05-25 19:17:38 +07:00
f0e0bf5156
Remove extra set to list conversion
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-25 12:06:22 +07:00
459d17fc13
Merge branch 'master' into odoc-master-titles
2018-05-24 17:37:28 +01:00
d3edc454ac
Add initial size to interned
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 20:51:12 +07:00
cbf2727209
Add a resizing policy for Interned
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 20:22:13 +07:00
1aa6209584
Move interned to stdune
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 18:23:02 +07:00
274bb70994
Move fmt to stdune
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 18:22:55 +07:00
6b130e809c
Move int sets and maps to stdune
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 18:22:36 +07:00
f838c89d74
Remove aliases of Path.{Set,Map}
...
They save very little in terms of typing but grepping harder than it should be
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 17:34:32 +07:00
8e8cda01b2
Replace dyn_paths with dyn_path_set
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 14:56:39 +07:00
d600db2158
Change Build_job to be set
...
The elements are unique and the order isn't well defined anyway
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-05-24 10:44:47 +07:00
Rudi Grinberg
Jeremie Dimino
Etienne Millon
Jérémie Dimino