CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-09-20 08:47:14 +03:00
Code Issues Projects Releases Wiki Activity
2,030 Commits 41 Branches 8 Tags 60 MiB
7c779a07a8
Commit Graph

379 Commits

Author SHA1 Message Date
Denis Merigoux
e8f0cac1b8
In progress, giving to Alain 2021-12-08 17:22:56 +01:00
Denis Merigoux
095198f5ac
Fix #161 2021-11-29 10:33:43 +01:00
Denis Merigoux
27d74cef13
Formatting 2021-11-26 18:26:53 +01:00
Denis Merigoux
67e78d7def
Cosmetic modifications + clarification 2021-11-26 18:12:55 +01:00
Denis Merigoux
e16c1fa597
Début allocations logement 2021-11-26 16:52:27 +01:00
Denis Merigoux
eadd2cadf9
Ajout non cumul prestations familiales 2021-11-26 16:51:25 +01:00
Denis Merigoux
cbee66db24
Added Mayotte computation to allocations familiales 2021-11-07 00:39:12 +01:00
Denis Merigoux
a171e8aaed
Fixed title hierarchy in allocations familiales 2021-11-06 23:38:43 +01:00
Denis Merigoux
d56c31f5b4
Fix Makefile imprecision 2021-11-06 21:57:25 +01:00
Denis Merigoux
3d9c125ce5
More doc 2021-10-11 14:55:50 +02:00
Denis Merigoux
1b1625bc1e
Fix French spelling 2021-10-11 14:40:44 +02:00
Edwin Török
c454c0531a examples/tutorial_en: be explicit about @ and ^ symbols 
Use both their verbose name and symbols to make it obvious what they
refer to.

Signed-off-by: Edwin Török <edwin@etorok.net>
 2021-10-10 16:05:00 +01:00
Edwin Török
ee03af4afc examples/tutorial_en: headers are prefixed with # not @ 
Since a42d0c7728 # is used.

Signed-off-by: Edwin Török <edwin@etorok.net>
 2021-10-10 16:03:56 +01:00
Edwin Török
c201fee6b8 examples/tutorial_en: fix spelling 
paragrah -> paragraph
analyse -> analyze
formulae -> formulas
substraction -> subtraction
adresses -> addresses
mentionned -> mentioned
conditionnally -> conditionally
explicitely -> explicitly
datatypes -> data types

Signed-off-by: Edwin Török <edwin@etorok.net>
 2021-10-10 15:56:07 +01:00
Edwin Török
3eddaae882 examples: add a %.spellok helper to check spelling 
Usage:
`make -C examples/tutorial_en tutorial_en.spellok`

This will output a list of incorrect words (which should be empty).
Catala-specific words (or uncommon words missing from the default aspell dictionary) can be added to examples/whitelist.<lang>

Signed-off-by: Edwin Török <edwin@etorok.net>
 2021-10-10 15:56:07 +01:00
Emile Rolley
9aaa614410 refactor(parser): add the new catala-metadata markup 2021-10-01 10:01:25 +02:00
Denis Merigoux
b72d8e09ee
Restore typechecking version of CGI example 2021-09-28 12:01:08 +02:00
Denis Merigoux
caf42f3445
Merge branch 'master' into jemsab_4b 2021-09-28 11:52:09 +02:00
Denis Merigoux
03b44f5b15
Python backend debugged and tested 2021-06-25 00:47:12 +02:00
Denis Merigoux
fffd0ffb63
Working the way into the Python backend 2021-06-22 14:55:43 +02:00
Denis Merigoux
bbd50747d9
Big renaming and dir reorg 2021-06-21 11:39:06 +02:00
EmileRolley
fddf7c5930 refactor(build): add .ml as target for the clean rule of examples/Makefile.commom.mk 2021-06-08 15:09:17 +02:00
EmileRolley
089de75030 fix(examples): syntax error (tutorial_fr instead of tutoriel_fr) 2021-06-04 11:37:44 +02:00
Denis Merigoux
9b16576c5a
Merge pull request #128 from EmileRolley/vim_syntax 
feat(syntax_highlighting): add vim syntax files
 2021-06-03 09:38:29 +02:00
