CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-09-20 00:41:05 +03:00
Code Issues Projects Releases Wiki Activity
4,146 Commits 41 Branches 8 Tags 60 MiB
1230f787d6
Commit Graph

261 Commits

Author SHA1 Message Date
Emile Rolley
ee6eb717c1 test(clerk): remove irelevant tests 2022-02-25 12:42:00 +01:00
Emile Rolley
abeea09d7f feat(clerk): add support for multiple inputs 
+ change the Makefile 'tests' rule to call only one time clerk
 2022-02-22 18:06:12 +01:00
Emile Rolley
bbf4b540eb test(clerk): add 'tests' for clerk 2022-02-15 20:46:33 +01:00
Emile Rolley
4fe85a6b05 refactor(clerk): add support to reset output with ninja 
- removes unit testing setup for Ninja_utils as
	  it's not useful right now.
 2022-02-14 11:49:48 +01:00
Emile Rolley
d9d8987160 refactor(clerk): add support to some Catala backends through ninja 
+ supported backends: Interpret, Scopelang, Dcalc, Proof, Typecheck
	+ some minor refactoring of clerk.ml
 2022-02-10 12:05:20 +01:00
Emile Rolley
360bbfa65f
Merge branch 'master' into refactor-clerk-w-ninja 2022-02-08 16:16:18 +01:00
Emile Rolley
7c5c6ef6fa fix(ci): add ninja-build as an executable dependencies 2022-02-08 16:14:55 +01:00
Emile Rolley
8d0c8a4e86 fix(clerk): add error redirection to the command of the test_scope rule 2022-02-08 16:11:54 +01:00
Emile Rolley
9888756503 feat(clerk): add basic ninja rule construction for test_scope 2022-02-05 20:50:42 +01:00
Denis Merigoux
e0a52168f4
opam yes 2022-02-04 14:39:34 +01:00
Denis Merigoux
b46641b549
Updated install lists 2022-02-02 11:37:45 +01:00
Denis Merigoux
6cf1b768d2
Fix bug in Python backend producing unreachable code 2022-02-01 15:41:53 +01:00
Denis Merigoux
c51ea49962
Tutorial corrections as suggested by @rmonat 2022-01-26 15:25:58 +01:00
Denis Merigoux
42d79e5169
Merge branch 'master' into proof_platform 2022-01-21 09:55:34 +01:00
Aymeric Fromherz
abba635047 Add build_dev Makefile target to avoid reformatting during development cycles [skip ci] 2022-01-14 11:25:37 +01:00
Louis Gesbert
0e1500f8f0 An attempt to simplify deps install and CI 
from the docs, the setup-ocaml@v2 github action should already handle caching...
 2022-01-13 12:15:39 +01:00
Denis Merigoux
d705334d9e
Merge branch 'master' into proof_platform 2022-01-11 15:43:33 +01:00
Denis Merigoux
fa8803e297
Bad quoting for catala compiler options 2022-01-11 13:05:04 +01:00
Denis Merigoux
b2a5551961
Test folders, nice doc and messages 2022-01-11 12:51:34 +01:00
Denis Merigoux
a963a01f60
Unit tests for examples now use clerk 2022-01-11 10:42:12 +01:00
Denis Merigoux
2b6e7c8b98
Working prototype of clerk, the new build system for Catala 2022-01-10 17:57:58 +01:00
Aymeric Fromherz
6c67ed03bb Add z3 dependency to build system 2022-01-07 16:58:24 +01:00
Denis Merigoux
7cac55cc0b
Updating assets and relaxing version constraints in Makefile 2022-01-05 17:38:49 +01:00
Denis Merigoux
29f12aa3cb
Building a JS version of the Catala compiler 2021-11-12 10:07:13 +01:00
Denis Merigoux
1a8b5716de
Closes #151 
Add pygmentize to the list of executables to be present
 2021-11-06 22:29:19 +01:00
