diff --git a/src/parser/pascaligo/Doc/pascaligo_01.bnf b/src/parser/pascaligo/Doc/pascaligo_01.bnf index 73babd213..551d23d3e 100644 --- a/src/parser/pascaligo/Doc/pascaligo_01.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_01.bnf @@ -281,10 +281,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -342,6 +338,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -354,6 +351,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_02.bnf b/src/parser/pascaligo/Doc/pascaligo_02.bnf index 26c3add4a..a91bbdaff 100644 --- a/src/parser/pascaligo/Doc/pascaligo_02.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_02.bnf @@ -287,10 +287,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -348,6 +344,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -360,6 +357,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_03.bnf b/src/parser/pascaligo/Doc/pascaligo_03.bnf index 8f4b6114a..8f8f7b9ee 100644 --- a/src/parser/pascaligo/Doc/pascaligo_03.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_03.bnf @@ -266,10 +266,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -327,6 +323,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -339,6 +336,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_04.bnf b/src/parser/pascaligo/Doc/pascaligo_04.bnf index c1fcccc7b..c53d68517 100644 --- a/src/parser/pascaligo/Doc/pascaligo_04.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_04.bnf @@ -244,10 +244,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -305,6 +301,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -317,6 +314,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_05.bnf b/src/parser/pascaligo/Doc/pascaligo_05.bnf index 9ddf65fcd..924a0ca30 100644 --- a/src/parser/pascaligo/Doc/pascaligo_05.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_05.bnf @@ -238,10 +238,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -299,6 +295,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -311,6 +308,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_06.bnf b/src/parser/pascaligo/Doc/pascaligo_06.bnf index 0f8007966..30323f057 100644 --- a/src/parser/pascaligo/Doc/pascaligo_06.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_06.bnf @@ -241,10 +241,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -302,6 +298,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -314,6 +311,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_07.bnf b/src/parser/pascaligo/Doc/pascaligo_07.bnf index 7d4b78f1b..263a64264 100644 --- a/src/parser/pascaligo/Doc/pascaligo_07.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_07.bnf @@ -231,10 +231,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -292,6 +288,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -304,6 +301,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_08.bnf b/src/parser/pascaligo/Doc/pascaligo_08.bnf index b420288bb..524c29d82 100644 --- a/src/parser/pascaligo/Doc/pascaligo_08.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_08.bnf @@ -233,10 +233,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -294,6 +290,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -306,6 +303,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_09.bnf b/src/parser/pascaligo/Doc/pascaligo_09.bnf index b08424594..e74409cb2 100644 --- a/src/parser/pascaligo/Doc/pascaligo_09.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_09.bnf @@ -236,10 +236,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -297,6 +293,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -309,6 +306,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_10.bnf b/src/parser/pascaligo/Doc/pascaligo_10.bnf index b33ff4778..b9b555ba0 100644 --- a/src/parser/pascaligo/Doc/pascaligo_10.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_10.bnf @@ -237,10 +237,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -292,6 +288,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -304,6 +301,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + set_expr ::= injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_11.bnf b/src/parser/pascaligo/Doc/pascaligo_11.bnf index 6155fba3b..07e980fb3 100644 --- a/src/parser/pascaligo/Doc/pascaligo_11.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_11.bnf @@ -235,10 +235,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -293,6 +289,7 @@ core_expr ::= | C_False | C_True | C_Unit +| annot_expr | tuple_expr | list_expr | C_None @@ -302,6 +299,9 @@ core_expr ::= | Constr | C_Some arguments +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR + structure ::= injection(Map,binding) | injection(Set,expr) diff --git a/src/parser/pascaligo/Doc/pascaligo_12.bnf b/src/parser/pascaligo/Doc/pascaligo_12.bnf index b4f1972c5..2b959b4cc 100644 --- a/src/parser/pascaligo/Doc/pascaligo_12.bnf +++ b/src/parser/pascaligo/Doc/pascaligo_12.bnf @@ -186,6 +186,10 @@ single_instr ::= | Remove expr From Map path | Remove expr From Set path +path ::= + Ident (* var *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) + injection(Kind,element) ::= Kind series(element,SEMI,End) | Kind End @@ -235,10 +239,6 @@ interactive_expr ::= expr ::= case(expr) -| annot_expr - -annot_expr ::= - LPAR disj_expr COLON type_expr RPAR | disj_expr disj_expr ::= @@ -296,8 +296,10 @@ core_expr ::= | C_None | C_Some arguments | Constr option(arguments) -| tuple_expr -| list_expr +| LPAR disj_expr COLON type_expr RPAR +| par(nsepseq(expr,COMMA)) +| injection(List,expr) +| Nil | structure structure ::= @@ -305,10 +307,6 @@ structure ::= | injection(Set,expr) | record_expr -path ::= - Ident (* var *) -| Ident (* struct_name *) DOT nsepseq(selection,DOT) - selection ::= Ident (* field_name *) | Int @@ -320,18 +318,8 @@ record_expr ::= field_assignment ::= Ident (* field_name *) EQUAL expr -tuple_expr ::= - tuple_inj - -tuple_inj ::= - par(nsepseq(expr,COMMA)) - arguments ::= - tuple_inj - -list_expr ::= - injection(List,expr) -| Nil + par(nsepseq(expr,COMMA)) (* Patterns *) diff --git a/src/parser/pascaligo/Doc/pascaligo_13.bnf b/src/parser/pascaligo/Doc/pascaligo_13.bnf new file mode 100644 index 000000000..82f22905f --- /dev/null +++ b/src/parser/pascaligo/Doc/pascaligo_13.bnf @@ -0,0 +1,347 @@ +left_assoc(item,op) + +right_assoc(item,op) ::= + item +| item op right_assoc(item,op) + +option(X) := + (**) +| X + +series(item,sep,term) ::= + item after_item(item,sep,term) + +after_item(item,sep,term) ::= + sep item_or_closing(item,sep,term) +| term + +item_or_closing(item,sep,term) ::= + term +| series(item,sep,term) + +(* Compound constructs *) + +par(X) ::= LPAR X RPAR + +brackets(X) ::= LBRACKET X RBRACKET + +(* Sequences *) + +(* Possibly empty sequence of items *) + +seq(X) ::= + (**) +| X seq(X) + +(* Non-empty sequence of items *) + +nseq(X) ::= X seq(X) + +(* Non-empty separated sequence of items *) + +nsepseq(X,Sep) ::= + X +| X Sep nsepseq(X,Sep) + +(* Possibly empy separated sequence of items *) + +sepseq(X,Sep) ::= + (**) +| nsepseq(X,Sep) + +(* Main *) + +contract ::= + nseq(declaration) EOF + +declaration ::= + type_decl option(SEMI) +| const_decl option(SEMI) +| lambda_decl option(SEMI) + +(* Type declarations *) + +type_decl ::= + Type Ident (* type_name *) Is type_expr + +type_expr ::= + cartesian +| sum_type +| record_type + +cartesian ::= + nsepseq(function_type,TIMES) + +function_type ::= + right_assoc(core_type,ARROW) + +core_type ::= + Ident (* type_name *) +| Ident (* type_name *) type_tuple +| Map type_tuple +| Set par(type_expr) +| List par(type_expr) +| par(type_expr) + +type_tuple ::= + par(nsepseq(type_expr,COMMA)) + +sum_type ::= + nsepseq(variant,VBAR) +| VBAR nsepseq(variant,VBAR) + +variant ::= + Constr Of cartesian +| Constr + +record_type ::= + Record series(field_decl,SEMI,End) +| Record LBRACKET series(field_decl,SEMI,RBRACKET) + +field_decl ::= + Ident (* field_name *) COLON type_expr + +(* Function and procedure declarations *) + +lambda_decl ::= + fun_decl +| proc_decl +| entry_decl + +fun_decl ::= + Function Ident (* fun_name *) parameters COLON type_expr Is + seq(local_decl) + block + With expr + +entry_decl ::= + Entrypoint Ident (* fun_name *) entry_params COLON type_expr Is + seq(local_decl) + block + With expr + +entry_params ::= + par(nsepseq(entry_param_decl,SEMI)) + +proc_decl ::= + Procedure Ident (* fun_name *) parameters Is + seq(local_decl) + block + +parameters ::= + par(nsepseq(param_decl,SEMI)) + +param_decl ::= + Var Ident (* var *) COLON param_type +| Const Ident (* var *) COLON param_type + +entry_param_decl ::= + param_decl +| Storage Ident (* var *) COLON param_type + +param_type ::= + cartesian + +block ::= + Begin series(statement,SEMI,End) +| Block LBRACE series(statement,SEMI,RBRACE) + +statement ::= + instruction +| data_decl + +data_decl ::= + const_decl +| var_decl + +const_decl ::= + Const unqualified_decl(EQUAL) + +var_decl ::= + Var unqualified_decl(ASS) + +local_decl ::= + fun_decl option(SEMI) +| proc_decl option(SEMI) +| data_decl option(SEMI) + +unqualified_decl(op) ::= + Ident (* var *) COLON type_expr op expr + +instruction ::= + single_instr +| block + +single_instr ::= + If expr Then if_clause option(SEMI) Else if_clause +| case(instruction) +| Ident (* proc_name *) arguments +| Ident ASS expr +| Ident brackets(expr) ASS expr +| Ident DOT nsepseq(selection,DOT) option(brackets(expr)) ASS expr +| loop +| Fail expr +| Skip +| Patch path With structure +| Remove expr From Map path +| Remove expr From Set path + +path ::= + Ident (* var *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) + +injection(Kind,element) ::= + Kind series(element,SEMI,End) +| Kind End +| Kind LBRACKET bracketed + +bracketed ::= + series(element,SEMI,RBRACKET) +| RBRACKET + +binding ::= + expr ARROW expr + +if_clause ::= + instruction +| LBRACE series(statement,COMMA,RBRACE) + +case(rhs) ::= + Case expr Of cases(rhs) End +| Case expr Of LBRACKET cases(rhs) RBRACKET + +cases(rhs) ::= + nsepseq(case_clause(rhs),VBAR) +| VBAR nsepseq(case_clause(rhs),VBAR) + +case_clause(rhs) ::= + pattern ARROW rhs + +loop ::= + while_loop +| for_loop + +while_loop ::= + While expr block + +for_loop ::= + For Ident ASS expr option(Down) To expr option(step_clause) block +| For Ident In expr block +| For Ident ARROW Ident In expr block + +step_clause ::= + Step expr + +(* Expressions *) + +interactive_expr ::= + expr EOF + +expr ::= + case(expr) +| disj_expr + +disj_expr ::= + left_assoc(conj_expr,Or) + +conj_expr ::= + left_assoc(set_membership,And) + +set_membership ::= + core_expr Contains set_membership +| comp_expr + +comp_expr ::= + left_assoc(cat_expr,op_comp) + +op_comp ::= + LT | LEQ | GT | GEQ | EQUAL | NEQ + +cat_expr ::= + right_assoc(cons_expr,CAT) + +cons_expr ::= + left_assoc(add_expr,CONS) + +add_expr ::= + left_assoc(mult_expr,add_op) + +add_op ::= + PLUS | MINUS + +mult_expr ::= + left_assoc(unary_expr,mult_op) + +mult_op ::= + TIMES | SLASH | Mod + +unary_expr ::= + MINUS core_expr +| Not core_expr +| core_expr + +core_expr ::= + Int +| Nat +| Mtz +| Ident (* var *) +| Ident (* var *) brackets(expr) (* lookup *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) option(brackets(expr)) +| Ident (* fun_name *) arguments +| String +| Bytes +| C_False +| C_True +| C_Unit +| C_None +| C_Some arguments +| Constr option(arguments) +| LPAR disj_expr COLON type_expr RPAR +| LPAR nsepseq(expr,COMMA) RPAR +| injection(List,expr) +| Nil +| structure + +structure ::= + injection(Map,binding) +| injection(Set,expr) +| record_expr + +selection ::= + Ident (* field_name *) +| Int + +record_expr ::= + Record series(field_assignment,SEMI,End) +| Record LBRACKET series(field_assignment,SEMI,RBRACKET) + +field_assignment ::= + Ident (* field_name *) EQUAL expr + +arguments ::= + par(nsepseq(expr,COMMA)) + +(* Patterns *) + +pattern ::= + nsepseq(core_pattern,CONS) + +core_pattern ::= + Ident (* var *) +| WILD +| Int +| String +| C_Unit +| C_False +| C_True +| C_None +| C_Some par(core_pattern) +| Constr option(tuple_pattern) +| injection(List,core_pattern) +| Nil +| par(cons_pattern) +| par(nsepseq(core_pattern,COMMA)) +| constr_pattern + +cons_pattern ::= + core_pattern CONS pattern