EmileRolley
ed73be5abf feat(syntax_highlighting): add the catala_pl.vim file 2021-06-01 10:53:49 +02:00
Denis Merigoux
df01733bbd
Typecheck and fix the inheritance tax example 2021-05-31 16:59:43 +02:00
Denis Merigoux
32aa818249
Beginning of succession law 2021-05-31 16:26:41 +02:00
Bartosz Woźniak
7d05d76825 cleanup 2021-05-17 18:14:00 +02:00
Denis Merigoux
36093c885b
Added context variable declaration 2021-05-17 10:49:05 +02:00
Bartosz Woźniak
44af0acdb3 visible diacritics done 2021-05-16 21:07:14 +02:00
Bartosz Woźniak
831f4c75ae diacritics ę 2021-05-16 20:38:38 +02:00
Bartosz Woźniak
b1ecf5abc9 begin diacritics 2021-05-16 20:35:39 +02:00
Bartosz Woźniak
68e2d5c541 change form of noun for consistency 2021-05-16 20:22:53 +02:00
Denis Merigoux
f14408375a
Update to new syntax 2021-05-15 16:28:14 +02:00
Denis Merigoux
d50710d533
Merge branch 'master' into wozniak_polish 2021-05-15 16:19:41 +02:00
Denis Merigoux
f9b88e2259
Fixed heading precedence in examples 2021-05-15 16:04:35 +02:00
Denis Merigoux
3c8d187be0
Big refactoring of the literate programming structure 
Partially fixes #120
Removes the distinction between headers and articles, streamlines the surface AST
Changes affects lexers and parser
 2021-05-15 01:16:08 +02:00
Denis Merigoux
147e35083e
Point directly to executable instead of dune exec 2021-05-14 18:44:06 +02:00
Bartosz Woźniak
fec6c2b145 fix typo, issue with 0.something% still exists 2021-05-13 22:25:17 +02:00
Bartosz Woźniak
7e31b230d0 add p. 9 but why is the test failing? 0.1% * 1000 == 1, not 10 2021-05-13 22:22:49 +02:00
Bartosz Woźniak
f5a070f5a3 add p.7 2021-05-13 22:16:48 +02:00
Bartosz Woźniak
6afdca09b8 rename var 2021-05-13 22:02:52 +02:00
Bartosz Woźniak
8f4b4a0462 extract intro 2021-05-13 14:08:23 +02:00
Bartosz Woźniak
cc2ec3d613 change currency 2021-05-12 19:50:47 +02:00
Bartosz Woźniak
f66fdf2a5c extend comment 2021-05-12 19:43:31 +02:00
Bartosz Woźniak
f70e3e4296 change 'zawartosc' which means 'content' to 'typu' which means 'of the type..' 2021-05-12 19:42:40 +02:00
Bartosz Woźniak
03f6e412d9 add text's whole title - https://isap.sejm.gov.pl/isap.nsf/download.xsp/WDU20000860959/U/D20000959Lj.pdf 2021-05-12 18:56:14 +02:00
Bartosz Woźniak
219293baa7 ## headers, eng->pl fix 2021-05-12 18:54:09 +02:00
Denis Merigoux
4f9b0d63fd Fix PL pygmentz lexer and document formatting 2021-05-12 10:43:42 +02:00
Bartosz Woźniak
f5234c6bdf convert metadata stuff 2021-05-11 20:35:35 +02:00
Bartosz Woźniak
f2055d67ac tests 2021-05-09 23:15:19 +02:00
Bartosz Woźniak
e4bc4c3c8f swap english -> polish 2021-05-09 23:06:59 +02:00
Bartosz Woźniak
db46b1c444 lexer 2021-05-09 23:01:38 +02:00
Bartosz Woźniak
37c8f8da64 fixes for pdf, cleanup 2021-05-09 17:10:26 +02:00
Bartosz Woźniak
3323f47a94 add beginning of polish civil law tax 2021-05-08 17:38:52 +02:00
Denis Merigoux
2cad9823f7
Update after pair programming session on allocations familiales 
Reviewers: Liane Huttner, Wissem Haddag, Marie Moy, Anastasia de Chanaud, Athénaïs Giscard d'Estaing
 2021-04-14 23:00:46 +02:00
