4823795fd1
Use let%map for applicative code
...
This converts easy instances of applicative code. The rewrite rule is
generally speaking:
```ocaml
e1 >>= pat1 ->
e2 >>= pat2 ->
e3 >>| pat3 ->
r
```
to:
```ocaml
let%map pat1 = e1
and pat2 = e2
and pat3 = e3
in
r
```
Signed-off-by: Etienne Millon <me@emillon.org>
2018-07-31 10:25:58 +02:00
835a44ff1e
Make name and names fields optional when public_name or public_names are present ( #1041 )
...
Make name field optional when public_name is specified
When name is omitted, it will be defaulted to public_name
This feature is 1.1 only.
2018-07-31 10:15:31 +02:00
a13325e389
Merge pull request #1048 from rgrinberg/jsoo-cctx
...
Refactor jsoo rules to use Compilation_context.t
2018-07-31 09:36:01 +02:00
5c93619b47
Merge branch 'master' into jsoo-cctx
2018-07-31 08:56:35 +02:00
ad0b376aeb
Merge pull request #1064 from rgrinberg/jsoo-manual
...
Move Jsoo content to its own page
2018-07-30 19:03:07 +02:00
fc5e3e7b59
Merge pull request #1065 from ocaml/test-cat-output
...
Do not rely on cat output in tests
2018-07-30 17:45:27 +02:00
772c1c05ac
Do not rely on cat output in tests
...
The error messages of `cat` can change a bit, for example if a different
locale is set. This uses a shell test instead.
Signed-off-by: Etienne Millon <me@emillon.org>
2018-07-30 17:40:48 +02:00
baa5b773b5
Merge pull request #1038 from rgrinberg/workspace-env-2
...
Env stanza in workspace files part #2
2018-07-30 17:07:54 +02:00
89a381530d
Merge branch 'master' into workspace-env-2
2018-07-30 17:07:41 +02:00
7af0af94ed
doc: remove %{first-dep} in quick-start.rst
...
Signed-off-by: Cédric Le Moigne <cedlemo@gmx.com>
2018-07-30 15:30:55 +01:00
ed5f2c5b40
ocamlyacc does not require parens either
...
Signed-off-by: Marek Kubica <marek@xivilization.net>
2018-07-30 15:01:43 +01:00
371c863a32
Parens not required
...
Closes #1054
Closes #1056
Signed-off-by: Marek Kubica <marek@xivilization.net>
2018-07-30 15:01:43 +01:00
f58bca1d06
ocamllex does not need the list of modules to be in a list
...
Noticed this issue while finding another issue in #1056 .
Signed-off-by: Marek Kubica <marek@xivilization.net>
2018-07-30 15:01:43 +01:00
024438e3cc
Represent env_nodes using a record rather than a list
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
2836a3c6b0
Document the workspace level env stanza
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
bd860d29e7
Pass the workspace env to context creation
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
61d33114ee
Bump latest version to 1.1
...
And make this version a pre-req for the env field in workspaces
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
8cda4349fa
Use toplevel env stanza from workspace file
...
This should be the top most env stanza when it's available
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
c112516a67
Add test setting env for workspace
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
200f9d0a52
Add toplevel env stanza to workspace files
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
4697a7f9f4
Refactor jsoo rules to use Compilation_context
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:08 +02:00
a898448510
Fix typo in comment
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:08 +02:00
5e7841abf2
Merge pull request #1043 from rgrinberg/module-evaluator
...
Simplify module evaluator logic
2018-07-30 15:07:48 +02:00
7eb7c6e21a
Simplify module OSL evaluation
...
Use Ordered_set_lang.Make_loc to automatically book keep the location for us.
Also cut down on some module name to string conversions that was just making the
code noisy. The fake_modules detection has been changed to hide the mutabiility
from the main algorithm
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
4970448edf
Add Module.uncapitalize
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
093cefc58b
Add Loc preserving version of Ordered_set_lang.Make
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
50eacb0690
Add signature to Modules_field_evaluator
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
5f7d1b0285
Fix #1040
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-30 12:52:07 +01:00
3615b280f8
Move Jsoo content to its own page
...
Jsoo is about as independent as other features which have their own section
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 11:47:35 +02:00
78bedda654
Merge pull request #1062 from hongchangwu/update-doc
...
Update documentation for tests
2018-07-29 21:28:20 +02:00
3b875f0937
Update documentation for tests
...
Signed-off-by: Hongchang Wu <wuhc85@gmail.com>
2018-07-29 13:01:40 -04:00
8d5bd6819f
Small refactoring of jbuild_load.ml
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-24 15:14:14 +02:00
4bd1bcbb3a
Merge pull request #1042 from rgrinberg/syntax-1.1
...
Update latest syntax to 1.1
2018-07-21 20:42:43 +02:00
845d3a4713
Update latest syntax to 1.1
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-21 20:39:13 +02:00
4aad02de6f
Merge pull request #1037 from rgrinberg/update-tests-workspace
...
Add missing dune-project files to tests
2018-07-20 15:20:43 +02:00
fc3400429b
Merge pull request #1036 from rgrinberg/use-correct-version
...
Use correct version for error message
2018-07-20 15:11:02 +02:00
5754e7328a
Add missing dune-project files to tests
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-20 15:07:35 +02:00
2b72c80fbc
Use correct version for error message
...
Error.deleted_in would use the current version rather than the deleted version
for the error message
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-20 14:02:58 +02:00
5683909fc3
Update changelog for 1.0.1
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 23:47:06 +02:00
5835e5b64c
Merge pull request #1035 from diml/move-pp-files-back
...
Move back .pp files to the source directory
2018-07-19 23:00:27 +02:00
eb0cb1d4c8
Merge pull request #1033 from diml/i-must-not-segfault
...
Exceptions are the little-death that brings total obliteration
2018-07-19 22:40:12 +02:00
213e093b07
Move back .pp files to the source directory
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-19 15:59:29 +01:00
a842fdc2d7
Merge pull request #998 from rgrinberg/workspace-env
...
Add Ability to set Env through a workspace file
2018-07-19 13:26:26 +02:00
0ad983c729
You get a quote from Dune if you can make Dune crash
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-19 12:22:18 +01:00
1f0bee0cf7
Rename base to common
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 13:11:42 +02:00
14030a8ad5
Remove unused open
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 12:14:25 +02:00
655c10164d
Use syntax extension for parsing stanza
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
bac0a35785
Accept corrections
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
78e18716ce
Rename Shared_stanaza to Dune_env
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
78786e09d4
Initialize env_node from Super_context.create
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Etienne Millon
Rudi Grinberg
Etienne Millon
cedlemo
Marek Kubica
Jeremie Dimino
Hongchang Wu