Denis Merigoux
5000417279
Update syntax reference 2021-10-01 16:31:50 +02:00
Denis Merigoux
577bfe67a5
Added dependencies at other places 2021-08-23 14:24:39 +02:00
Denis Merigoux
7817e9a855 Add odoc to dependencies 2021-08-19 11:25:32 +02:00
Denis Merigoux
32c2e84a10
Improve Python library API 2021-06-26 17:12:15 +02:00
Denis Merigoux
ae8ef08b81
Added more doc 2021-06-25 10:50:49 +02:00
Denis Merigoux
3d2f3497bc
Switch to benchmark 2021-06-25 00:56:08 +02:00
Denis Merigoux
03b44f5b15
Python backend debugged and tested 2021-06-25 00:47:12 +02:00
Denis Merigoux
e38dc4c728
Various bugfixing and improvements for the Python backend 2021-06-25 00:16:21 +02:00
Denis Merigoux
3f5027e5a5
Translation now typechecks 2021-06-24 22:55:27 +02:00
Denis Merigoux
b68b9b31a1
More sensible order for make all 2021-06-24 18:30:54 +02:00
Denis Merigoux
0481181f92
Put mypy typing under CI 2021-06-24 18:18:25 +02:00
Denis Merigoux
817b1785df
Python translation working but still buggy 2021-06-24 17:50:08 +02:00
Denis Merigoux
015776270d
Compilation passing from lcalc to scalc 2021-06-24 14:52:51 +02:00
Denis Merigoux
46717b0440
Compiling blocks to SCalc 2021-06-22 18:16:47 +02:00
Denis Merigoux
fffd0ffb63
Working the way into the Python backend 2021-06-22 14:55:43 +02:00
Denis Merigoux
392ca25093
Install JS dependencies correctly 2021-06-21 11:54:56 +02:00
Denis Merigoux
486e103713
Fix makefile typo 2021-06-21 11:49:15 +02:00
Denis Merigoux
bbd50747d9
Big renaming and dir reorg 2021-06-21 11:39:06 +02:00
EmileRolley
f5b3786d2f refactor(syntax_highlighting)!: remove the the syntax highlighting for the abbrevitated syntax 2021-05-29 11:21:35 +02:00
Bartosz Woźniak
f50781cd67 mark vscode as todo 2021-05-16 20:14:35 +02:00
Bartosz Woźniak
95cd634bd8 add makefile targets 2021-05-13 14:01:34 +02:00
Bartosz Woźniak
21584e6444 polish syntax pygments 2021-05-10 19:05:18 +02:00
Bartosz Woźniak
db46b1c444 lexer 2021-05-09 23:01:38 +02:00
Denis Merigoux
3f5e423e9f Revert to old system... Trying to please dune gods is hard 2021-04-29 17:05:53 +02:00
Denis Merigoux
4f2b0e26c9
Typo 2021-04-29 16:23:41 +02:00
Denis Merigoux
8b5f14f1e6
Create runtime value embedding system 
Dummy for now but will be extended
 2021-04-04 16:57:59 +02:00
Denis Merigoux
6e122da489
Cheap hack to get logged values 
Will not be sufficient, we need a deep embedding
 2021-04-04 00:12:05 +02:00
Denis Merigoux
eaeebba72c
Basic logging exposed in Javascript 
Lacks value embedding though
 2021-04-03 19:31:38 +02:00