Denis Merigoux
e7d93a3020 Added last decret to cover 2021 2021-04-12 00:22:15 +02:00
Denis Merigoux
eaeebba72c
Basic logging exposed in Javascript 
Lacks value embedding though
 2021-04-03 19:31:38 +02:00
Denis Merigoux
c660720d18 Pair programming session on allocations familiales 2021-03-30 17:56:56 +02:00
Denis Merigoux
86e7c4ff34
Fixes #95 and #96 2021-03-19 17:36:09 +01:00
Denis Merigoux
c2bc7e9323 Fixed unit test 2021-03-18 18:23:04 +01:00
Denis Merigoux
76c86b6e6b Fixed subtle allocations familiales bugs in unreviewed part 2021-03-18 18:13:02 +01:00
Denis Merigoux
c67abdd0c5
Updating the allocations familiales library, various fixes 2021-03-17 19:35:21 +01:00
Denis Merigoux
c9c0fcea6c
Update allocations familiales after pair programming session 2021-03-17 16:00:48 +01:00
Jonathan Protzenko
fd1f72a313 Merge branch 'master' of github.com:CatalaLang/catala 2021-03-16 15:03:26 -06:00
Jonathan Protzenko
86038e1f02 Move to new syntax 2021-03-16 15:02:45 -06:00
EmileRolley
45b6736e84 fix(examples): fix inverted months and days 2021-03-16 12:46:03 +01:00
EmileRolley
55978cdbf6 refactor(examples): change the date format to ISO in the us_tax_code/section_1015 2021-03-16 12:24:32 +01:00
EmileRolley
28ff1b075b refactor: modify the parser and tests in order to support the ISO date format 2021-03-16 12:08:02 +01:00
Jonathan Protzenko
5f87633a04 Merge remote-tracking branch 'refs/remotes/origin/master' 2021-03-15 13:59:46 -06:00
Jonathan Protzenko
6375794d6b With Liane 2021-03-10 09:35:27 -06:00
EmileRolley
86d0476b58 docs(examples): update the README.md catala code examples 2021-03-10 10:57:13 +01:00
EmileRolley
b77b3bf164 refactor(examples): change remaining examples syntax 2021-03-10 10:53:24 +01:00
Jonathan Protzenko
499e6e74d6 Something that extracts 2021-03-09 16:10:50 -06:00
Jonathan Protzenko
f14e79bf23 First example for Hawaii Revised Statutes 2021-03-09 15:34:57 -06:00
EmileRolley
c0a9344eca refactor(tests): update tests based on the abbreviated english lexer 2021-03-09 22:07:31 +01:00
EmileRolley
a42d0c7728 refactor(tests): udpates tests based on the english lexer 2021-03-09 20:48:35 +01:00
EmileRolley
f650c70261 refactor(tests): update tests based on the french lexer 2021-03-09 19:11:44 +01:00
EmileRolley
9a29380a8d refactor(lexer_fr): simply '> #' to '>' for the markdown syntax of includes and metadata delimiters 2021-03-09 17:52:34 +01:00
EmileRolley
b3199194e1 refactor(examples): change the allocation_familiales example syntax to markdown 2021-03-09 17:13:08 +01:00
Denis Merigoux
a4a25f40c2
Merge pull request #82 from CatalaLang/protz_pygments 
For syntax highlighting, use a pygments plugin rather than a fork …
 2021-03-02 18:33:27 +01:00
