Denis Merigoux
97ede2cde1
Merge branch 'master' into allocations_logement
2022-03-09 10:47:29 +01:00
Denis Merigoux
2dfb15d888
reformat (sync with master)
2022-03-09 10:43:17 +01:00
Denis Merigoux
cf233ac7de
Change settings
2022-03-09 10:43:00 +01:00
Denis Merigoux
296760f09c
Merge pull request #224 from CatalaLang/afromher_dcalc
...
DCalc optimization pass: Remove if_then_else when both branches are identical
2022-03-09 10:29:51 +01:00
Denis Merigoux
e0a8bb1f6b
Merge pull request #221 from AltGr/options-record
...
Command-line: use a record for the options
2022-03-09 10:28:59 +01:00
Aymeric Fromherz
9eec6a474c
format
2022-03-08 20:43:55 +01:00
Aymeric Fromherz
9cbfc13288
Merge branch 'master' into afromher_dcalc
2022-03-08 20:41:35 +01:00
Aymeric Fromherz
3fb14264c2
Implement equal_ops in dcalc
2022-03-08 20:39:45 +01:00
Aymeric Fromherz
ac42bf65a7
Refactor to extract common equal_exprs_list and equal_typs_list
2022-03-08 20:31:22 +01:00
Aymeric Fromherz
5b345b4782
format
2022-03-08 20:23:45 +01:00
Aymeric Fromherz
2fa2f36c1d
Optimize if_then_else when both branches are identical
2022-03-08 17:38:14 +01:00
Louis Gesbert
b4b6d5d648
Fix compilation catala_web_interpreter
...
oops I overlooked that one
2022-03-08 17:35:57 +01:00
Aymeric Fromherz
89d69c2316
Implement equality function on dcalc expressions
2022-03-08 17:35:08 +01:00
Denis Merigoux
e5e0164fee
Remove unused dev dependencies in opam file
...
As suggested by https://github.com/ocaml/opam-repository/pull/20861#issuecomment-1061807613
2022-03-08 17:25:25 +01:00
Louis Gesbert
0e874752c1
Merge remote-tracking branch 'origin/master'
2022-03-08 16:20:41 +01:00
Louis Gesbert
729fb7e551
reformat (sync with master)
2022-03-08 16:12:25 +01:00
Denis Merigoux
5c5eae1d19
Change settings
2022-03-08 16:11:53 +01:00
Louis Gesbert
071ec35234
Command-line: use a record for the options
...
Should make it much easier and less error-prone to add new options. There is
still a bit of boiler-plate, but at least it's contained in the Cli.options
function and doesn't transpire in the interfaces.
2022-03-08 16:11:39 +01:00
Denis Merigoux
efdf653ec7
Merge pull request #220 from CatalaLang/reformat
...
Reformatting of the OCaml code
2022-03-08 15:40:02 +01:00
Denis Merigoux
5bd66142a6
Big reformatting
...
ocamlformat 0.19.0 -> 0.20.1
100 -> 80 columns per line
Reestablished @emilerolley's smart fun break
2022-03-08 15:03:14 +01:00
Denis Merigoux
65a5a42c16
Change settings
2022-03-08 15:01:18 +01:00
Denis Merigoux
5a186f8cfd
Merge pull request #218 from AltGr/format-strings
...
Use format strings directly in debug/error/log functions
2022-03-08 15:00:56 +01:00
Denis Merigoux
c07bab1377
FIXME -> TODO
2022-03-08 14:55:48 +01:00
Denis Merigoux
95bf732940
Update assets
2022-03-08 14:54:17 +01:00
Louis Gesbert
12ec65601d
Use format strings directly in debug/error/log functions
...
This avoids many intermediate calls to e.g. `Format.asprintf`; should result in
some cases in "more correct" use of `Format`¹, avoid the computation of unused
debug strings, and make the code more readable.
¹ for `Format` to work as expected, all intermediate calls need to go through
it. Some cases of formatting to an intermediate string then printing through Format
again are still present, but this makes the situation better.
2022-03-08 13:04:27 +01:00
Denis Merigoux
367dd98234
Merge pull request #217 from CatalaLang/fix_0_6_0release
...
Fix dune build -p catala @runtest
2022-03-08 12:08:38 +01:00
Denis Merigoux
c5d63148f8
Fix dune build -p catala @runtest
2022-03-08 11:28:42 +01:00
Denis Merigoux
c0fd87543b
Merge pull request #216 from CatalaLang/bump_to_0.6.0
...
Bump version to 0.6.0
2022-03-07 22:58:09 +01:00
Denis Merigoux
2d63a08f23
Removed extra newlines
2022-03-07 19:41:27 +01:00
Denis Merigoux
8fb681baa1
Bump version to 0.6.0
...
Changelog:
* Catala as a proof platform (Z3 backend, safety checks)
* More expressivity for exceptions
* Multiple states for one variable
* Build system relying on ninja-build
* Better debug printers
* Alternative compilation mode without try ... with exceptions
2022-03-07 19:35:56 +01:00
Denis Merigoux
fe477ae006
Merge pull request #212 from CatalaLang/variable_state_114
...
Variable redefinitions: implementation of #114
2022-03-07 18:37:30 +01:00
Denis Merigoux
366c45e130
Merge branch 'master' into variable_state_114
2022-03-07 18:32:25 +01:00
Denis Merigoux
2e5f870151
Merge pull request #215 from CatalaLang/fix-clerk-sort-dirs
...
Fix(clerk): sort subdirectory names
2022-03-07 18:14:28 +01:00
Emile Rolley
54e71bf3e3
fix(clerk): sort subdirectory names
2022-03-07 18:02:12 +01:00
Denis Merigoux
5ce85b40b2
Added all packages to be installed
2022-03-07 12:02:03 +01:00
Denis Merigoux
1a7fb349eb
Merge branch 'master' into variable_state_114
2022-03-07 11:59:49 +01:00
Denis Merigoux
23766e34a9
More negative tests
2022-03-07 11:55:26 +01:00
Denis Merigoux
9d5e8e414e
Merge pull request #186 from EmileRolley/refactor-clerk-w-ninja
...
Refactor(clerk): use ninja as backend to run tests
2022-03-07 11:53:06 +01:00
Denis Merigoux
b9f46afcd7
Revert ocamlformat changes; creates too much conflict in other files
...
Changes in autoformatting should be made in a separate PR in a time where
there isn't too much pending PRs for the OCaml files
2022-03-07 11:09:47 +01:00
Denis Merigoux
f6de45416c
Cycle test
2022-03-06 17:34:51 +01:00
Denis Merigoux
94c1874500
Subscope test
2022-03-06 17:28:58 +01:00
Denis Merigoux
8167d7ee00
Simple tests
2022-03-06 17:13:40 +01:00
Emile Rolley
7d12b5f9f1
Merge branch 'master' into refactor-clerk-w-ninja
2022-03-06 15:02:42 +01:00
Denis Merigoux
5ef7e45e11
Desugared to scope complete but untested [skip ci]
2022-03-06 14:15:09 +01:00
Lilya
f29dcfe9f2
Update code_construction_reglementaire.catala_fr
2022-03-04 14:11:53 +01:00
Denis Merigoux
cf8c6233d9
Finished translation of expressions [skip ci]
2022-03-01 20:41:01 +01:00
Denis Merigoux
5a0719b25d
Starting to translate expressions [skip ci]
2022-03-01 10:15:44 +01:00
Denis Merigoux
171e8932bc
Desugaring implemented [skip ci]
2022-02-28 18:34:32 +01:00
Denis Merigoux
518ff02696
Added desugared AST, necessary to distinguish Desugared.ScopeVar from Scopelang.ScopeVar [skip ci]
2022-02-28 17:19:39 +01:00
Denis Merigoux
1e11f6c1d5
Name resolution
2022-02-28 15:40:19 +01:00