Denis Merigoux
14edecb92d Logging into OCaml backend 2021-04-03 17:58:31 +02:00
Denis Merigoux
3712125504 WIP: optimizations 2021-04-03 13:44:11 +02:00
Denis Merigoux
1229116e32
Merge branch 'master' of github.com:CatalaLang/catala 2021-04-02 17:59:33 +02:00
Denis Merigoux
c2eaf08daa Fixed missing stub in JS output 2021-04-02 17:57:44 +02:00
Denis Merigoux
c660720d18 Pair programming session on allocations familiales 2021-03-30 17:56:56 +02:00
Denis Merigoux
ceed5c06a2
Give up on ocamlformat in CI 2021-03-23 11:41:54 +01:00
Denis Merigoux
1ef533126b
Bump Ocaml and OCamlformat 2021-03-23 10:59:43 +01:00
Denis Merigoux
86e7c4ff34
Fixes #95 and #96 2021-03-19 17:36:09 +01:00
Denis Merigoux
5e0f8940e6
Changed makefiles 2021-03-18 18:31:34 +01:00
Denis Merigoux
64661f06c6 Fixed Js and bumped version number 2021-03-18 16:41:55 +01:00
Denis Merigoux
f6c1417a95
Finished syntax cheat sheet 2021-03-15 11:12:24 +01:00
Denis Merigoux
30ed2c4c49 Correct makefile path 2021-03-11 14:41:14 +01:00
Denis Merigoux
611ef23fd1 Fix makefile 2021-03-05 19:22:37 +01:00
Denis Merigoux
baaa79c555 Fixes #78, as well as various improvements 2021-03-05 19:16:56 +01:00
Denis Merigoux
03774fdfc2 Fixed CI 2021-03-02 18:28:56 +01:00
Denis Merigoux
0259573cd0 Renamed files and makefiles fixes 2021-02-28 18:18:01 +01:00
Denis Merigoux
716700c8be Merge branch 'master' into gen-parser-msgs 2021-02-17 10:45:43 +01:00
Denis Merigoux
2b1c28302a Update makefile rule 2021-02-12 18:56:36 +01:00
Louis Gesbert
c628b31d12 Generate parser.messages from dune 
(and remove generated `parser_errors.ml` from git)
 2021-02-12 18:28:22 +01:00
Louis Gesbert
edd94dcc0e Rename directories to match the names of the libraries they contain 2021-02-12 17:26:39 +01:00
Denis Merigoux
f2c4303f53 Update website assets make rules 2021-02-04 11:17:45 +01:00
Denis Merigoux
f685c9302f Added test suite for compiled code 2021-02-03 10:53:21 +01:00
Denis Merigoux
b3c8b49a3b Fixed typo 2021-02-01 22:42:58 +01:00
Denis Merigoux
c212a1e2f8 Fixed makefile 2021-02-01 20:24:50 +01:00
Denis Merigoux
5c5dbc542f Js version of Allocations familiales 2021-02-01 20:09:16 +01:00
Denis Merigoux
aed578d6df Dox fix 2021-01-30 18:00:49 +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
a9d415b7b9 Added map visitors to surface AST 2021-01-20 16:27:39 +01:00
Denis Merigoux
a6338c3a9c Typos 2021-01-16 18:06:22 +01:00
Denis Merigoux
852a6412eb Changed odate to calendarLib 2021-01-14 13:04:15 +01:00
Denis Merigoux
8a2bf4e389 Better trace 2021-01-09 21:03:32 +01:00
Denis Merigoux
06803e4170 Fixed makefile and dune_porject 2021-01-05 14:35:04 +01:00
Denis Merigoux
f966fc87d0 Added web-compatible version of the Catala interpreter 2020-12-26 17:37:45 +01:00
James Barnes
f7bd47c38d Adapt general makefile for dual language tutorials 2020-12-24 11:37:11 +01:00
Denis Merigoux
dbfd990f95 Makefile tweaks 2020-12-21 18:26:01 +01:00
Denis Merigoux
293438ea38 Missing JS stubs 2020-12-21 18:15:53 +01:00
Denis Merigoux
73c19df068 Added the js_of_ocaml to the deps 2020-12-21 16:06:01 +01:00
Denis Merigoux
606b148c74 Lots of documentation 2020-12-21 16:02:00 +01:00
Denis Merigoux
e33ea8d55c Finished documentation 2020-12-14 18:09:38 +01:00
Denis Merigoux
8f8d322400 Fixed makefile wrangling 2020-12-10 18:21:48 +01:00
Denis Merigoux
ebf14f6121 Added assertions, starting to execute section132 2020-12-10 18:11:43 +01:00
Denis Merigoux
902c3f8d7d Added date and durations handling 2020-12-10 11:35:56 +01:00
Denis Merigoux
be563a24f6 Defined operators for dec and money 2020-12-09 14:51:22 +01:00
Denis Merigoux
0e7943b8f7 Fix makefile 2020-11-23 09:33:07 +01:00
Denis Merigoux
4c66a09895 Added bindlib as a dependency 2020-11-22 21:04:29 +01:00
Denis Merigoux
32800d3011 Added unionfind as a dependencu 2020-11-22 21:00:14 +01:00
Denis Merigoux
1d0517d5b8 Remove mentions to LegiFrance Catala 2020-10-04 13:02:50 +02:00
Denis Merigoux
cdfa9038cf Literate programming AST now tree-shaped 2020-10-04 01:25:37 +02:00
Denis Merigoux
0cda3ba819 Big renaming 2020-09-12 17:03:42 +02:00
Denis Merigoux
144b1e7d0d Added VSCode syntax highlighting! 2020-08-18 23:16:27 +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
Denis Merigoux
df25d5d94d Automated test suite! 2020-08-07 17:37:28 +02:00
Denis Merigoux
00286605dc
Merge pull request #22 from CatalaLang/proto 
Prototype implementation featuring only the core default calculus and scope language
 2020-08-04 15:02:49 +02:00