Denis Merigoux
03774fdfc2 Fixed CI 2021-03-02 18:28:56 +01:00
Denis Merigoux
fb63c8afc8 Restore tests 2021-02-19 09:09:13 +01:00
Denis Merigoux
e9b134ab79 Progress on section121 after pair programming session 2021-02-18 18:18:34 +01:00
Denis Merigoux
252748968a Fix name 2021-02-15 21:45:11 +01:00
Denis Merigoux
494ba820b0 Continue Section121 2021-02-15 21:41:31 +01:00
Denis Merigoux
02a6cbb966 Added new decret about the SMIC 2021-02-04 18:28:56 +01:00
Denis Merigoux
b3c8b49a3b Fixed typo 2021-02-01 22:42:58 +01:00
Denis Merigoux
5c5dbc542f Js version of Allocations familiales 2021-02-01 20:09:16 +01:00
Denis Merigoux
647320d4aa Benchmark, randomness of inputs, bugs fixed 2021-01-30 17:54:05 +01:00
Denis Merigoux
313ca065f4 Benchmarked the result on allocations familiales, it is fast enough 2021-01-28 23:46:39 +01:00
Denis Merigoux
617d19df24 Improved OCaml backend, made dev loop 2021-01-28 18:30:01 +01:00
Denis Merigoux
50bccd8d13 Generated OCaml has valid syntax 2021-01-28 13:58:59 +01:00
Denis Merigoux
27b6303982 Beginning compilation to OCaml 2021-01-28 00:28:28 +01:00
Aymeric Fromherz
d856f2de72 Remove labels and named exceptions in allocations_familiales when possible 2021-01-21 23:56:36 -05:00
Aymeric Fromherz
78b4eb7ce1 Use unlabeled exceptions in US tax code 2021-01-21 23:49:43 -05:00
Denis Merigoux
c67857700a Now logging function applications 2021-01-20 23:29:50 +01:00
Denis Merigoux
3e57fe0276 Enhanced log with explanations of which definition is taken 2021-01-20 19:58:48 +01:00
James Barnes
0648f989df move metadata to prologue 2021-01-19 21:40:38 +01:00
James Barnes
2d12cf7230 correct other typo 2021-01-19 20:12:03 +01:00
James Barnes
d98df48bc4 correct typo 2021-01-19 20:11:37 +01:00
James Barnes
4cc1e92436 add subsection 1a condition 2021-01-19 20:06:39 +01:00
James Barnes
b538e4d23d add legislative text 2021-01-19 19:24:09 +01:00
Denis Merigoux
19a6a171bd Fixes #65 2021-01-18 16:21:55 +01:00
Denis Merigoux
a6338c3a9c Typos 2021-01-16 18:06:22 +01:00
Denis Merigoux
0f2937f37c Fixed date algorithm once and for all in Section121? 2021-01-16 17:23:02 +01:00
Denis Merigoux
d6426a57e5 Introduced error for experiment purposes 2021-01-15 10:42:09 +01:00
Denis Merigoux
d68d5f8018 copy/paste was too quick 2021-01-14 13:33:44 +01:00
Denis Merigoux
7ee3c62169 Precisions for French example 2021-01-14 13:25:42 +01:00
Denis Merigoux
852a6412eb Changed odate to calendarLib 2021-01-14 13:04:15 +01:00
Denis Merigoux
236c421eea Improvements for allocations familiales 2021-01-14 11:18:04 +01:00
Denis Merigoux
74647799f6 Merge branch 'master' of github.com:CatalaLang/catala 2021-01-14 00:17:42 +01:00
Denis Merigoux
267baea28d Fixes #58 2021-01-14 00:17:24 +01:00
James Barnes
00cefa68c2 correct variable case and legal error 2021-01-13 19:16:24 +01:00
James Barnes
ee6085127e note to self : Catala <> Java - use enum cases directly 2021-01-13 19:04:36 +01:00
James Barnes
ef6c9a8b3b workout total revenus depending on tax residence 2021-01-13 18:55:35 +01:00
James Barnes
2e7368b385 Revenue source enumeration 2021-01-13 18:24:08 +01:00
James Barnes
c8cedac894 add subtitle for article 2021-01-13 18:17:18 +01:00
James Barnes
a7a1a1b2c6 Add catala translation 2021-01-13 18:16:02 +01:00
James Barnes
8258a5d970 Add legislative text 2021-01-13 18:09:11 +01:00
Denis Merigoux
7a835ac5f6
Merge pull request #63 from CatalaLang/pair_programming_section_121 
Pair programming section 121
 2021-01-13 14:52:08 +01:00
