Commit Graph

2424 Commits

Author SHA1 Message Date
Marek Kubica 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
Rudi Grinberg 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
Rudi Grinberg 2836a3c6b0 Document the workspace level env stanza
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
Rudi Grinberg 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
Rudi Grinberg 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
Rudi Grinberg 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
Rudi Grinberg c112516a67 Add test setting env for workspace
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:17 +02:00
Rudi Grinberg 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
Rudi Grinberg 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
Rudi Grinberg a898448510 Fix typo in comment
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 15:12:08 +02:00
Rudi Grinberg 5e7841abf2
Merge pull request #1043 from rgrinberg/module-evaluator
Simplify module evaluator logic
2018-07-30 15:07:48 +02:00
Rudi Grinberg 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
Rudi Grinberg 4970448edf Add Module.uncapitalize
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
Rudi Grinberg 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
Rudi Grinberg 50eacb0690 Add signature to Modules_field_evaluator
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-30 14:33:24 +02:00
Jeremie Dimino 5f7d1b0285 Fix #1040
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-30 12:52:07 +01:00
Rudi Grinberg 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
Rudi Grinberg 78bedda654
Merge pull request #1062 from hongchangwu/update-doc
Update documentation for tests
2018-07-29 21:28:20 +02:00
Hongchang Wu 3b875f0937 Update documentation for tests
Signed-off-by: Hongchang Wu <wuhc85@gmail.com>
2018-07-29 13:01:40 -04:00
Jeremie Dimino 8d5bd6819f Small refactoring of jbuild_load.ml
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-24 15:14:14 +02:00
Rudi Grinberg 4bd1bcbb3a
Merge pull request #1042 from rgrinberg/syntax-1.1
Update latest syntax to 1.1
2018-07-21 20:42:43 +02:00
Rudi Grinberg 845d3a4713 Update latest syntax to 1.1
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-21 20:39:13 +02:00
Rudi Grinberg 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
Rudi Grinberg fc3400429b
Merge pull request #1036 from rgrinberg/use-correct-version
Use correct version for error message
2018-07-20 15:11:02 +02:00
Rudi Grinberg 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
Rudi Grinberg 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
Rudi Grinberg 5683909fc3 Update changelog for 1.0.1
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 23:47:06 +02:00
Rudi Grinberg 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
Rudi Grinberg 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
Jeremie Dimino 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
Rudi Grinberg 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
Jeremie Dimino 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
Rudi Grinberg 1f0bee0cf7 Rename base to common
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 13:11:42 +02:00
Rudi Grinberg 14030a8ad5 Remove unused open
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 12:14:25 +02:00
Rudi Grinberg 655c10164d Use syntax extension for parsing stanza
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg bac0a35785 Accept corrections
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 78e18716ce Rename Shared_stanaza to Dune_env
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 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
Rudi Grinberg a82e783f15 re-arrange short match to go to the top
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 4860461ba3 Pun inherit_from field
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg b12517debb Move Env stanza to Shared_stanza module
To break dependency cycles. This shared_stanza module doesn't have any
dependencies on actions.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 4769f9df9f Plumb through env node
workspace -> context -> super context

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 61d7e49e07 Move env stanza parsing to Env.t
This will be necessary to allow this stanza in Workspace

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 20fe7a9d20 Refactor workspace type
Make the opam workspace include the shared fields from a base type

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 6b29a24d89
Merge pull request #1031 from rgrinberg/action-exec
Action exec & Promotion modules
2018-07-18 14:30:27 +02:00
Rudi Grinberg c7bd8bc556 Move sandboxed back to Action
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg 1b71d57bba Move promotion to own module
It's not really related to actions

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg bf2d842075 Split executable parts of Action into Action_exec
This is required for breaking the dep cycle between the context and the Action module

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg 3b9fb8df0a
Merge pull request #1030 from rgrinberg/remove-extra-is-standard
Remove extra is standard check that is already done in Osl.eval
2018-07-18 14:26:36 +02:00
Rudi Grinberg 621c666610 Remove extra is standard check that is already done in Osl.eval
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 13:12:50 +02:00