Nicolas Chataing
15c1df9fa7 Add ocamlgraph dependency in the Makefile 2020-08-03 16:41:51 +02:00
jemsab
f2a33977eb Set directory for code_general_impots 2020-07-11 16:22:05 +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
09d0aeeb57 Makefile should now build examples 2020-05-26 11:38:52 +02:00
Denis Merigoux
7018e2ab1d Transformed dummy example into real english example 2020-05-25 19:07:55 +02:00
Denis Merigoux
962109be36 Added doc generation to website assets 2020-05-23 17:39:16 +02:00
Denis Merigoux
cd9957b8c4 Add interface and doc to api.ml 2020-05-22 23:02:48 +02:00
Denis Merigoux
1ade06a8f9 Added beginning of tutorial 2020-05-17 18:53:54 +02:00
Denis Merigoux
f3aabf5287 Field -> Scope 2020-05-14 21:19:46 +02:00
Denis Merigoux
c03f2c27f5 More README 2020-05-13 14:53:53 +02:00
Denis Merigoux
ad14eb532d Fixed git submodule init dependency 2020-05-13 14:37:09 +02:00
Denis Merigoux
de3ddfe829 Added git submodule initialization as a dependency of pygments 2020-05-13 14:20:15 +02:00
Denis Merigoux
4f91e74cb5 Improved makefiles and doc 2020-05-13 14:17:41 +02:00
Denis Merigoux
e75b67ba99
Merge pull request #6 from kaepora/patch-1 
Add missing dependency
 2020-05-13 14:10:21 +02:00
Denis Merigoux
6eb681c5f1 Modified Makefile 2020-05-13 13:53:24 +02:00
Nadim Kobeissi
a7d2ff0cd8
Add missing dependency 
Currently, ocamlformat is not installed by `make install-dependencies`, which leads to the following error while running `make build`:

```bash
~/Documents/git/catala master 2m 20s                       
❯ make build                                               
/Applications/Xcode.app/Contents/Developer/usr/bin/make -C src/catala/parsing parser_errors.ml                         
make[1]: `parser_errors.ml' is up to date.
dune build                                                                                                            
    ocamlopt src/legifrance_catala.exe                                                                                