Denis Merigoux
5a944a57a6 Pass old tests 2021-01-13 12:22:14 +01:00
Denis Merigoux
44d7b616a4 Improve type error messages 2021-01-13 12:04:14 +01:00
XB
a44c9076ec CamelCase is not an OCaml concept 2021-01-12 23:13:54 -05:00
Denis Merigoux
983b347cd5 Results from the pair programming session 2021-01-12 18:02:28 +01:00
Denis Merigoux
b12768c78c Strengthen USTC 121 implementation 2021-01-11 15:19:05 +01:00
Denis Merigoux
1b6843c6dd Web update 2021-01-10 20:47:01 +01:00
Denis Merigoux
46121bbbd7 Debugged allocations familiales 2021-01-10 19:35:24 +01:00
Denis Merigoux
839310d5ba Small tweak to make tutorial more climactic 2021-01-07 22:38:56 +01:00
Denis Merigoux
1494048869 Simplify code with new sugar 2021-01-06 17:33:38 +01:00
Denis Merigoux
113ca198e4 Update section121 code to make it correct 2021-01-05 16:00:42 +01:00
Denis Merigoux
4c760868b5 Fixed date algorithm 2021-01-05 14:58:44 +01:00
Denis Merigoux
f356712622 Reformat code 2021-01-05 14:48:13 +01:00
Denis Merigoux
7213f2850b Merge branch 'master' into pair_programming_section_121 2021-01-05 14:37:30 +01:00
Denis Merigoux
933fd02484
Merge pull request #45 from CatalaLang/dev 
Ongoing Catala development
 2021-01-04 14:54:11 +01:00
Louis Gesbert
3b93fc5b43 Tutorial: a few typos 2021-01-04 13:50:33 +01:00
Denis Merigoux
e94356bd0b First working prototype of allocations familiales implementation 2021-01-04 00:13:59 +01:00
Denis Merigoux
84acb971a0 More code for allocations_familiales 2021-01-03 20:36:04 +01:00
Denis Merigoux
0482acbd01 Fixed incorrect date 2021-01-03 18:52:41 +01:00
Denis Merigoux
c6b6e82b8b Various fixes, now passing first French tests 2020-12-31 00:28:26 +01:00
Denis Merigoux
5f58e93c6e Implemented all aggregate desugaring 2020-12-29 23:43:00 +01:00
Denis Merigoux
ae0cb80a25 Various fixes for French tutorial 2020-12-24 16:09:40 +01:00
James Barnes
f7bd47c38d Adapt general makefile for dual language tutorials 2020-12-24 11:37:11 +01:00
James Barnes
f0cfe89d2b Use French number notation and € symbol for monetary ops 2020-12-24 11:12:57 +01:00
James Barnes
34094be363 create seperate folders for English and French tutorials 2020-12-24 11:12:57 +01:00
James Barnes
c2e40f88c1 Translate end of document 2020-12-24 11:12:57 +01:00
James Barnes
9e160fdc06 article 6 2020-12-24 11:12:57 +01:00
James Barnes
2eaa4dd237 Translate article 5 comments 2020-12-24 11:12:57 +01:00
James Barnes
222c3262f0 Article 5 translation 2020-12-24 11:12:57 +01:00
James Barnes
87b3b45d12 Functions translation 2020-12-24 11:12:57 +01:00
James Barnes
e5cecae952 articles 1,2 and 3 translation 2020-12-24 11:12:57 +01:00
James Barnes
97481795f0 Translate metadata explanation 2020-12-24 11:12:57 +01:00
James Barnes
2ad8dafc29 Translation of article 1 paragraph 2020-12-24 11:12:57 +01:00
James Barnes
5b8a4fff9a Litterate programming paragragh translation 2020-12-24 11:12:57 +01:00
James Barnes
e0f8098853 init french translation + first paragraph 2020-12-24 11:12:57 +01:00
Denis Merigoux
33f62fefc0
Merge pull request #44 from jemsab/correct-typos-english-tutorial 
correct typos in English tutorial
 2020-12-22 18:54:47 +01:00
