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
f31c07f991
Merge pull request #4 from risseraka/patch-1
...
Fix typo
2020-05-13 10:40:22 +02:00
Denis Merigoux
9a97d0af25
Updated README.md
2020-05-13 10:25:39 +02:00
Denis Merigoux
dd267a8c2a
Added english asset
2020-05-12 19:02:55 +02:00
Denis Merigoux
ec44f0a000
Application_field -> scope
2020-05-12 18:13:54 +02:00
Denis Merigoux
0c03491d3a
Merge branch 'master' into ir
2020-05-12 17:52:21 +02:00
Denis Merigoux
8a3bc7b012
Merge branch 'html_pp'
2020-05-12 17:51:23 +02:00
Denis Merigoux
3794d94fb4
Removed failed pp attempt
2020-05-12 17:51:06 +02:00
Denis Merigoux
d89c4f1bfb
Better man page generation
2020-05-12 12:08:40 +02:00
Denis Merigoux
d2c92c8a02
Begin to print ast in html
2020-05-10 18:45:05 +02:00
Denis Merigoux
d243c562a4
Fixed surface ast with optional and collection type decorators
2020-05-07 09:40:09 +02:00
Denis Merigoux
39ee3a260e
Scp to send to server
2020-05-06 15:35:43 +02:00
Adrien Risser
4185263ba7
Fix typo
2020-05-06 10:37:00 +02:00
Adrien Risser
3211c552b0
Fix typo
2020-05-06 10:35:08 +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
ca7def2783
Better error messages
2020-05-03 14:06:13 +02:00
Nicolas Chataing
2ec9682c8d
Corrected mistakes
2020-04-30 13:34:23 +02:00
Denis Merigoux
440f5f8f24
Remove generated grammar file
2020-04-30 12:16:23 +02:00
Denis Merigoux
a982ec5f51
Added retrieval of whole decrets text from LegiFrance
2020-04-30 12:15:26 +02:00
Denis Merigoux
963ae01acf
Begin to include text directly from LegiFrance
2020-04-30 10:19:45 +02:00
Denis Merigoux
23742bbcd7
Added line breaks in HTML literate output
2020-04-30 08:46:41 +02:00
Nicolas Chataing
4ae2cb5392
Small rework of the intermediate reprs
2020-04-29 20:36:26 +02:00
Denis Merigoux
895f7e2c01
Fix lexer and HTML
2020-04-29 15:55:50 +02:00
Denis Merigoux
a1cc782e3d
Tweak HTML output a little
2020-04-29 11:34:22 +02:00
Denis Merigoux
d3e996dd44
Added HTML backend formatting with colors
2020-04-29 11:10:56 +02:00
Denis Merigoux
51af377c46
First HTML backend
2020-04-29 09:55:49 +02:00
Nicolas Chataing
eec27cc28b
Merge pull request #2 from CatalaLang/ir
...
Lambda calculus representation
2020-04-28 20:17:32 +02:00
Nicolas Chataing
4f30c3e9fc
Add the definition of programs with and without default logic
2020-04-28 18:38:28 +02:00
Nicolas Chataing
38759ae7a0
Use types from ir in lambda. Add polymorphic introduction and elimination
2020-04-28 18:38:14 +02:00
Nicolas Chataing
f4cc917dc2
Corrected typos in ir
2020-04-28 18:38:08 +02:00
Nicolas Chataing
87ee21009c
First draft of the lambda calculus representation
2020-04-28 18:37:56 +02:00
Denis Merigoux
974797ac97
Fixed new project homepage
2020-04-28 15:08:12 +02:00
Nicolas Chataing
c5062f7905
Merge pull request #1 from CatalaLang/ir
...
First intermediate representation
2020-04-27 15:33:21 +02:00
Denis Merigoux
50737e3a80
Small modifications under the control of Nicolas
2020-04-27 15:08:39 +02:00
Nicolas Chataing
8740d4787d
Remove pos from within WithId modules and overall improvement
2020-04-27 11:52:06 +02:00
Denis Merigoux
64c85020ab
Better qident parsing
2020-04-27 10:50:28 +02:00
Nicolas Chataing
b6f60a6300
Generalize use of Id.WithId
2020-04-27 10:06:23 +02:00
Denis Merigoux
7d0ba8cdd1
Int32 and diff
2020-04-27 10:06:23 +02:00
Nicolas Chataing
8a3c4dcae6
First proposition for the intermediate repr
2020-04-27 10:05:15 +02:00
Denis Merigoux
2b6e1c3920
Update doc
2020-04-27 10:04:13 +02:00
Denis Merigoux
a2fd1a228a
Fixed all syntax highlighting scripts
2020-04-27 09:57:13 +02:00
Denis Merigoux
b0a3b1312e
Debugged english coloring (dollar sign was the problem)
2020-04-27 09:34:25 +02:00
Denis Merigoux
d4340fa25d
Added english syntax highlighting but still buggy
2020-04-26 22:53:43 +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
