This commit is contained in:
Denis Merigoux 2021-01-16 18:06:22 +01:00
parent 0f2937f37c
commit a6338c3a9c
4 changed files with 13 additions and 13 deletions

View File

@ -25,18 +25,18 @@ This should ensure everything is set up for developping on the Catala compiler!
Other features for generation of files and literate programming also require
the following executables to be present
man2html virtualenv python3 rsync
man2html virtualenv python3 rsync colordiff
please install them if they're not here. On a Debian distribution, this can be
done with
sudo apt install python3-dev python3-setuptools man2html rsync
sudo apt install python3-dev python3-setuptools man2html rsync colordiff
sudo python3 -m pip install --upgrade pip
sudo python3 -m pip install virtualenv
On ArchLinux :
sudo pacman -S python-virtualenv man2html rsync
sudo pacman -S python-virtualenv man2html rsync colordiff
## Build

View File

@ -31,10 +31,10 @@ format:
build:
@$(MAKE) --no-print-directory -C src/catala/catala_surface parser_errors.ml
@$(MAKE) --no-print-directory format
dune build
dune build src/catala.exe
release_build:
dune build --profile release
js_build:
dune build src/catala_web/catala_web.bc.js --profile release
doc:
dune build @doc
@ -152,7 +152,7 @@ catala.html: src/catala/utils/cli.ml
dune exec src/catala.exe -- --help=groff | man2html | sed -e '1,8d' \
| tac | sed "1,20d" | tac > $@
website-assets: doc literate_examples grammar.html catala.html release_build
website-assets: doc literate_examples grammar.html catala.html js_build
##########################################
# Misceallenous
@ -164,7 +164,8 @@ clean:
dune clean
$(MAKE) -C $(ALLOCATIONS_FAMILIALES_DIR) clean
$(MAKE) -C $(US_TAX_CODE_DIR) clean
$(MAKE) -C $(TUTORIAL_DIR) clean
$(MAKE) -C $(TUTORIEL_FR_DIR) clean
$(MAKE) -C $(TUTORIAL_EN_DIR) clean
$(MAKE) -C $(CODE_GENERAL_IMPOTS_DIR) clean
inspect:

View File

@ -131,7 +131,7 @@ scope IncomeTaxComputation:
*/
In the code, we are defining inside our scope the amount of the income tax
according to the formula described in the article. When defining formulaes,
according to the formula described in the article. When defining formulae,
you have access to all the usual arithmetic operators: addition "+",
substraction "-", multiplication "*" and division (slash).
@ -165,7 +165,7 @@ definition is as close as possible to its location in the text.
@@Conditional definitions@@+
So far so good, but now the legislative text introduces some trickyness. Let us
So far so good, but now the legislative text introduces some trickiness. Let us
suppose the third article says:
@Article 3@ If the individual is in charge of 2 or more children, then the fixed
@ -350,7 +350,7 @@ scope NewIncomeTaxComputationFixed :
}
# To define an exception to a rule, you have to first label the rule that
# you want to attach to exception to. You can put any snake_case identifier
# you want to attach the exception to. You can put any snake_case identifier
# for the label
label article_5
definition income_tax equals two_brackets.tax_formula of individual.income

View File

@ -6,8 +6,7 @@ language.
It uses `make pass_tests` to launch tests and compare the test terminal output
with an expected output.
When you create a new test, please register it in the `Makefile` following the
other examples. Expected outputs are stored using the convention
Expected outputs are stored using the convention
`<name_of_test>.catala.<name_of_scope>.out` in the corresponding test folder.
For both workflows: use `CATALA_OPTS="..." make ...` to pass in Catala compiler