James Barnes
cda45a34b3 correct typos in conclusion 2020-12-22 15:50:11 +01:00
James Barnes
d7ad0f2c20 Reference to modified variable name 2020-12-22 14:32:51 +01:00
James Barnes
31b7df38ae correct typos in English tutorial 2020-12-22 11:43:26 +01:00
James Barnes
0cfab486d8 correct typo word teach 2020-12-22 10:22:25 +01:00
Denis Merigoux
2068a6ffe4 Better test suite terminal output 2020-12-21 16:15:42 +01:00
Denis Merigoux
606b148c74 Lots of documentation 2020-12-21 16:02:00 +01:00
Denis Merigoux
ed29103742 Finished tutorial 2020-12-18 16:40:43 +01:00
Denis Merigoux
6ac46a0b8f Unit tests for tutorial 2020-12-18 16:22:23 +01:00
Denis Merigoux
81c464ea7e Added labels and exceptions to surface syntax 2020-12-18 13:13:51 +01:00
Denis Merigoux
05b8a229b0 Better assertion failed message 2020-12-17 20:54:38 +01:00
Denis Merigoux
4b7e17f999 Rewrote tutorial but struct access bug 2020-12-17 20:09:33 +01:00
Denis Merigoux
1ddd46af55 Automatic unit test discovery, improved inclusion system 2020-12-11 21:17:01 +01:00
Denis Merigoux
4c219f81ff Automatic unit test detection but needs normal include 2020-12-11 15:24:10 +01:00
Denis Merigoux
ebf14f6121 Added assertions, starting to execute section132 2020-12-10 18:11:43 +01:00
Denis Merigoux
26eff2a49f Testing section 132 2020-12-10 16:58:32 +01:00
Denis Merigoux
0038a1ea2d Updated example 2020-12-10 09:42:32 +01:00
Denis Merigoux
a4916208ba amount -> money 2020-12-10 09:35:36 +01:00
Denis Merigoux
9c0a81c928 Merge branch 'master' into dev 2020-12-04 15:09:07 +01:00
Denis Merigoux
43829d65a6 Added more tests 2020-12-03 18:59:14 +01:00
Denis Merigoux
00505a9da7 Fixed newline problem! 2020-11-30 10:55:27 +01:00
Denis Merigoux
29d5389dcf Results of the pair programming session 2020-11-24 18:00:25 +01:00
Denis Merigoux
1bb664835b starting the pair programming 2020-11-24 15:52:09 +01:00
Denis Merigoux
32aa9096e6 Added fixmes 2020-11-12 16:51:26 +01:00
Denis Merigoux
ccdf5d88f6 Beginning to formalize US tax code section 121 2020-10-27 17:37:40 +01:00
Denis Merigoux
cdfa9038cf Literate programming AST now tree-shaped 2020-10-04 01:25:37 +02:00
Denis Merigoux
e54bce094c Localized files extensions, syntax highlighting for non-verbose which is now the defaul 2020-08-08 19:07:28 +02:00
jemsab
4d53dc2f9a Harmonize spelling of accented words 2020-08-05 20:54:35 +02:00
jemsab
264096b8de Define context for revenu net global calculation 2020-08-04 08:13:07 +02:00
jemsab
866b6ec5e5 Add totalling rule to complete article 1A CGI 2020-08-04 07:54:41 +02:00
jemsab
189bfca0a6 Change name and type of data structures and variables 2020-07-17 16:59:51 +02:00
jemsab
6aff67d9dd Follow naming convention of structures 2020-07-11 22:36:49 +02:00
jemsab
10db92ac66 Remove superfluous text annotations 2020-07-11 22:22:50 +02:00
jemsab
efeff8bbac Implement example article for French Tax Code (Code général des Impôts) 2020-07-11 16:22:05 +02:00
Denis Merigoux
4f8ec8191e Implemented section 1015 under Catala 2020-05-28 15:04:24 +02:00
Denis Merigoux
7018e2ab1d Transformed dummy example into real english example 2020-05-25 19:07:55 +02:00
Denis Merigoux
5243f7d363 Scope inclusion in declaration, scope use precondition 2020-05-18 11:29:22 +02:00
Denis Merigoux
57d48190ba Typos 2020-05-18 09:47:13 +02:00
Denis Merigoux
982e4f5748 Added scope inclusion to tutorial 2020-05-17 23:01:07 +02:00
Denis Merigoux
1ade06a8f9 Added beginning of tutorial 2020-05-17 18:53:54 +02:00
Denis Merigoux
8e5743c6c6 Added scope inclusion in surface language syntax 2020-05-14 23:31:57 +02:00
Denis Merigoux
686669b756 Typos and removed PDF 2020-05-14 17:18:09 +02:00
Denis Merigoux
4f91e74cb5 Improved makefiles and doc 2020-05-13 14:17:41 +02:00
Denis Merigoux
ec44f0a000 Application_field -> scope 2020-05-12 18:13:54 +02:00
Denis Merigoux
d243c562a4 Fixed surface ast with optional and collection type decorators 2020-05-07 09:40:09 +02:00