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
Denis Merigoux
38a80d2929
Merge pull request #165 from CatalaLang/allocations_logement
...
Implementing French housing benefits
2022-05-18 14:39:39 +01:00
Denis Merigoux
2781485c0a
Update compiler/literate/literate_common.ml
...
Co-authored-by: Louis Gesbert <louis.gesbert@ocamlpro.com>
2022-05-18 15:32:58 +02:00
Denis Merigoux
b2ca8e36aa
Corrections suggested by @Altgr
2022-05-18 15:32:13 +02:00
Louis Gesbert
5da8451ede
Merge pull request #263 from AltGr/emacs-fixes
...
Emacs mode: small fixes + a couple typos in the english tutorial
2022-05-16 15:25:15 +02:00
Louis Gesbert
b928e02385
Emacs mode: small fixes
2022-05-16 15:21:15 +02:00
Louis Gesbert
569a647f3f
Tutorial: a couple typos
2022-05-16 15:21:15 +02:00
Louis Gesbert
b521b3e2d9
Merge pull request #262 from AltGr/emacs-mode
...
Add a (very simple) syntax highlighting mode for Emacs
2022-05-16 14:29:35 +02:00
Louis Gesbert
50c1e7282c
Add a (very simple) syntax highlighting mode for Emacs
...
Also fixes a typo in the .iro specifications
2022-05-13 17:42:03 +02:00
Louis Gesbert
faa5b32638
Merge remote-tracking branch 'origin/master' into allocations_logement
2022-05-12 15:22:17 +02:00
Louis Gesbert
f9fc1a8e8b
Formatting: sync with master
2022-05-12 15:10:55 +02:00
Louis Gesbert
0ac754b751
Merge pull request #261 from AltGr/fix-blameignore
...
Fix .git-blame-ignore-revs
2022-05-12 15:02:19 +02:00
Louis Gesbert
50f949ac9c
Fix .git-blame-ignore-revs
...
(forgot to update after rebase)
2022-05-12 12:36:55 +02:00
Louis Gesbert
2c127cbb40
Merge pull request #259 from AltGr/ocamlformat-tweaks
...
Fix ocamlformat crashes, and tweak some settings
2022-05-11 19:30:53 +02:00
Louis Gesbert
546347bbe2
Parser: allow chained if/then/else if/then/etc.
2022-05-11 19:26:34 +02:00
Louis Gesbert
05e3205fc9
Parser: priority tweaks
...
- makes sums and mults left-associative instead of right-associative (see the
change in the tests!)
- uses higher priority for unary operators
2022-05-11 19:26:34 +02:00
Louis Gesbert
abb4e9b66d
Some build / CI tweaks
...
add a check that the dune-promoted files are in sync when submitting a PR
2022-05-11 19:24:38 +02:00
Louis Gesbert
acc9deef05
Document the auto-formatting
2022-05-11 16:25:51 +02:00
Louis Gesbert
c5583a0c16
Add ocamlformat, obelisk and conf-npm as dev dependencies
2022-05-11 16:25:51 +02:00
Louis Gesbert
45925fe3fc
Add a ".git-blame-ignore-revs" file
...
This helps have a reasonable `git blame` experience even in the presence
of reformat commits, by explicitely digging deeper when they are
encountered.
Use `git config --global blame.ignoreRevsFile .git-blame-ignore-revs` to
enable it locally.
2022-05-11 16:25:51 +02:00
Louis Gesbert
f17875f90e
Formatting: some other personal preferences
2022-05-11 16:25:49 +02:00
Louis Gesbert
74c5629153
Formatting: reduce extra match-case indentation
...
2 is plenty enough, esp. for nested matches :)
2022-05-11 16:25:20 +02:00
Louis Gesbert
fa3693d813
Formatting: disable deprecated "smart" fun-decl option
2022-05-11 16:22:56 +02:00
Louis Gesbert
ac85d8dbb4
Upgrade ocamlformat version
2022-05-11 16:21:58 +02:00
Louis Gesbert
6cb0d581a6
Workaround some ocamlformat crashes
...
These files were not reformatted!
2022-05-11 16:21:07 +02:00
Louis Gesbert
e7181b18b1
Merge pull request #258 from AltGr/update-cmdliner
...
Upgrade cmdliner to 1.1 (some API changes)
2022-05-09 12:13:14 +02:00
Louis Gesbert
6837af4e80
Upgrade Cmdliner dep
2022-05-09 11:39:18 +02:00
Louis Gesbert
4974628bf1
Add ninja depext to clerk opam package def
2022-05-09 11:37:41 +02:00
Louis Gesbert
971dd82691
Disable dune generated opam files
...
They avoid a bit of duplication, but don't support depexts and having to
commit the generated opam files means that, often, the wrong file is
fixed.
2022-05-09 11:34:15 +02:00
Denis Merigoux
8ecf753641
Prettify formula
2022-05-08 16:20:16 +02:00
Denis Merigoux
96f1845afd
Merge branch 'master' into allocations_logement
2022-05-08 15:20:04 +02:00
Lilya Slimani
a4fddad582
Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement
2022-05-06 16:26:17 +02:00
Lilya Slimani
daa3896b64
Références Légifrance - Code réglementaire
2022-05-06 16:23:36 +02:00
Denis Merigoux
ec7f8a85c3
Progress with @Lilyaslm
2022-05-06 16:22:39 +02:00
Denis Merigoux
d1c9d674ff
Fixed tests
2022-05-06 15:28:59 +02:00
Denis Merigoux
07198e326d
Fixed rounding bug in interpreter for negative values
2022-05-06 15:28:09 +02:00
Lilya Slimani
e66df01492
Test exception Logement est chambre
2022-05-06 15:07:28 +02:00
Denis Merigoux
33c21e9a07
Include prestations familiales in allocations logement for L512-3 logic
2022-05-06 12:21:57 +02:00
Lilya Slimani
80f7505166
Vérifications des tests
2022-05-06 12:21:57 +02:00
Denis Merigoux
274d0a15e8
Merge pull request #256 from CatalaLang/fix_money_rounding
...
Fix money parsing
2022-05-06 11:28:40 +02:00
Denis Merigoux
a52cc0d881
Move fix to lexer as suggested by @altgr
2022-05-06 10:29:39 +02:00
Denis Merigoux
5ec91c7b00
Fix Python code and generated artefacts
2022-05-05 17:47:41 +02:00
Denis Merigoux
09e7ba762d
Rename test
2022-05-05 17:34:48 +02:00
Denis Merigoux
d478882636
Put tests that pass under CI
2022-05-05 17:21:53 +02:00
Denis Merigoux
080e60c25d
Fixes money cents parsing
2022-05-05 16:50:33 +02:00
Lilya Slimani
33c1906b90
Vérification Exemple 3 (Test Calcul APL secteur locatif)
2022-05-05 16:35:42 +02:00
Denis Merigoux
823c223ea8
Restore debug info
2022-05-05 16:28:17 +02:00
Lilya Slimani
c557eadfce
Mise à jour tests et corrections
2022-05-05 15:32:54 +02:00
Denis Merigoux
025382a85d
Restore debug info
2022-05-05 14:34:29 +02:00
