CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Update syntax highlighting and test suite [skip ci]

Browse Source
This commit is contained in:
Denis Merigoux 2022-02-07 12:04:48 +01:00
parent e3b5d2d0b6
commit 2263dd7dab
No known key found for this signature in database
GPG Key ID: EE99DCFA365C3EE3
71 changed files with 255 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/scopelang/scope_to_dcalc.ml
View File

@ -274,10 +274,10 @@ let rec translate_expr (ctx : ctx) (e : Ast.expr Pos.marked) : Dcalc.Ast.expr Po
with Not_found -> with Not_found ->
Errors.raise_spanned_error Errors.raise_spanned_error
(Format.asprintf (Format.asprintf
"The variable %a.%a cannot be used here,\n\ "The variable %a.%a cannot be used here, as it is not part subscope %a's results. \
as subscope %a's results will not have been computed yet" Ast.SubScopeName.format_t Maybe you forgot to qualify it as an output?"
(Pos.unmark s) Ast.ScopeVar.format_t (Pos.unmark a) Ast.SubScopeName.format_t Ast.SubScopeName.format_t (Pos.unmark s) Ast.ScopeVar.format_t (Pos.unmark a)
(Pos.unmark s)) Ast.SubScopeName.format_t (Pos.unmark s))
(Pos.get_position e)) (Pos.get_position e))
| EIfThenElse (cond, et, ef) -> | EIfThenElse (cond, et, ef) ->
Bindlib.box_apply3 Bindlib.box_apply3

20
compiler/surface/parser.messages
View File

@ -1,6 +1,6 @@
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT TEXT YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT TEXT YEAR
## ##
## Ends in an error in state: 348. ## Ends in an error in state: 349.
## ##
## nonempty_list(enum_decl_line) -> enum_decl_line . [ SCOPE END_CODE DECLARATION ] ## nonempty_list(enum_decl_line) -> enum_decl_line . [ SCOPE END_CODE DECLARATION ]
## nonempty_list(enum_decl_line) -> enum_decl_line . nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ] ## nonempty_list(enum_decl_line) -> enum_decl_line . nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
@ -13,7 +13,7 @@ expected another enum case, or a new declaration or scope use
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT YEAR
## ##
## Ends in an error in state: 343. ## Ends in an error in state: 344.
## ##
## enum_decl_line_payload -> CONTENT . typ [ SCOPE END_CODE DECLARATION ALT ] ## enum_decl_line_payload -> CONTENT . typ [ SCOPE END_CODE DECLARATION ALT ]
## ##
@ -25,7 +25,7 @@ expected a content type
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR YEAR
## ##
## Ends in an error in state: 342. ## Ends in an error in state: 343.
## ##
## enum_decl_line -> ALT constructor . option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ] ## enum_decl_line -> ALT constructor . option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ]
## ##
@ -37,7 +37,7 @@ expected a payload for your enum case, or another case or declaration
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT YEAR
## ##
## Ends in an error in state: 341. ## Ends in an error in state: 342.
## ##
## enum_decl_line -> ALT . constructor option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ] ## enum_decl_line -> ALT . constructor option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ]
## ##
@ -49,7 +49,7 @@ expected the name of an enum case
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON YEAR
## ##
## Ends in an error in state: 340. ## Ends in an error in state: 341.
## ##
## code_item -> DECLARATION ENUM constructor COLON . nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ] ## code_item -> DECLARATION ENUM constructor COLON . nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
## ##
@ -61,7 +61,7 @@ expected an enum case
source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR YEAR source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR YEAR
## ##
## Ends in an error in state: 339. ## Ends in an error in state: 340.
## ##
## code_item -> DECLARATION ENUM constructor . COLON nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ] ## code_item -> DECLARATION ENUM constructor . COLON nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
## ##
@ -73,7 +73,7 @@ expected a colon
source_file: BEGIN_CODE DECLARATION ENUM YEAR source_file: BEGIN_CODE DECLARATION ENUM YEAR
## ##
## Ends in an error in state: 338. ## Ends in an error in state: 339.
## ##
## code_item -> DECLARATION ENUM . constructor COLON nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ] ## code_item -> DECLARATION ENUM . constructor COLON nonempty_list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
## ##
@ -130,7 +130,7 @@ source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT DEP
## ##
## Ends in an error in state: 303. ## Ends in an error in state: 303.
## ##
## typ -> collection_marked . typ [ SCOPE INTERNAL INPUT END_CODE DEPENDS DECLARATION DATA CONTEXT CONDITION ALT ] ## typ -> collection_marked . typ [ SCOPE OUTPUT INTERNAL INPUT IDENT END_CODE DEPENDS DECLARATION DATA CONTEXT CONDITION ALT ]
## ##
## The known suffix of the stack is as follows: ## The known suffix of the stack is as follows:
## collection_marked ## collection_marked
@ -154,7 +154,7 @@ source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT DEP
## ##
## Ends in an error in state: 307. ## Ends in an error in state: 307.
## ##
## struct_scope_func -> DEPENDS . typ [ SCOPE INTERNAL INPUT END_CODE DECLARATION DATA CONTEXT CONDITION ] ## struct_scope_func -> DEPENDS . typ [ SCOPE OUTPUT INTERNAL INPUT IDENT END_CODE DECLARATION DATA CONTEXT CONDITION ]
## ##
## The known suffix of the stack is as follows: ## The known suffix of the stack is as follows:
## DEPENDS ## DEPENDS
@ -1867,7 +1867,7 @@ expected the name of the scope being used
source_file: BEGIN_CODE YEAR source_file: BEGIN_CODE YEAR
## ##
## Ends in an error in state: 366. ## Ends in an error in state: 367.
## ##
## source_file_item -> BEGIN_CODE . code END_CODE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ] ## source_file_item -> BEGIN_CODE . code END_CODE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
## ##

18
compiler/surface/parser.mly
View File

