mirror of
https://github.com/CatalaLang/catala.git
synced 2024-11-08 07:51:43 +03:00
Improved error messages
This commit is contained in:
Denis Merigoux
parent
ae0cb80a25
commit
8dd95dec42
@ -1,3 +1,15 @@
|
||||
source_file_or_master: BEGIN_METADATA BEGIN_CODE END_CODE LAW_TEXT END_CODE
|
||||
##
|
||||
## Ends in an error in state: 323.
|
||||
##
|
||||
## metadata_block -> BEGIN_CODE option(law_text) code END_CODE option(law_text) . END_METADATA [ LAW_TEXT LAW_INCLUDE LAW_HEADING LAW_ARTICLE EOF BEGIN_METADATA ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## BEGIN_CODE option(law_text) code END_CODE option(law_text)
|
||||
##
|
||||
|
||||
expected a metadata-closing tag
|
||||
|
||||
source_file_or_master: BEGIN_METADATA BEGIN_CODE END_CODE YEAR
|
||||
##
|
||||
## Ends in an error in state: 322.
|
||||
@ -8,7 +20,19 @@ source_file_or_master: BEGIN_METADATA BEGIN_CODE END_CODE YEAR
|
||||
## BEGIN_CODE option(law_text) code END_CODE
|
||||
##
|
||||
|
||||
should not happen, please file an issue at https://github.com/CatalaLang/catala/issues
|
||||
expected a metadata-closing tag
|
||||
|
||||
source_file_or_master: BEGIN_METADATA BEGIN_CODE LAW_TEXT DECIMAL_LITERAL
|
||||
##
|
||||
## Ends in an error in state: 21.
|
||||
##
|
||||
## metadata_block -> BEGIN_CODE option(law_text) . code END_CODE option(law_text) END_METADATA [ LAW_TEXT LAW_INCLUDE LAW_HEADING LAW_ARTICLE EOF BEGIN_METADATA ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## BEGIN_CODE option(law_text)
|
||||
##
|
||||
|
||||
should not happen
|
||||
|
||||
source_file_or_master: BEGIN_METADATA BEGIN_CODE YEAR
|
||||
##
|
||||
@ -22,6 +46,18 @@ source_file_or_master: BEGIN_METADATA BEGIN_CODE YEAR
|
||||
|
||||
expected a declaration or a scope use
|
||||
|
||||
source_file_or_master: BEGIN_METADATA LAW_TEXT ASSERTION
|
||||
##
|
||||
## Ends in an error in state: 19.
|
||||
##
|
||||
## source_file_item -> BEGIN_METADATA option(law_text) . metadata_block [ LAW_TEXT LAW_INCLUDE LAW_HEADING LAW_ARTICLE EOF BEGIN_METADATA ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## BEGIN_METADATA option(law_text)
|
||||
##
|
||||
|
||||
expected some text or the beginning of a code section
|
||||
|
||||
source_file_or_master: BEGIN_METADATA YEAR
|
||||
##
|
||||
## Ends in an error in state: 18.
|
||||
@ -166,7 +202,7 @@ source_file_or_master: LAW_ARTICLE BEGIN_CODE DECLARATION SCOPE CONSTRUCTOR COLO
|
||||
## scope_decl_item
|
||||
##
|
||||
|
||||
expected the next context item, or another declaration or scope use
|
||||
expected another scope context item or the end of the scope declaration
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE DECLARATION SCOPE CONSTRUCTOR COLON CONTEXT IDENT SCOPE YEAR
|
||||
##
|
||||
@ -663,6 +699,56 @@ source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION
|
||||
|
||||
expected the name of the variable you want to define
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON EXCEPTION IDENT DEFINED_AS
|
||||
##
|
||||
## Ends in an error in state: 233.
|
||||
##
|
||||
## definition -> option(label) option(exception_to) . DEFINITION qident option(definition_parameters) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
|
||||
## rule -> option(label) option(exception_to) . RULE rule_expr option(condition_consequence) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## option(label) option(exception_to)
|
||||
##
|
||||
|
||||
expected a rule or a definition after the exception declaration
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON EXCEPTION YEAR
|
||||
##
|
||||
## Ends in an error in state: 231.
|
||||
##
|
||||
## exception_to -> EXCEPTION . ident [ RULE DEFINITION ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## EXCEPTION
|
||||
##
|
||||
|
||||
expected the label to which the exception is referring back
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON LABEL IDENT DEFINED_AS
|
||||
##
|
||||
## Ends in an error in state: 230.
|
||||
##
|
||||
## definition -> option(label) . option(exception_to) DEFINITION qident option(definition_parameters) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
|
||||
## rule -> option(label) . option(exception_to) RULE rule_expr option(condition_consequence) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## option(label)
|
||||
##
|
||||
|
||||
expected a rule or a definition after the label declaration
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON LABEL YEAR
|
||||
##
|
||||
## Ends in an error in state: 200.
|
||||
##
|
||||
## label -> LABEL . ident [ RULE EXCEPTION DEFINITION ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## LABEL
|
||||
##
|
||||
|
||||
expected the name of the label
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT DOT YEAR
|
||||
##
|
||||
## Ends in an error in state: 213.
|
||||
@ -818,6 +904,92 @@ source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION
|
||||
|
||||
expected an expression for the content of this enum case
|
||||
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT COLON CARDINAL ALT YEAR
|
||||
##
|
||||
## Ends in an error in state: 79.
|
||||
##
|
||||
## separated_nonempty_list(ALT,struct_content_field) -> struct_content_field ALT . separated_nonempty_list(ALT,struct_content_field) [ RBRACKET ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## struct_content_field ALT
|
||||
##
|
||||
|
||||
expected the name of the structure field
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT COLON CARDINAL THEN
|
||||
##
|
||||
## Ends in an error in state: 78.
|
||||
##
|
||||
## separated_nonempty_list(ALT,struct_content_field) -> struct_content_field . [ RBRACKET ]
|
||||
## separated_nonempty_list(ALT,struct_content_field) -> struct_content_field . ALT separated_nonempty_list(ALT,struct_content_field) [ RBRACKET ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## struct_content_field
|
||||
##
|
||||
## WARNING: This example involves spurious reductions.
|
||||
## This implies that, although the LR(1) items shown above provide an
|
||||
## accurate view of the past (what has been recognized so far), they
|
||||
## may provide an INCOMPLETE view of the future (what was expected next).
|
||||
## In state 53, spurious reduction of production primitive_expression -> CARDINAL
|
||||
## In state 62, spurious reduction of production base_expression -> primitive_expression
|
||||
## In state 120, spurious reduction of production mult_expression -> base_expression
|
||||
## In state 107, spurious reduction of production sum_expression -> mult_expression
|
||||
## In state 83, spurious reduction of production compare_expression -> sum_expression
|
||||
## In state 143, spurious reduction of production logical_expression -> compare_expression
|
||||
## In state 142, spurious reduction of production struct_content_field -> ident COLON logical_expression
|
||||
##
|
||||
|
||||
expected another structure field or the closing bracket
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT COLON YEAR
|
||||
##
|
||||
## Ends in an error in state: 82.
|
||||
##
|
||||
## struct_content_field -> ident COLON . logical_expression [ RBRACKET ALT ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## ident COLON
|
||||
##
|
||||
|
||||
expected the expression for this struct field
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT YEAR
|
||||
##
|
||||
## Ends in an error in state: 81.
|
||||
##
|
||||
## struct_content_field -> ident . COLON logical_expression [ RBRACKET ALT ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## ident
|
||||
##
|
||||
|
||||
expected a colon
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT YEAR
|
||||
##
|
||||
## Ends in an error in state: 77.
|
||||
##
|
||||
## struct_or_enum_inject_content -> LBRACKET ALT . separated_nonempty_list(ALT,struct_content_field) RBRACKET [ WITH WE_HAVE THEN SUCH SCOPE RULE RPAREN RBRACKET PLUSMONEY PLUSDURATION PLUSDEC PLUSDATE PLUS OR OF NOT_EQUAL MULTMONEY MULTDEC MULT MINUSMONEY MINUSDURATION MINUSDEC MINUSDATE MINUS LESSER_MONEY LESSER_EQUAL_MONEY LESSER_EQUAL_DURATION LESSER_EQUAL_DEC LESSER_EQUAL_DATE LESSER_EQUAL LESSER_DURATION LESSER_DEC LESSER_DATE LESSER LABEL INCREASING IN GREATER_MONEY GREATER_EQUAL_MONEY GREATER_EQUAL_DURATION GREATER_EQUAL_DEC GREATER_EQUAL_DATE GREATER_EQUAL GREATER_DURATION GREATER_DEC GREATER_DATE GREATER EXCEPTION EQUAL END_CODE ELSE DIVMONEY DIVDEC DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## LBRACKET ALT
|
||||
##
|
||||
|
||||
expected the name of the structure field
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET YEAR
|
||||
##
|
||||
## Ends in an error in state: 76.
|
||||
##
|
||||
## struct_or_enum_inject_content -> LBRACKET . ALT separated_nonempty_list(ALT,struct_content_field) RBRACKET [ WITH WE_HAVE THEN SUCH SCOPE RULE RPAREN RBRACKET PLUSMONEY PLUSDURATION PLUSDEC PLUSDATE PLUS OR OF NOT_EQUAL MULTMONEY MULTDEC MULT MINUSMONEY MINUSDURATION MINUSDEC MINUSDATE MINUS LESSER_MONEY LESSER_EQUAL_MONEY LESSER_EQUAL_DURATION LESSER_EQUAL_DEC LESSER_EQUAL_DATE LESSER_EQUAL LESSER_DURATION LESSER_DEC LESSER_DATE LESSER LABEL INCREASING IN GREATER_MONEY GREATER_EQUAL_MONEY GREATER_EQUAL_DURATION GREATER_EQUAL_DEC GREATER_EQUAL_DATE GREATER_EQUAL GREATER_DURATION GREATER_DEC GREATER_DATE GREATER EXCEPTION EQUAL END_CODE ELSE DIVMONEY DIVDEC DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## LBRACKET
|
||||
##
|
||||
|
||||
expected structure fields introduced by --
|
||||
|
||||
source_file_or_master: LAW_ARTICLE BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR YEAR
|
||||
##
|
||||
## Ends in an error in state: 75.
|
||||
@ -1702,6 +1874,30 @@ source_file_or_master: LAW_HEADING YEAR
|
||||
## source_file_item
|
||||
##
|
||||
|
||||
expected an article title, another heading or some text
|
||||
|
||||
source_file_or_master: LAW_TEXT YEAR
|
||||
##
|
||||
## Ends in an error in state: 341.
|
||||
##
|
||||
## list(law_intermediate_text) -> law_intermediate_text . list(law_intermediate_text) [ LAW_INCLUDE LAW_HEADING LAW_ARTICLE EOF BEGIN_METADATA ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## law_intermediate_text
|
||||
##
|
||||
|
||||
expected a heading, an article title or some text
|
||||
|
||||
source_file_or_master: MASTER_FILE LAW_INCLUDE LAW_TEXT ENUM
|
||||
##
|
||||
## Ends in an error in state: 8.
|
||||
##
|
||||
## master_file_includes -> master_file_include option(law_text) . master_file_includes [ # ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## master_file_include option(law_text)
|
||||
##
|
||||
|
||||
expected some text, another heading or a law article
|
||||
|
||||
source_file_or_master: MASTER_FILE LAW_INCLUDE YEAR
|
||||
@ -1716,6 +1912,17 @@ source_file_or_master: MASTER_FILE LAW_INCLUDE YEAR
|
||||
|
||||
expected another inclusion of a Catala file, since this file is a master file which can only contain inclusions of other Catala files
|
||||
|
||||
source_file_or_master: MASTER_FILE LAW_TEXT ENUM
|
||||
##
|
||||
## Ends in an error in state: 3.
|
||||
##
|
||||
## source_file_or_master -> MASTER_FILE option(law_text) . master_file_includes [ # ]
|
||||
##
|
||||
## The known suffix of the stack is as follows:
|
||||
## MASTER_FILE option(law_text)
|
||||
##
|
||||
|
||||
expected some text or includes only
|
||||
|
||||
source_file_or_master: MASTER_FILE YEAR
|
||||
##
|
||||
|
||||
@ -8,10 +8,13 @@ let message s =
|
||||
| 1 ->
|
||||
"expected an inclusion of a Catala file, since this file is a master file which can only \
|
||||
contain inclusions of other Catala files\n"
|
||||
| 3 -> "expected some text or includes only\n"
|
||||
| 7 ->
|
||||
"expected another inclusion of a Catala file, since this file is a master file which can \
|
||||
only contain inclusions of other Catala files\n"
|
||||
| 326 -> "expected some text, another heading or a law article\n"
|
||||
| 8 -> "expected some text, another heading or a law article\n"
|
||||
| 341 -> "expected a heading, an article title or some text\n"
|
||||
| 326 -> "expected an article title, another heading or some text\n"
|
||||
| 331 -> "expected a code block, a metadata block, more law text or a heading\n"
|
||||
| 337 -> "expected a code block, a metadata block, more law text or a heading\n"
|
||||
| 332 -> "expected a declaration or a scope use\n"
|
||||
@ -85,6 +88,12 @@ let message s =
|
||||
| 75 ->
|
||||
"expected a payload for the enum case constructor, or the rest of the expression (with an \
|
||||
operator ?)\n"
|
||||
| 76 -> "expected structure fields introduced by --\n"
|
||||
| 77 -> "expected the name of the structure field\n"
|
||||
| 81 -> "expected a colon\n"
|
||||
| 82 -> "expected the expression for this struct field\n"
|
||||
| 78 -> "expected another structure field or the closing bracket\n"
|
||||
| 79 -> "expected the name of the structure field\n"
|
||||
| 150 -> "expected an expression for the content of this enum case\n"
|
||||
| 151 ->
|
||||
"the expression for the content of the enum case is already well-formed, expected an \
|
||||
@ -101,6 +110,10 @@ let message s =
|
||||
| 235 -> "expected the expression of the rule\n"
|
||||
| 239 -> "expected the filled keyword the this rule \n"
|
||||
| 213 -> "expected a struct field or a sub-scope context item after the dot\n"
|
||||
| 200 -> "expected the name of the label\n"
|
||||
| 230 -> "expected a rule or a definition after the label declaration\n"
|
||||
| 231 -> "expected the label to which the exception is referring back\n"
|
||||
| 233 -> "expected a rule or a definition after the exception declaration\n"
|
||||
| 246 -> "expected the name of the variable you want to define\n"
|
||||
| 247 -> "expected the defined as keyword to introduce the definition of this variable\n"
|
||||
| 249 -> "expected an expression for the consequence of this definition under condition\n"
|
||||
@ -138,7 +151,7 @@ let message s =
|
||||
| 294 -> "expected the name of this new context item\n"
|
||||
| 295 -> "expected the kind of this context item: is it a condition, a sub-scope or a data?\n"
|
||||
| 296 -> "expected the name of the subscope for this context item\n"
|
||||
| 303 -> "expected the next context item, or another declaration or scope use\n"
|
||||
| 303 -> "expected another scope context item or the end of the scope declaration\n"
|
||||
| 298 -> "expected the type of this context item\n"
|
||||
| 299 -> "expected the next context item or a dependency declaration for this item\n"
|
||||
| 301 -> "expected the next context item or a dependency declaration for this item\n"
|
||||
@ -150,7 +163,9 @@ let message s =
|
||||
| 311 -> "expected a content type\n"
|
||||
| 316 -> "expected another enum case, or a new declaration or scope use\n"
|
||||
| 18 -> "expected a declaration or a scope use\n"
|
||||
| 19 -> "expected some text or the beginning of a code section\n"
|
||||
| 20 -> "expected a declaration or a scope use\n"
|
||||
| 322 ->
|
||||
"should not happen, please file an issue at https://github.com/CatalaLang/catala/issues\n"
|
||||
| 21 -> "should not happen\n"
|
||||
| 322 -> "expected a metadata-closing tag\n"
|
||||
| 323 -> "expected a metadata-closing tag\n"
|
||||
| _ -> raise Not_found
|
||||
|
||||
@ -24,8 +24,8 @@ class CatalaFrLexer(RegexLexer):
|
||||
'code': [
|
||||
(u'(\\*\\/)', bygroups(Text), 'root'),
|
||||
(u'(\\s*\\#.*$)', bygroups(Comment.Single)),
|
||||
(u'(contexte)(\\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)),
|
||||
(u'(contexte)(\\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, String, 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)\\b', 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|r\xe8gle|sous\\s+condition|condition|donn\xe9e|cons\xe9quence|rempli|\xe9gal\\s+\xe0|assertion|d\xe9finition|\xe9tiquette|exception)\\b', bygroups(Keyword.Declaration)),
|
||||
(u'(\\|[0-9]+/[0-9]+/[0-9]+\\|)', bygroups(Number.Integer)),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user