Commit Graph

40 Commits

Author SHA1 Message Date
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
Denis Merigoux
d85de8e612 Split implem in multiple files 2020-04-19 16:30:13 +02:00
Denis Merigoux
c98c748d9d Added text fields 2020-04-17 15:53:23 +02:00
Denis Merigoux
d8c57ec28b More doc! 2020-04-17 15:12:11 +02:00
Denis Merigoux
72bf4d01cb Big refactoring, better pdf build reproducibility 2020-04-17 12:29:30 +02:00
Denis Merigoux
a9a10f0e7f Rename to Catala! 2020-04-16 18:42:37 +02:00
Denis Merigoux
f5c23d213a Up to R21-3 (not included 2020-04-13 18:57:24 +02:00
Denis Merigoux
cece7e9235 Remove old file 2020-04-11 15:36:40 +02:00
Denis Merigoux
f22be88a5f Update parser for rules 2020-04-03 22:34:11 +02:00
Denis Merigoux
90354f911d Added attempt at internal ast 2020-03-12 18:04:27 +01:00
Denis Merigoux
fed849201e Added proper syntax highlighting + Utf8 support complete! 2020-03-09 19:14:06 +01:00
Denis Merigoux
71e5d89fac Successfully weaved all text 2020-03-07 18:30:37 -08:00