kescher
db9eec3b9f
add support for duration multiplication
...
Signed-off-by: Jonathan Protzenko <protz@microsoft.com>
2022-05-31 11:17:38 -07:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
8433a2b045
adding clerk as a dependency to catala
2022-05-31 18:10:45 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
13b94eb469
calling using self to get the current packages.
2022-05-31 16:59:09 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
bf3b24a3f4
encoding clerk and ninja_utils inside nix
2022-05-31 16:56:12 +02:00
Denis Merigoux
853d92ad34
Fix test encoding
2022-05-31 16:24:37 +02:00
Denis Merigoux
89db6d9b69
Fix logging regression involuntarily introduced by #268
2022-05-31 16:09:32 +02:00
Denis Merigoux
c9f5555a6f
Merge pull request #271 from CatalaLang/convert-nix-to-flake
...
Fix Nix expressions and convert them to flakes (Continuation)
2022-05-31 13:48:20 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
d63eb07cc4
adding the commit of the flake update
2022-05-31 14:13:27 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
4752a7f579
more documentation
2022-05-31 14:08:48 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
17592d060e
documentation
2022-05-31 14:02:39 +02:00
Denis Merigoux
d23fcf7194
Merge pull request #268 from AltGr/combined-exns
...
Compiler: support cumulative exceptions
2022-05-31 10:12:33 +01:00
Denis Merigoux
7c779a07a8
More SMIC Data + table formatting
2022-05-30 17:36:59 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
49a3267eec
automated updating of flakes every weeks
2022-05-30 16:56:40 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
26ac1dc1bd
modification on github actions to make it compatible with flakes
2022-05-30 15:51:26 +02:00
Denis Merigoux
6d0b3d2a3f
Merge pull request #270 from W95Psp/convert-nix-to-flake
...
Fix Nix expressions and convert them to flakes
2022-05-30 14:27:29 +01:00
Lucas Franceschino
33773f42b4
Fix Nix and convert to flakes
2022-05-30 15:18:18 +02:00
Denis Merigoux
ff1b4eb5fd
Merge branch 'allocations_logement' of github.com:CatalaLang/catala into allocations_logement
2022-05-30 14:55:52 +02:00
Louis Gesbert
81fe7eba47
Tutorial: Add section on cumulative exceptions
2022-05-30 14:45:52 +02:00
Louis Gesbert
9ef8625df7
Compiler: support cumulative exceptions
...
Closes #208 (implementing Solution 1, without adding an explicit syntax)
Two exceptions or more, e.g. `(j1 |- c1)` and `(j2 |- c2)` such that `c1
= c2`, are collapsed by this transformation into `((j1 |- c1) | j2 |-
c2)`, introducing an arbitrary precedence that avoids the conflict.
The transormation is not applied if any exceptions apply to the subterms
themselves: while these exceptions could be merged, that would turn more
conflicts into arbitrary outcomes than wanted.
2022-05-30 14:22:34 +02:00
Denis Merigoux
fd7d9a6818
Add missing options
2022-05-26 19:10:53 +02:00
Denis Merigoux
ec225994af
Add "print_only_law" option
2022-05-26 19:05:06 +02:00
Denis Merigoux
7abaf825c5
Merge branch 'master' into allocations_logement
2022-05-26 18:48:31 +02:00
Denis Merigoux
225bd4aaf7
Fix missing parenthesis
2022-05-26 18:48:05 +02:00
Louis Gesbert
cd70e16ea3
Compiler: simplify EDefault term at construction
...
This allows to match on their structure further on.
2022-05-25 18:36:07 +02:00
Louis Gesbert
2d41f53300
Compiler: add a few helper comparison functions
...
Adds syntactic comparison for some expressions, etc., allowing in
particular to detect syntactically equal expressions. Positions are,
obviously, ignored.
2022-05-25 18:35:57 +02:00
Louis Gesbert
30297b27b8
Add dune rule to build tests
...
This allows a new magic command: `dune test -w`
2022-05-25 18:33:20 +02:00
Louis Gesbert
4c43b533b0
Merge pull request #213 from AltGr/plugin-support
...
Add backend plugin support
2022-05-25 18:31:30 +02:00
Louis Gesbert
8124d4dab5
Compiler: add some doc on plugin support
2022-05-25 17:27:49 +02:00
Denis Merigoux
5b4ab6d2b8
Merge pull request #267 from CatalaLang/refactor-web-api
...
Refactor the web API by serializing runtime values
2022-05-25 14:44:40 +01:00
Emile Rolley
92ebb4194b
refactor(api_web/runtime): runtime_value derive yojson_of
2022-05-25 14:26:58 +02:00
Lilya Slimani
78e215ebef
Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement
2022-05-24 17:11:32 +02:00
Lilya Slimani
65ba54b69d
Suite de l'arrêté du 27 / 09 / 2019
2022-05-24 17:11:30 +02:00
Denis Merigoux
2a8e7f5f7e
New questions
2022-05-24 16:25:23 +02:00
Denis Merigoux
e207fac330
Put @Lilyaslm's tests under CI
2022-05-24 15:23:41 +02:00
Denis Merigoux
54a08d4e44
Finished logement foyer réglementaires (minus TODOs) with @Lilyaslm
2022-05-24 15:20:06 +02:00
Lilya Slimani
63b05e35bc
Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement
2022-05-24 14:25:42 +02:00
Lilya Slimani
6f5d924de8
Mise à jour des tests
2022-05-24 14:25:39 +02:00
Denis Merigoux
883375d388
New questions by @Lilyaslm
2022-05-24 10:06:34 +02:00
Denis Merigoux
6638913c03
End of accession-propriété for AL with @Lilyaslm
2022-05-20 16:37:23 +02:00
Denis Merigoux
de2f1790c4
Progress with @Lilyaslm
2022-05-19 16:04:41 +02:00
Louis Gesbert
56026e8e8d
Pygments: install as user
...
Makefiles shouldn't sudo
2022-05-19 10:40:04 +02:00
Louis Gesbert
08c997142d
CI: run builds from a clean repo
2022-05-19 10:40:04 +02:00
Louis Gesbert
5ae4393004
Add two demo backend plugins
...
- one that is just the same as the python backend
- one that is a quick'n'dirty call to js_of_ocaml on top of the ocaml backend to
generate js files
Use `make plugins` to test them. They are only expected to be useful as
demonstrations of how to write plugins.
2022-05-19 10:40:04 +02:00
Louis Gesbert
9a95a3554c
Add support for backend plugins using dynlink
2022-05-19 10:40:02 +02:00
Louis Gesbert
5635eb0c6f
Merge pull request #264 from CatalaLang/file-utils
...
Refactor: add wrappers for file formatter
2022-05-19 10:10:15 +02:00
Emile Rolley
144704f7fb
refactor(compiler): add the Utils.File module
...
+ Adds wrapper functions for formatter of file/out_channel
and uses it in both the compiler and the clerk drivers.
2022-05-19 10:04:34 +02:00
Emile Rolley
06717ecb19
build: add the js_build rule for the website-assets one in the Makefile
2022-05-19 10:03:05 +02:00
Louis Gesbert
8bb081c497
Merge pull request #265 from AltGr/apl-fix-paren
...
Allocation_logement: fix parentheses in formula
2022-05-18 17:00:32 +02:00
Louis Gesbert
551c9a6729
Allocation_logement: fix parentheses in formula
...
Changing the priorities broke the expression!
Here it was caught by the types; I hope there aren't other places where
it just changed the output without being caught by our tests...
2022-05-18 16:47:46 +02:00
Denis Merigoux
166355fad0
Merge pull request #260 from AltGr/parser-tweaks
...
An attempt to fix some parser priorities
2022-05-18 14:45:02 +01:00