@ -498,7 +498,6 @@ struct_scope:
scope_decl_item_attribute_input: scope_decl_item_attribute_input:
| CONTEXT { Context, Pos.from_lpos $sloc } | CONTEXT { Context, Pos.from_lpos $sloc }
| INPUT { Input, Pos.from_lpos $sloc } | INPUT { Input, Pos.from_lpos $sloc }
| INTERNAL { Internal, Pos.from_lpos $sloc }
scope_decl_item_attribute_output: scope_decl_item_attribute_output:
| OUTPUT { true, Pos.from_lpos $sloc } | OUTPUT { true, Pos.from_lpos $sloc }
@ -509,9 +508,22 @@ scope_decl_item_attribute:
output = scope_decl_item_attribute_output { output = scope_decl_item_attribute_output {
{ {
scope_decl_context_io_input = input; scope_decl_context_io_input = input;
scope_decl_context_io_output = output scope_decl_context_io_output = output
} }
} }
| INTERNAL {
{
scope_decl_context_io_input = (Internal, Pos.from_lpos $sloc);
scope_decl_context_io_output = (false, Pos.from_lpos $sloc)
}
}
| OUTPUT {
{
scope_decl_context_io_input = (Internal, Pos.from_lpos $sloc);
scope_decl_context_io_output = (true, Pos.from_lpos $sloc)
}
}
scope_decl_item: scope_decl_item:
| attr = scope_decl_item_attribute i = ident CONTENT t = typ func_typ = option(struct_scope_func) { (ContextData ({ | attr = scope_decl_item_attribute i = ident CONTENT t = typ func_typ = option(struct_scope_func) { (ContextData ({
@ -527,7 +539,7 @@ scope_decl_item:
}, Pos.from_lpos $sloc); }, Pos.from_lpos $sloc);
}), Pos.from_lpos $sloc) }), Pos.from_lpos $sloc)
} }
| INTERNAL i = ident SCOPE c = constructor { | i = ident SCOPE c = constructor {
(ContextScope({ (ContextScope({
scope_decl_context_scope_name = i; scope_decl_context_scope_name = i;
scope_decl_context_scope_sub_scope = c; scope_decl_context_scope_sub_scope = c;

4
syntax_highlighting/en/ace/mode-catala_en.js
View File

@ -63,9 +63,9 @@ ace.define(
regex: "(\\s*\\#.*$)", regex: "(\\s*\\#.*$)",
}, },
{ {
token: ["keyword.other", "text", "entity.name.function"], token: ["keyword.other", "text", "keyword.other", "text", "entity.name.function"],
regex: regex:
"(context|input|output|internal)(\\s+)([a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00ea\u0153\u00e7][a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00ea\u0153\u00e7A-Z\u00c9\u00c8\u00c0\u00c2\u00d9\u00ce\u00ca\u0152\u00c70-9_\\']*)", "(context|input|output|internal)(\\s*)(|output)(\\s+)(\\s+)([a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00ea\u0153\u00e7][a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00ea\u0153\u00e7A-Z\u00c9\u00c8\u00c0\u00c2\u00d9\u00ce\u00ca\u0152\u00c70-9_\\']*)",
}, },
{ {
token: "keyword.control", token: "keyword.control",

8
syntax_highlighting/en/atom/grammars/catala_en.cson
View File

@ -101,7 +101,7 @@
'name' : 'comment.line.catala_en' 'name' : 'comment.line.catala_en'
} }
{ {
'match' : '(context|input|output|internal)(\\s+)([a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00ea}\\x{0153}\\x{00e7}][a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00ea}\\x{0153}\\x{00e7}A-Z\\x{00c9}\\x{00c8}\\x{00c0}\\x{00c2}\\x{00d9}\\x{00ce}\\x{00ca}\\x{0152}\\x{00c7}0-9_\\\']*)' 'match' : '(context|input|output|internal)(\\s*)(|output)(\\s+)([a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00ea}\\x{0153}\\x{00e7}][a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00ea}\\x{0153}\\x{00e7}A-Z\\x{00c9}\\x{00c8}\\x{00c0}\\x{00c2}\\x{00d9}\\x{00ce}\\x{00ca}\\x{0152}\\x{00c7}0-9_\\\']*)'
'captures' : { 'captures' : {
'1' : { '1' : {
'name' : 'keyword.other.catala_en' 'name' : 'keyword.other.catala_en'
@ -110,6 +110,12 @@
'name' : 'text.catala_en' 'name' : 'text.catala_en'
} }
'3' : { '3' : {
'name' : 'keyword.other.catala_en'
}
'4' : {
'name' : 'text.catala_en'
}
'5' : {
'name' : 'entity.name.function.catala_en' 'name' : 'entity.name.function.catala_en'
} }
} }

4
syntax_highlighting/en/catala_en.iro
View File

@ -193,8 +193,8 @@ code : context {
} }
: pattern { : pattern {
regex \= (context|input|output|internal)(\s+)($${__SC_ID}) regex \= (context|input|output|internal)(\s*)(|output)(\s+)($${__SC_ID})
styles [] = .keyword_rule, .whitespace, .sc_id_def; styles [] = .keyword_rule, .whitespace, .keyword_rule, .whitespace, .sc_id_def;
} }
: pattern { : pattern {

4
syntax_highlighting/en/pygments/catala_en_lexer/lexer.py
View File

@ -25,8 +25,8 @@ class CatalaEnLexer(RegexLexer):
'code': [ 'code': [
(u'(```)', bygroups(Text), 'root'), (u'(```)', bygroups(Text), 'root'),
(u'(\\s*\\#.*$)', bygroups(Comment.Single)), (u'(\\s*\\#.*$)', bygroups(Comment.Single)),
(u'(context|input|output|internal)(\\s+)([a-z\xe9\xe8\xe0\xe2\xf9\xee\xea\u0153\xe7][a-z\xe9\xe8\xe0\xe2\xf9\xee\xea\u0153\xe7A-Z\xc9\xc8\xc0\xc2\xd9\xce\xca\u0152\xc70-9_\\\']*)', (u'(context|input|output|internal)(\\s*)(|output)(\\s+)([a-z\xe9\xe8\xe0\xe2\xf9\xee\xea\u0153\xe7][a-z\xe9\xe8\xe0\xe2\xf9\xee\xea\u0153\xe7A-Z\xc9\xc8\xc0\xc2\xd9\xce\xca\u0152\xc70-9_\\\']*)',
bygroups(Keyword.Declaration, Text, Name.Variable)), bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Name.Variable)),
(u'\\b(match|with\\s+pattern|fixed|by|decreasing|increasing|varies|with|we\\s+have|in|such\\s+that|exists|for|all|of|if|then|else|initial)\\b', (u'\\b(match|with\\s+pattern|fixed|by|decreasing|increasing|varies|with|we\\s+have|in|such\\s+that|exists|for|all|of|if|then|else|initial)\\b',
bygroups(Keyword.Reserved)), bygroups(Keyword.Reserved)),
(u'\\b(scope|depends\\s+on|declaration|includes|collection|content|optional|structure|enumeration|context|input|output|internal|rule|under\\s+condition|condition|data|consequence|fulfilled|equals|assertion|definition|label|exception|anything)\\b', (u'\\b(scope|depends\\s+on|declaration|includes|collection|content|optional|structure|enumeration|context|input|output|internal|rule|under\\s+condition|condition|data|consequence|fulfilled|equals|assertion|definition|label|exception|anything)\\b',

2
syntax_highlighting/en/vim/catala_en.vim
View File

@ -34,7 +34,7 @@ syn match punctuation contained "\(--\|\;\|\.\|,\|\:\|(\|)\|\[\|\]\|{\|}\)"
syn keyword Type contained integer boolean date duration money text decimal number sum syn keyword Type contained integer boolean date duration money text decimal number sum
syn region ctxt contained syn region ctxt contained
\ matchgroup=Keyword start="\<context\|input\|output\|internal" \ matchgroup=Keyword start="\<\(context\|input\|output\|internal\)\(\|\s\+output\)"
\ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>" \ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>"
syn region cc_id_dot_sc_id contained contains=punctuation syn region cc_id_dot_sc_id contained contains=punctuation

12
syntax_highlighting/en/vscode/syntaxes/catalavs.xml
View File

@ -162,7 +162,7 @@
</dict> </dict>
<dict> <dict>
<key>match</key> <key>match</key>
<string>(context|input|output|internal)(\s+)([a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00ea}\x{0153}\x{00e7}][a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00ea}\x{0153}\x{00e7}A-Z\x{00c9}\x{00c8}\x{00c0}\x{00c2}\x{00d9}\x{00ce}\x{00ca}\x{0152}\x{00c7}0-9_\&apos;]*)</string> <string>(context|input|output|internal)(\s*)(|output)(\s+)([a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00ea}\x{0153}\x{00e7}][a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00ea}\x{0153}\x{00e7}A-Z\x{00c9}\x{00c8}\x{00c0}\x{00c2}\x{00d9}\x{00ce}\x{00ca}\x{0152}\x{00c7}0-9_\&apos;]*)</string>
<key>captures</key> <key>captures</key>
<dict> <dict>
<key>1</key> <key>1</key>
@ -176,6 +176,16 @@
<string>text.catala_en</string> <string>text.catala_en</string>
</dict> </dict>
<key>3</key> <key>3</key>
<dict>
<key>name</key>
<string>keyword.other.catala_en</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>text.catala_en</string>
</dict>
<key>5</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>entity.name.function.catala_en</string> <string>entity.name.function.catala_en</string>

4
syntax_highlighting/fr/ace/mode-catala_fr.js
View File

@ -63,9 +63,9 @@ ace.define(
regex: "(\\s*\\#.*$)", regex: "(\\s*\\#.*$)",
}, },
{ {
token: ["keyword.other", "text", "entity.name.function"], token: ["keyword.other", "text", "keyword.other", "text", "entity.name.function"],
regex: regex:
"(contexte|entr\u00e9e|sortie|interne)(\\s+)([a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00f4\u00ea\u0153\u00e7][a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00f4\u00ea\u0153\u00e7A-Z\u00c9\u00c8\u00c0\u00c2\u00d9\u00ce\u00d4\u00ca\u0152\u00c70-9_\\']*)", "(contexte|entr\u00e9e|sortie|interne)(\\s*)(|sortie)(\\s+)([a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00f4\u00ea\u0153\u00e7][a-z\u00e9\u00e8\u00e0\u00e2\u00f9\u00ee\u00f4\u00ea\u0153\u00e7A-Z\u00c9\u00c8\u00c0\u00c2\u00d9\u00ce\u00d4\u00ca\u0152\u00c70-9_\\']*)",
}, },
{ {
token: "keyword.control", token: "keyword.control",

8
syntax_highlighting/fr/atom/grammars/catala_fr.cson
View File

@ -101,7 +101,7 @@
'name' : 'comment.line.catala_fr' 'name' : 'comment.line.catala_fr'
} }
{ {
'match' : '(contexte|entr\\x{00e9}e|sortie|interne)(\\s+)([a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00f4}\\x{00ea}\\x{0153}\\x{00e7}][a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00f4}\\x{00ea}\\x{0153}\\x{00e7}A-Z\\x{00c9}\\x{00c8}\\x{00c0}\\x{00c2}\\x{00d9}\\x{00ce}\\x{00d4}\\x{00ca}\\x{0152}\\x{00c7}0-9_\\\']*)' 'match' : '(contexte|entr\\x{00e9}e|sortie|interne)(\\s*)(|sortie)(\\s+)([a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00f4}\\x{00ea}\\x{0153}\\x{00e7}][a-z\\x{00e9}\\x{00e8}\\x{00e0}\\x{00e2}\\x{00f9}\\x{00ee}\\x{00f4}\\x{00ea}\\x{0153}\\x{00e7}A-Z\\x{00c9}\\x{00c8}\\x{00c0}\\x{00c2}\\x{00d9}\\x{00ce}\\x{00d4}\\x{00ca}\\x{0152}\\x{00c7}0-9_\\\']*)'
'captures' : { 'captures' : {
'1' : { '1' : {
'name' : 'keyword.other.catala_fr' 'name' : 'keyword.other.catala_fr'
@ -110,6 +110,12 @@
'name' : 'text.catala_fr' 'name' : 'text.catala_fr'
} }
'3' : { '3' : {
'name' : 'keyword.other.catala_fr'
}
'4' : {
'name' : 'text.catala_fr'
}
'5' : {
'name' : 'entity.name.function.catala_fr' 'name' : 'entity.name.function.catala_fr'
} }
} }

4
syntax_highlighting/fr/catala_fr.iro
View File

@ -193,8 +193,8 @@ code : context {
} }
: pattern { : pattern {
regex \= (contexte|entrée|sortie|interne)(\s+)($${__SC_ID}) regex \= (contexte|entrée|sortie|interne)(\s*)(|sortie)(\s+)($${__SC_ID})
styles [] = .keyword_rule, .whitespace, .sc_id_def; styles [] = .keyword_rule, .whitespace, .keyword_rule, .whitespace, .sc_id_def;
} }
: pattern { : pattern {

4
syntax_highlighting/fr/pygments/catala_fr_lexer/lexer.py
View File

@ -26,8 +26,8 @@ class CatalaFrLexer(RegexLexer):
'code': [ 'code': [
(u'(```)', bygroups(Text), 'root'), (u'(```)', bygroups(Text), 'root'),
(u'(\\s*\\#.*$)', bygroups(Comment.Single)), (u'(\\s*\\#.*$)', bygroups(Comment.Single)),
(u'(contexte|entr\xe9e|sortie|interne)(\\s+)([a-z\xe9\xe8\xe0\xe2\xf9\xee\xf4\xea\u0153\xe7][a-z\xe9\xe8\xe0\xe2\xf9\xee\xf4\xea\u0153\xe7A-Z\xc9\xc8\xc0\xc2\xd9\xce\xd4\xca\u0152\xc70-9_\\\']*)', (u'(contexte|entr\xe9e|sortie|interne)(\\s*)(|sortie)(\\s+)([a-z\xe9\xe8\xe0\xe2\xf9\xee\xf4\xea\u0153\xe7][a-z\xe9\xe8\xe0\xe2\xf9\xee\xf4\xea\u0153\xe7A-Z\xc9\xc8\xc0\xc2\xd9\xce\xd4\xca\u0152\xc70-9_\\\']*)',
bygroups(Keyword.Declaration, Text, Name.Variable)), bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Name.Variable)),
(u'\\b(selon|sous\\s+forme|fix\xe9|par|d\xe9croissante|croissante|varie|avec|on\\s+a|dans|tel\\s+que|existe|pour|tout|de|si|alors|sinon|initial)\\b', (u'\\b(selon|sous\\s+forme|fix\xe9|par|d\xe9croissante|croissante|varie|avec|on\\s+a|dans|tel\\s+que|existe|pour|tout|de|si|alors|sinon|initial)\\b',
bygroups(Keyword.Reserved)), bygroups(Keyword.Reserved)),
(u'\\b(champ\\s+d\'application|si\\s+et\\s+seulement\\s+si|d\xe9pend\\s+de|d\xe9claration|inclus|collection|contenu|optionnel|structure|\xe9num\xe9ration|contexte|entr\xe9e|sortie|interne|r\xe8gle|sous\\s+condition|condition|donn\xe9e|cons\xe9quence|rempli|\xe9gal\\s+\xe0|assertion|d\xe9finition|\xe9tiquette|exception|n\'importe\\s+quel)\\b', (u'\\b(champ\\s+d\'application|si\\s+et\\s+seulement\\s+si|d\xe9pend\\s+de|d\xe9claration|inclus|collection|contenu|optionnel|structure|\xe9num\xe9ration|contexte|entr\xe9e|sortie|interne|r\xe8gle|sous\\s+condition|condition|donn\xe9e|cons\xe9quence|rempli|\xe9gal\\s+\xe0|assertion|d\xe9finition|\xe9tiquette|exception|n\'importe\\s+quel)\\b',

2
syntax_highlighting/fr/vim/catala_fr.vim
View File

@ -36,7 +36,7 @@ syn match punctuation contained "\(--\|\;\|\.\|,\|\:\|(\|)\|\[\|\]\|{\|}\)"
syn keyword Type contained entier booléen date durée argent texte décimal décret loi nombre somme syn keyword Type contained entier booléen date durée argent texte décimal décret loi nombre somme
syn region ctxt contained syn region ctxt contained
\ matchgroup=Keyword start="\<contexte\|entrée\|sortie\|interne" \ matchgroup=Keyword start="\<\(contexte\|entrée\|sortie\|interne\)\(|\s\+sortie\)"
\ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>" \ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>"
syn region cc_id_dot_sc_id contained contains=punctuation syn region cc_id_dot_sc_id contained contains=punctuation

12
syntax_highlighting/fr/vscode/syntaxes/catalavs.xml
View File

@ -162,7 +162,7 @@
</dict> </dict>
<dict> <dict>
<key>match</key> <key>match</key>
<string>(contexte|entrée|sortie|interne)(\s+)([a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00f4}\x{00ea}\x{0153}\x{00e7}][a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00f4}\x{00ea}\x{0153}\x{00e7}A-Z\x{00c9}\x{00c8}\x{00c0}\x{00c2}\x{00d9}\x{00ce}\x{00d4}\x{00ca}\x{0152}\x{00c7}0-9_\&apos;]*)</string> <string>(contexte|entrée|sortie|interne)(\s*)(|sortie)(\s+)([a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00f4}\x{00ea}\x{0153}\x{00e7}][a-z\x{00e9}\x{00e8}\x{00e0}\x{00e2}\x{00f9}\x{00ee}\x{00f4}\x{00ea}\x{0153}\x{00e7}A-Z\x{00c9}\x{00c8}\x{00c0}\x{00c2}\x{00d9}\x{00ce}\x{00d4}\x{00ca}\x{0152}\x{00c7}0-9_\&apos;]*)</string>
<key>captures</key> <key>captures</key>
<dict> <dict>
<key>1</key> <key>1</key>
@ -176,6 +176,16 @@
<string>text.catala_fr</string> <string>text.catala_fr</string>
</dict> </dict>
<key>3</key> <key>3</key>
<dict>
<key>name</key>
<string>keyword.other.catala_fr</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>text.catala_fr</string>
</dict>
<key>5</key>
<dict> <dict>
<key>name</key> <key>name</key>
<string>entity.name.function.catala_fr</string> <string>entity.name.function.catala_fr</string>

8
syntax_highlighting/pl/atom/grammars/catala_pl.cson
View File

@ -71,7 +71,7 @@
'name' : 'comment.line.catala_pl' 'name' : 'comment.line.catala_pl'
} }
{ {
'match' : '(kontekst|wejście|wyjście|wewnętrzny)(\\s+)([a-z\\x{0105}\\x{0107}\\x{0119}\\x{0142}\\x{0144}\\x{00f3}\\x{015b}\\x{017c}\\x{017a}][a-z\\x{0105}\\x{0107}\\x{0119}\\x{0142}\\x{0144}\\x{00f3}\\x{015b}\\x{017c}\\x{017a}A-Z\\x{0104}\\x{0106}\\x{0118}\\x{0141}\\x{0143}\\x{00d3}\\x{015a}\\x{017b}\\x{0179}0-9_\\\']*)' 'match' : '(kontekst|wejście|wyjście|wewnętrzny)(\\s*)(|wyjście)(\\s+)([a-z\\x{0105}\\x{0107}\\x{0119}\\x{0142}\\x{0144}\\x{00f3}\\x{015b}\\x{017c}\\x{017a}][a-z\\x{0105}\\x{0107}\\x{0119}\\x{0142}\\x{0144}\\x{00f3}\\x{015b}\\x{017c}\\x{017a}A-Z\\x{0104}\\x{0106}\\x{0118}\\x{0141}\\x{0143}\\x{00d3}\\x{015a}\\x{017b}\\x{0179}0-9_\\\']*)'
'captures' : { 'captures' : {
'1' : { '1' : {
'name' : 'keyword.other.catala_pl' 'name' : 'keyword.other.catala_pl'
@ -80,6 +80,12 @@
'name' : 'text.catala_pl' 'name' : 'text.catala_pl'
} }
'3' : { '3' : {
'name' : 'keyword.other.catala_pl'
}
'4' : {
'name' : 'text.catala_pl'
}
'5' : {
'name' : 'entity.name.function.catala_pl' 'name' : 'entity.name.function.catala_pl'
} }
} }

4
syntax_highlighting/pl/catala_pl.iro
View File

@ -193,8 +193,8 @@ code : context {
} }
: pattern { : pattern {
regex \= (kontekst|wejście|wyjście|wewnętrzny)(\s+)($${__SC_ID}) regex \= (kontekst|wejście|wyjście|wewnętrzny)(\s*)(|wyjście)(\s+)($${__SC_ID})
styles [] = .keyword_rule, .whitespace, .sc_id_def; styles [] = .keyword_rule, .whitespace, .keyword_rule, .whitespace, .sc_id_def;
} }
: pattern { : pattern {

2
syntax_highlighting/pl/pygments/catala_pl_lexer/lexer.py
View File

@ -24,7 +24,7 @@ class CatalaPlLexer(RegexLexer):
'code' : [ 'code' : [
(u'(```)', bygroups(Text), 'root'), (u'(```)', bygroups(Text), 'root'),
(u'(\\s*\\#.*$)', bygroups(Comment.Single)), (u'(\\s*\\#.*$)', bygroups(Comment.Single)),
(u'(kontekst|wej\u015bcie|wyj\u015bcie|wewn\u0119trzny)(\\s+)([a-z\u0105\u0107\u0119\u0142\u0144\xf3\u015b\u017c\u017a][a-z\u0105\u0107\u0119\u0142\u0144\xf3\u015b\u017c\u017aA-Z\u0104\u0106\u0118\u0141\u0143\xd3\u015a\u017b\u01790-9_\\\']*)', bygroups(Keyword.Declaration, Text, Name.Variable)), (u'(kontekst|wej\u015bcie|wyj\u015bcie|wewn\u0119trzny)(\\s*)(|wyj\u015bcie)(\\s+)([a-z\u0105\u0107\u0119\u0142\u0144\xf3\u015b\u017c\u017a][a-z\u0105\u0107\u0119\u0142\u0144\xf3\u015b\u017c\u017aA-Z\u0104\u0106\u0118\u0141\u0143\xd3\u015a\u017b\u01790-9_\\\']*)', bygroups(Keyword.Declaration, Text, Keyword.Declaration, Text, Name.Variable)),
(u'\\b(pasuje|ze\\s+wzorem|staloprzecinkowa|przez|malejacy|rosnacy|rozna|wraz z|mamy|w|takich ze|istnieje|dla|wszystkie|z|jezeli|wtedy|inaczej|poczatkowy)\\b', bygroups(Keyword.Reserved)), (u'\\b(pasuje|ze\\s+wzorem|staloprzecinkowa|przez|malejacy|rosnacy|rozna|wraz z|mamy|w|takich ze|istnieje|dla|wszystkie|z|jezeli|wtedy|inaczej|poczatkowy)\\b', bygroups(Keyword.Reserved)),
(u'\\b(zakres|zalezy\\s+od|deklaracja|kolekcja|typu|opcjonalny|struktura|enumeracja|kontekst|wej\u015bcie|wyj\u015bcie|wewn\u0119trzny|zasada|pod\\s+warunkuem|czas|konsekwencja|spelnione|wynosi|asercja|definicja|etykieta|wyj\u0105tek|cokolwiek)\\b', bygroups(Keyword.Declaration)), (u'\\b(zakres|zalezy\\s+od|deklaracja|kolekcja|typu|opcjonalny|struktura|enumeracja|kontekst|wej\u015bcie|wyj\u015bcie|wewn\u0119trzny|zasada|pod\\s+warunkuem|czas|konsekwencja|spelnione|wynosi|asercja|definicja|etykieta|wyj\u0105tek|cokolwiek)\\b', bygroups(Keyword.Declaration)),
(u'(\\|[0-9]+\\-[0-9]+\\-[0-9]+\\|)', bygroups(Number.Integer)), (u'(\\|[0-9]+\\-[0-9]+\\-[0-9]+\\|)', bygroups(Number.Integer)),

2
syntax_highlighting/pl/vim/catala_pl.vim
View File

@ -35,7 +35,7 @@ syn match punctuation contained "\(--\|\;\|\.\|,\|\:\|(\|)\|\[\|\]\|{\|}\)"
syn keyword Type contained calkowita zerojedynkowy czas trwania pieniądze warunek tekst dziesiętny suma syn keyword Type contained calkowita zerojedynkowy czas trwania pieniądze warunek tekst dziesiętny suma
syn region ctxt contained syn region ctxt contained
\ matchgroup=Keyword start="\<kontekst\|wejście\|wyjście\|wewnętrzny" \ matchgroup=Keyword start="\<\(kontekst\|wejście\|wyjście\|wewnętrzny\)\(\|\s\+wyjście\)"
\ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>" \ matchgroup=sc_id_def end="\s\+\([a-zéèàâùîôêœç][a-zéèàâùîôêœçA-ZÉÈÀÂÙÎÔÊŒÇ0-9_\']*\)\>"
syn region cc_id_dot_sc_id contained contains=punctuation syn region cc_id_dot_sc_id contained contains=punctuation

12
tests/test_array/good/aggregation.catala_en
View File

@ -2,17 +2,17 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content collection money output x content collection money
scope A: scope A:
definition x equals [$0; $4 +$ $5; $8 *$ 0.65] definition x equals [$0; $4 +$ $5; $8 *$ 0.65]
declaration scope B: declaration scope B:
context a scope A a scope A
context max content money output max content money
context min content money output min content money
context y content money output y content money
context z content integer output z content integer
scope B: scope B:
definition max equals maximum money initial $0 for m in a.x of m *$ 2.0 definition max equals maximum money initial $0 for m in a.x of m *$ 2.0

8
tests/test_array/good/aggregation_2.catala_en
View File

@ -6,7 +6,7 @@ declaration structure S:
data income content money data income content money
declaration scope A: declaration scope A:
context x content collection S context output x content collection S
scope A: scope A:
definition x equals [ definition x equals [
@ -16,9 +16,9 @@ scope A:
] ]
declaration scope B: declaration scope B:
context a scope A a scope A
context argmax content S output argmax content S
context argmin content S output argmin content S
scope B: scope B:
definition argmax equals content maximum money initial S { -- id: -1 --income: $0 } for m in a.x of (m.income *$ 2.0) definition argmax equals content maximum money initial S { -- id: -1 --income: $0 } for m in a.x of (m.income *$ 2.0)

4
tests/test_array/good/concatenation.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content collection integer output x content collection integer
context y content collection integer output y content collection integer
scope A: scope A:
definition x equals [0; 1; 2] ++ [3; 4; 5; 6] definition x equals [0; 1; 2] ++ [3; 4; 5; 6]

8
tests/test_array/good/filter_map.catala_en
View File

@ -2,15 +2,15 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content collection money output x content collection money
scope A: scope A:
definition x equals [$0; $4 +$ $5; $8 *$ 0.65] definition x equals [$0; $4 +$ $5; $8 *$ 0.65]
declaration scope B: declaration scope B:
context a scope A a scope A
context y content collection money output y content collection money
context z content collection boolean output z content collection boolean
scope B: scope B:
definition y equals filter for m in a.x of (m >=$ $4.95) definition y equals filter for m in a.x of (m >=$ $4.95)

12
tests/test_array/good/simple.catala_en
View File

@ -2,17 +2,17 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content collection integer output x content collection integer
scope A: scope A:
definition x equals [0; 4+5; 8*8] definition x equals [0; 4+5; 8*8]
declaration scope B: declaration scope B:
context a scope A a scope A
context v content integer output v content integer
context w content boolean output w content boolean
context y content boolean output y content boolean
context z content boolean output z content boolean
scope B: scope B:
definition v equals number of a.x definition v equals number of a.x

2
tests/test_bool/good/output/test_bool.catala_en.Scopelang
View File

@ -1,4 +1,4 @@
let scope TestBool (foo: bool|input|output) (bar: integer|input|output) = let scope TestBool (foo: bool|context|output) (bar: integer|context|output) =
let bar : integer = let bar : integer =
reentrant or by default reentrant or by default
⟨⟨true ⊢ ⟨⟨true ⊢ 1⟩ | false ⊢ ∅ ⟩⟩ | ⟨⟨true ⊢ ⟨⟨true ⊢ 1⟩ | false ⊢ ∅ ⟩⟩ |

4
tests/test_bool/good/test_bool.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope TestBool: declaration scope TestBool:
context foo content boolean context output foo content boolean
context bar content integer context output bar content integer
scope TestBool: scope TestBool:
definition bar equals 1 definition bar equals 1

2
tests/test_bool/good/test_precedence.catala_en
View File

@ -2,7 +2,7 @@
```catala ```catala
declaration scope TestBool: declaration scope TestBool:
context foo content boolean context output foo content boolean
scope TestBool: scope TestBool:
definition foo equals true and not false and false = false definition foo equals true and not false and false = false

8
tests/test_bool/good/test_xor.catala_en
View File

@ -2,10 +2,10 @@
```catala ```catala
declaration scope TestXor: declaration scope TestXor:
context t_xor_t content boolean context output t_xor_t content boolean
context t_xor_f content boolean context output t_xor_f content boolean
context f_xor_t content boolean context output f_xor_t content boolean
context f_xor_f content boolean context output f_xor_f content boolean
scope TestXor: scope TestXor:
definition t_xor_t equals true xor true definition t_xor_t equals true xor true

14
tests/test_date/good/durations.catala_en
View File

@ -2,13 +2,13 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content date context output x content date
context y content date context output y content date
context z content boolean context output z content boolean
context z2 content boolean context output z2 content boolean
context z3 content duration context output z3 content duration
context d content decimal context output d content decimal
context d2 content decimal context output d2 content decimal
scope A: scope A:
definition x equals |2019-01-01| definition x equals |2019-01-01|

6
tests/test_date/good/simple.catala_en
View File

@ -2,9 +2,9 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content date context output x content date
context y content date context output y content date
context z content duration context output z content duration
scope A: scope A:
definition x equals |2019-01-01| definition x equals |2019-01-01|

8
tests/test_dec/good/infinite_precision.catala_en
View File

@ -2,10 +2,10 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content decimal context output x content decimal
context y content decimal context output y content decimal
context z content decimal context output z content decimal
context a content decimal context output a content decimal
scope A: scope A:
definition x equals 84.64866565265689623 definition x equals 84.64866565265689623

6
tests/test_dec/good/simple.catala_en
View File

@ -2,9 +2,9 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content decimal context output x content decimal
context y content decimal context output y content decimal
context z content decimal context output z content decimal
scope A: scope A:
definition x equals 84.648665 definition x equals 84.648665

4
tests/test_enum/bad/useless_wildcard.catala_en
View File

@ -6,8 +6,8 @@ declaration enumeration E:
-- Case2 -- Case2
declaration scope A: declaration scope A:
context x content E context output x content E
context y content integer context output y content integer
scope A: scope A:
definition x equals Case1 definition x equals Case1

6
tests/test_enum/good/disambiguated_cases.catala_en
View File

@ -9,9 +9,9 @@ declaration enumeration F:
-- Case2 -- Case2
declaration scope A: declaration scope A:
context e content E context output e content E
context f content F context output f content F
context x content integer context output x content integer
scope A: scope A:
definition e equals E.Case1 definition e equals E.Case1

6
tests/test_enum/good/quick_pattern_check.catala_en
View File

@ -6,9 +6,9 @@ declaration enumeration E:
-- Case2 -- Case2
declaration scope A: declaration scope A:
context x content E context output x content E
context y content boolean context output y content boolean
context z content boolean context output z content boolean
scope A: scope A:
definition x equals Case1 content 2 definition x equals Case1 content 2

4
tests/test_enum/good/simple.catala_en
View File

@ -6,8 +6,8 @@ declaration enumeration E:
-- Case2 -- Case2
declaration scope A: declaration scope A:
context x content E context output x content E
context y content integer context output y content integer
scope A: scope A:
definition x equals Case1 content 2 definition x equals Case1 content 2

8
tests/test_enum/good/wildcard.catala_en
View File

@ -11,8 +11,8 @@ declaration enumeration E:
```catala ```catala
declaration scope Simple_case: declaration scope Simple_case:
context x content E context output x content E
context y content integer context output y content integer
scope Simple_case: scope Simple_case:
definition x equals Case1 content 2 definition x equals Case1 content 2
@ -25,8 +25,8 @@ scope Simple_case:
```catala ```catala
declaration scope Simple_case_2: declaration scope Simple_case_2:
context x content E context output x content E
context y content integer context output y content integer
scope Simple_case_2: scope Simple_case_2:
definition x equals Case3 definition x equals Case3

4
tests/test_exception/good/duplicate_labels.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context y content integer context output y content integer
scope A: scope A:
label base_x label base_x

2
tests/test_exception/good/exception.catala_en
View File

@ -2,7 +2,7 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
scope A: scope A:
label base_x label base_x

2
tests/test_exception/good/exceptions_squared.catala_en
View File

@ -2,7 +2,7 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
scope A: scope A:
label base_x label base_x

4
tests/test_exception/good/grouped_exceptions.catala_en
View File

@ -5,8 +5,8 @@ declaration structure Person:
data disabled content boolean data disabled content boolean
declaration scope Benefit: declaration scope Benefit:
context person content Person context output person content Person
context benefit content money context output benefit content money
scope Benefit: scope Benefit:
definition person equals Person { definition person equals Person {

6
tests/test_exception/good/same_label_two_variables.catala_en
View File

@ -2,9 +2,9 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context y content integer context output y content integer
context z content integer context output z content integer
scope A: scope A:
label base label base

2
tests/test_exception/good/split_unlabeled_exception.catala_en
View File

@ -2,7 +2,7 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
scope A: scope A:
definition x equals 0 definition x equals 0

4
tests/test_exception/good/two_unlabeled_exceptions.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context y content integer context output y content integer
scope A: scope A:
definition x equals 0 definition x equals 0

2
tests/test_exception/good/unlabeled_exception.catala_en
View File

@ -2,7 +2,7 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
scope A: scope A:
definition x equals 0 definition x equals 0

4
tests/test_exception/good/unsorted_unlabeled_exceptions.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context y content integer context output y content integer
scope A: scope A:
exception exception

6
tests/test_func/bad/bad_func.catala_en
View File

@ -4,11 +4,11 @@
declaration scope S: declaration scope S:
context f content integer depends on integer context f content integer depends on integer
context b content boolean context b content boolean
context out content integer context output out content integer
declaration scope R: declaration scope R:
context s scope S s scope S
context r content integer context output r content integer
scope S: scope S:
definition f of x under condition (x >= x) consequence equals x + x definition f of x under condition (x >= x) consequence equals x + x

6
tests/test_func/good/func.catala_en
View File

@ -4,11 +4,11 @@
declaration scope S: declaration scope S:
context f content integer depends on integer context f content integer depends on integer
context b content boolean context b content boolean
context out content integer context output out content integer
declaration scope R: declaration scope R:
context s scope S s scope S
context r content integer context output r content integer
scope S: scope S:
definition f of x under condition (x >= x) consequence equals x + x definition f of x under condition (x >= x) consequence equals x + x

2
tests/test_literate/good/test_grave_char.catala_en
View File

@ -15,7 +15,7 @@ let () = print_endline "Hello world!"
```catala ```catala
declaration scope A: declaration scope A:
context literate_parsing_is_ok content boolean context output literate_parsing_is_ok content boolean
scope A: scope A:
definition literate_parsing_is_ok equals true definition literate_parsing_is_ok equals true

2
tests/test_literate/good/test_grave_char.catala_fr
View File

@ -15,7 +15,7 @@ let () = print_endline "Hello world!"
```catala ```catala
déclaration champ d'application A: déclaration champ d'application A:
contexte literate_parsing_is_ok contenu booléen contexte sortie literate_parsing_is_ok contenu booléen
champ d'application A: champ d'application A:
définition literate_parsing_is_ok égal à vrai définition literate_parsing_is_ok égal à vrai

2
tests/test_literate/good/test_grave_char.catala_pl
View File

@ -15,7 +15,7 @@ let () = print_endline "Hello world!"
```catala ```catala
deklaracja zakres A: deklaracja zakres A:
kontekst literate_parsing_is_ok typu zerojedynkowy kontekst wyjście literate_parsing_is_ok typu zerojedynkowy
zakres A: zakres A:
definicja literate_parsing_is_ok wynosi prawda definicja literate_parsing_is_ok wynosi prawda

4
tests/test_metadata/good/test_markup_refactoring.catala_en
View File

@ -6,14 +6,14 @@ declaration enumeration E:
-- B -- B
declaration scope S: declaration scope S:
context a content E context output a content E
``` ```
Some law text... Some law text...
```catala-metadata ```catala-metadata
declaration scope S2: declaration scope S2:
context b content E context output b content E
``` ```
## PROGRAM ## PROGRAM

6
tests/test_money/good/simple.catala_en
View File

@ -2,9 +2,9 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content money context output x content money
context y content money context output y content money
context z content money context output z content money
scope A: scope A:
definition x equals $123.54 definition x equals $123.54

4
tests/test_name_resolution/good/out_of_order.catala_en
View File

@ -2,8 +2,8 @@
```catala ```catala
declaration scope S: declaration scope S:
context a content A context output a content A
context b content B context output b content B
declaration structure A: declaration structure A:
data x content integer data x content integer

10
tests/test_proof/bad/output/prolala_motivating_example.catala_en.Proof
View File

@ -10,8 +10,6 @@ The solver generated the following counterexample to explain the faulty behavior
[RESULT] [Amount.amount] No two exceptions to ever overlap for this variable [RESULT] [Amount.amount] No two exceptions to ever overlap for this variable
[RESULT] [Amount.correct_amount] This variable never returns an empty error [RESULT] [Amount.correct_amount] This variable never returns an empty error
[RESULT] [Amount.correct_amount] No two exceptions to ever overlap for this variable [RESULT] [Amount.correct_amount] No two exceptions to ever overlap for this variable
[RESULT] [Amount.eligibility.is_eligible_correct] No two exceptions to ever overlap for this variable
[RESULT] [Amount.eligibility.is_eligible] No two exceptions to ever overlap for this variable
[RESULT] [Amount.eligibility.is_professor] No two exceptions to ever overlap for this variable [RESULT] [Amount.eligibility.is_professor] No two exceptions to ever overlap for this variable
[RESULT] [Amount.eligibility.is_student] No two exceptions to ever overlap for this variable [RESULT] [Amount.eligibility.is_student] No two exceptions to ever overlap for this variable
[RESULT] [Amount.number_of_advisors] This variable never returns an empty error [RESULT] [Amount.number_of_advisors] This variable never returns an empty error
@ -23,8 +21,8 @@ The solver generated the following counterexample to explain the faulty behavior
[ERROR] [Eligibility.is_eligible] This variable might return an empty error: [ERROR] [Eligibility.is_eligible] This variable might return an empty error:
--> tests/test_proof/bad/prolala_motivating_example.catala_en --> tests/test_proof/bad/prolala_motivating_example.catala_en
| |
11 | context is_eligible content boolean 11 | output is_eligible content boolean
| ^^^^^^^^^^^ | ^^^^^^^^^^^
+ ProLaLa 2022 Super Cash Bonus + ProLaLa 2022 Super Cash Bonus
+-+ Eligibility +-+ Eligibility
The solver generated the following counterexample to explain the faulty behavior: The solver generated the following counterexample to explain the faulty behavior:
@ -32,8 +30,8 @@ The solver generated the following counterexample to explain the faulty behavior
[ERROR] [Eligibility.is_eligible] At least two exceptions overlap for this variable: [ERROR] [Eligibility.is_eligible] At least two exceptions overlap for this variable:
--> tests/test_proof/bad/prolala_motivating_example.catala_en --> tests/test_proof/bad/prolala_motivating_example.catala_en
| |
11 | context is_eligible content boolean 11 | output is_eligible content boolean
| ^^^^^^^^^^^ | ^^^^^^^^^^^
+ ProLaLa 2022 Super Cash Bonus + ProLaLa 2022 Super Cash Bonus
+-+ Eligibility +-+ Eligibility
The solver generated the following counterexample to explain the faulty behavior: The solver generated the following counterexample to explain the faulty behavior:

6
tests/test_proof/bad/prolala_motivating_example.catala_en
View File

@ -8,8 +8,8 @@ Demo: https://asciinema.org/a/461790
declaration scope Eligibility: declaration scope Eligibility:
context is_student content boolean context is_student content boolean
context is_professor content boolean context is_professor content boolean
context is_eligible content boolean output is_eligible content boolean
context is_eligible_correct condition output is_eligible_correct condition
scope Eligibility: scope Eligibility:
definition is_student equals true definition is_student equals true
@ -53,7 +53,7 @@ scope Eligibility:
```catala-metadata ```catala-metadata
declaration scope Amount: declaration scope Amount:
context eligibility scope Eligibility eligibility scope Eligibility
context is_student content boolean context is_student content boolean
context is_professor content boolean context is_professor content boolean
context number_of_advisors content integer context number_of_advisors content integer

16
tests/test_scope/bad/bad_sub_sub_scope.catala_en
View File

@ -2,18 +2,18 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context u content boolean context output u content boolean
declaration scope B: declaration scope B:
context a1 scope A a1 scope A
context a2 scope A a2 scope A
context y content integer context output y content integer
declaration scope C: declaration scope C:
context a scope A a scope A
context b scope B b scope B
context z content integer context output z content integer
scope A: scope A:
definition x equals 0 definition x equals 0

8
tests/test_scope/bad/cyclic_scopes.catala_en
View File

@ -2,12 +2,12 @@
```catala ```catala
declaration scope A: declaration scope A:
context b scope B b scope B
context x content integer context output x content integer
declaration scope B: declaration scope B:
context a scope A a scope A
context y content integer context output y content integer
scope A: scope A:
definition x equals b.y definition x equals b.y

8
tests/test_scope/bad/output/cyclic_scopes.catala_en.A.Interpret
View File

@ -10,8 +10,8 @@ Cycle variable B, declared:
Used here in the definition of another cycle variable A: Used here in the definition of another cycle variable A:
--> tests/test_scope/bad/cyclic_scopes.catala_en --> tests/test_scope/bad/cyclic_scopes.catala_en
| |
5 | context b scope B 5 | b scope B
| ^ | ^
+ Article + Article
Cycle variable A, declared: Cycle variable A, declared:
@ -24,6 +24,6 @@ Cycle variable A, declared:
Used here in the definition of another cycle variable B: Used here in the definition of another cycle variable B:
--> tests/test_scope/bad/cyclic_scopes.catala_en --> tests/test_scope/bad/cyclic_scopes.catala_en
| |
9 | context a scope A 9 | a scope A
| ^ | ^
+ Article + Article

6
tests/test_scope/bad/sub_vars_in_sub_var.catala_en
View File

@ -2,11 +2,11 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content boolean context output x content boolean
context y content integer context output y content integer
declaration scope B: declaration scope B:
context a scope A a scope A
scope B: scope B:
definition a.x equals true definition a.x equals true

14
tests/test_scope/good/grand_parent_caller.catala_en
View File

@ -2,17 +2,17 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
declaration scope B: declaration scope B:
context a scope A a scope A
context y1 content integer context output y1 content integer
context y2 content integer context output y2 content integer
declaration scope C: declaration scope C:
context b scope B b scope B
context z1 content integer context output z1 content integer
context z2 content integer context output z2 content integer
scope A: scope A:

14
tests/test_scope/good/sub_scope.catala_en
View File

@ -2,15 +2,15 @@
```catala ```catala
declaration scope A: declaration scope A:
context a content integer context output a content integer
context b content boolean context output b content boolean
context a_base content integer context output a_base content integer
declaration scope B: declaration scope B:
context a content integer context output a content integer
context b content boolean context output b content boolean
context scopeA scope A scopeA scope A
context scopeAbis scope A scopeAbis scope A
scope A: scope A:
definition a_base equals 1 definition a_base equals 1

16
tests/test_scope/good/sub_sub_scope.catala_en
View File

@ -2,18 +2,18 @@
```catala ```catala
declaration scope A: declaration scope A:
context x content integer context output x content integer
context u content boolean context output u content boolean
declaration scope B: declaration scope B:
context a1 scope A a1 scope A
context a2 scope A a2 scope A
context y content integer context output y content integer
declaration scope C: declaration scope C:
context a scope A a scope A
context b scope B b scope B
context z content integer context output z content integer
scope A: scope A:
definition x equals 0 definition x equals 0

6
tests/test_scope/good/subscope_function_arg_not_defined.catala_en
View File

@ -3,11 +3,11 @@
```catala ```catala
declaration scope Callee: declaration scope Callee:
context input_v content integer depends on boolean context input_v content integer depends on boolean
context output_v content integer context output output_v content integer
declaration scope Caller: declaration scope Caller:
context sub scope Callee sub scope Callee
context y content integer context output y content integer
scope Callee: scope Callee:
definition input_v of b equals if b then 0 else 1 definition input_v of b equals if b then 0 else 1

4
tests/test_scope/good/subscope_function_arg_not_defined2.catala_en
View File

@ -4,10 +4,10 @@
declaration scope Callee: declaration scope Callee:
context function condition depends on integer context function condition depends on integer
context input_v content integer context input_v content integer
context output_v condition context output output_v condition
declaration scope Caller: declaration scope Caller:
context callee scope Callee callee scope Callee
scope Callee: scope Callee:

8
tests/test_struct/good/nested3.catala_en
View File

@ -10,12 +10,12 @@ declaration structure T:
data b content S data b content S
declaration scope A: declaration scope A:
context t content T context output t content T
declaration scope B: declaration scope B:
context t content T context output t content T
context a scope A a scope A
context out content integer context output out content integer
scope A: scope A:
definition t equals T { definition t equals T {

4
tests/test_struct/good/same_name_fields.catala_en
View File

@ -8,8 +8,8 @@ declaration structure Bar:
data f content integer data f content integer
declaration scope A: declaration scope A:
context x content Foo context output x content Foo
context y content integer context output y content integer
scope A: scope A:
definition x equals Foo { -- f: 1 } definition x equals Foo { -- f: 1 }

4
tests/test_struct/good/simple.catala_en
View File

@ -6,8 +6,8 @@ declaration structure S:
data y content integer data y content integer
declaration scope A: declaration scope A:
context s content S context output s content S
context z content integer context output z content integer
scope A: scope A:
definition s equals S { definition s equals S {

2
tests/test_visibility/good/output/all_visi.catala_en.A.Dcalc
View File

@ -21,4 +21,4 @@ let A =
⟨⟨true ⊢ ⟨⟨true ⊢ b_12 + d_13⟩ | false ⊢ ∅ ⟩⟩ | ⟨⟨true ⊢ ⟨⟨true ⊢ b_12 + d_13⟩ | false ⊢ ∅ ⟩⟩ |
true ⊢ ⟨⟨false ⊢ ∅ ⟩ | false ⊢ ∅ ⟩⟩ true ⊢ ⟨⟨false ⊢ ∅ ⟩ | false ⊢ ∅ ⟩⟩
in in
A_out {"a_out"= a_11; "c_out"= c_14} A_out {"c_out"= c_14}

21
tests/test_visibility/good/output/subscope.catala_en.B.Dcalc
View File

@ -1,18 +1,17 @@
let B = let B =
λ (B_in_18: B_in{}) → λ (B_in_15: B_in{}) →
let a.a_19 : unit → integer = λ (__20: unit) → ∅ let a.b_16 : unit → integer =
in λ (__17: unit) →
let a.b_21 : unit → integer =
λ (__22: unit) →
⟨⟨true ⊢ ⟨⟨true ⊢ 2⟩ | false ⊢ ∅ ⟩⟩ | true ⊢ ⟨⟨true ⊢ ⟨⟨true ⊢ 2⟩ | false ⊢ ∅ ⟩⟩ | true ⊢
⟨⟨false ⊢ ∅ ⟩ | false ⊢ ∅ ⟩⟩ ⟨⟨false ⊢ ∅ ⟩ | false ⊢ ∅ ⟩⟩
in in
let result_23 : A_out{"a_out": integer; "c_out": integer} = let result_18 : A_out{"c_out": integer} =
A_2 (A_in {"a_in"= a.a_19; "b_in"= a.b_21}) A_2
(A_in
{"a_in"= λ (__19: unit) → ∅ ; "b_in"= a.b_16; "c_in"=
λ (__20: unit) → ∅ ; "d_in"= λ (__21: unit) → ∅ })
in in
let a.a_24 : integer = result_23."a_out" let a.c_22 : integer = result_18."c_out"
in in
let a.c_25 : integer = result_23."c_out" let __23 : unit = assert (a.c_22 = 1) in
in
let __26 : unit = assert (a.c_25 = 1) in
B_out {} B_out {}

2
tests/test_visibility/good/subscope.catala_en
View File

@ -8,7 +8,7 @@ declaration scope A:
internal d content integer internal d content integer
declaration scope B: declaration scope B:
context a scope A a scope A
scope A: scope A:
definition a equals 0 definition a equals 0