ld: warning: directory not found for option '-L/opt/local/lib'                                                        
/Applications/Xcode.app/Contents/Developer/usr/bin/make format                                                        
dune build @fmt --auto-promote | true                                                                                 
Error: Program ocamlformat not found in the tree or in PATH                                                           
 (context: default)                                                                                                   
Done: 119/183 (jobs: 2)File "syntax_highlighting/fr/pygments/pygments/tests/examplefiles/test.re", line 1, characters 0-0:
Done: 120/183 (jobs: 2)File "syntax_highlighting/en/pygments/pygments/tests/examplefiles/test.re", line 1, characters 0-0:
         git (internal) (exit 1)                                                                                      
```

This pull request fixes this problem.
 2020-05-13 13:09:39 +02:00
Denis Merigoux
d89c4f1bfb Better man page generation 2020-05-12 12:08:40 +02:00
Denis Merigoux
d243c562a4 Fixed surface ast with optional and collection type decorators 2020-05-07 09:40:09 +02:00
Denis Merigoux
0f4655be5d Correct file opening 2020-05-05 17:23:03 +02:00
Denis Merigoux
5a4458041f Properly generate HTML assets 2020-05-05 17:05:39 +02:00
Denis Merigoux
a982ec5f51 Added retrieval of whole decrets text from LegiFrance 2020-04-30 12:15:26 +02:00
Denis Merigoux
a2fd1a228a Fixed all syntax highlighting scripts 2020-04-27 09:57:13 +02:00
Denis Merigoux
bd9401c034 Added english atom syntax highlighting 2020-04-26 20:59:04 +02:00
Denis Merigoux
0ba61d9a0d Preparation for en version of syntax highlighting 2020-04-26 20:48:51 +02:00
Denis Merigoux
523ecd3b32 Added missing dune-build-info dep 2020-04-26 20:16:03 +02:00
Denis Merigoux
bc64b301fb Split dependencies rule 2020-04-26 18:42:42 +02:00
Denis Merigoux
6aaf51535a Missing dependency 2020-04-26 12:20:09 +02:00
Denis Merigoux
d0aad54e84 Completed machinery to enjoy custom parser error messages! 2020-04-25 19:22:53 +02:00
Denis Merigoux
c270c5fbab Removed optional condition on meta assertions 2020-04-25 14:21:26 +02:00
Denis Merigoux
6fd013d0d5 Produced token list in english! 2020-04-24 19:16:50 +02:00
Denis Merigoux
c6cbc00cc9 Rewrote custom diff 
Not very optimized but does the job much better than the buggy OPAM package I was using
 2020-04-23 11:13:27 +02:00
Denis Merigoux
0f5da2c27d Small changes and refactor 2020-04-22 19:16:06 +02:00
Denis Merigoux
4033b06e33 Added diffing with new version but still buggy 2020-04-22 15:42:09 +02:00
Denis Merigoux
8158d8cd35 Small API change 2020-04-22 14:39:32 +02:00
Denis Merigoux
aab7eb54a1 Begining to add LegiFrance API connection 
Added attempt at article retrieval

New system
 2020-04-21 19:22:42 +02:00
Denis Merigoux
5132478f87 At last a Makefile system that works 2020-04-20 19:37:16 +02:00
Denis Merigoux
6db3984a30 Fixed wrong dir 2020-04-20 09:07:12 +02:00
Denis Merigoux
a76a2a4622 Renaming, better Makefile factorization 2020-04-20 09:02:08 +02:00
Denis Merigoux
0584afb640 Local makefiles 2020-04-20 08:35:22 +02:00
Denis Merigoux
0977ae326e PDF now shows file location 2020-04-19 19:04:11 +02:00
Denis Merigoux
b57bb05325 Added Makefile automatic dependency discovering 2020-04-19 18:39:16 +02:00
Denis Merigoux
f3c8a9241d Added manual dependency 2020-04-19 16:30:18 +02:00