From 6a0948a6ac9d01b369c47a434c472c4909aeb930 Mon Sep 17 00:00:00 2001 From: Christian Rinderknecht Date: Tue, 30 Jul 2019 11:27:32 +0200 Subject: [PATCH] Fixed regression. Enabled type annotations for all expressions (between parentheses). The error was to use COMMA to separate instructions in a block, instead of SEMI (semicolons), as before. This is corrected here. --- src/parser/pascaligo/Doc/pascaligo_11.bnf | 373 ++++++++++++++++++++++ src/parser/pascaligo/Doc/pascaligo_12.bnf | 368 +++++++++++++++++++++ src/parser/pascaligo/Parser.mly | 42 +-- 3 files changed, 758 insertions(+), 25 deletions(-) create mode 100644 src/parser/pascaligo/Doc/pascaligo_11.bnf create mode 100644 src/parser/pascaligo/Doc/pascaligo_12.bnf diff --git a/src/parser/pascaligo/Doc/pascaligo_11.bnf b/src/parser/pascaligo/Doc/pascaligo_11.bnf new file mode 100644 index 000000000..6155fba3b --- /dev/null +++ b/src/parser/pascaligo/Doc/pascaligo_11.bnf @@ -0,0 +1,373 @@ +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 + +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) +| annot_expr + +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR +| 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) brackets(expr) (* lookup *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) +| String +| Bytes +| C_False +| C_True +| C_Unit +| tuple_expr +| list_expr +| C_None +| fun_call +| structure +| Constr arguments +| Constr +| C_Some arguments + +structure ::= + injection(Map,binding) +| injection(Set,expr) +| record_expr + +path ::= + Ident (* var *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) + +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 + +fun_call ::= + Ident (* fun_name *) arguments + +tuple_expr ::= + tuple_inj + +tuple_inj ::= + par(nsepseq(expr,COMMA)) + +arguments ::= + tuple_inj + +list_expr ::= + injection(List,expr) +| Nil + +(* Patterns *) + +pattern ::= + nsepseq(core_pattern,CONS) + +core_pattern ::= + Ident (* var *) +| WILD +| Int +| String +| C_Unit +| C_False +| C_True +| C_None +| list_pattern +| tuple_pattern +| constr_pattern +| C_Some par(core_pattern) + +list_pattern ::= + injection(List,core_pattern) +| Nil +| par(cons_pattern) + +cons_pattern ::= + core_pattern CONS pattern + +tuple_pattern ::= + par(nsepseq(core_pattern,COMMA)) + +constr_pattern ::= + Constr tuple_pattern +| Constr diff --git a/src/parser/pascaligo/Doc/pascaligo_12.bnf b/src/parser/pascaligo/Doc/pascaligo_12.bnf new file mode 100644 index 000000000..b4f1972c5 --- /dev/null +++ b/src/parser/pascaligo/Doc/pascaligo_12.bnf @@ -0,0 +1,368 @@ +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 + +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) +| annot_expr + +annot_expr ::= + LPAR disj_expr COLON type_expr RPAR +| 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) +| tuple_expr +| list_expr +| structure + +structure ::= + injection(Map,binding) +| injection(Set,expr) +| record_expr + +path ::= + Ident (* var *) +| Ident (* struct_name *) DOT nsepseq(selection,DOT) + +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 + +tuple_expr ::= + tuple_inj + +tuple_inj ::= + par(nsepseq(expr,COMMA)) + +arguments ::= + tuple_inj + +list_expr ::= + injection(List,expr) +| Nil + +(* Patterns *) + +pattern ::= + nsepseq(core_pattern,CONS) + +core_pattern ::= + Ident (* var *) +| WILD +| Int +| String +| C_Unit +| C_False +| C_True +| C_None +| list_pattern +| tuple_pattern +| constr_pattern +| C_Some par(core_pattern) + +list_pattern ::= + injection(List,core_pattern) +| Nil +| par(cons_pattern) + +cons_pattern ::= + core_pattern CONS pattern + +tuple_pattern ::= + par(nsepseq(core_pattern,COMMA)) + +constr_pattern ::= + Constr tuple_pattern +| Constr diff --git a/src/parser/pascaligo/Parser.mly b/src/parser/pascaligo/Parser.mly index 73671c834..96647a5ca 100644 --- a/src/parser/pascaligo/Parser.mly +++ b/src/parser/pascaligo/Parser.mly @@ -417,15 +417,9 @@ data_decl: | var_decl { LocalVar $1 } unqualified_decl(OP): - var COLON type_expr OP extended_expr { - let init, region = - match $5 with - `Expr e -> e, expr_to_region e - | `EList kwd_nil -> - EList (Nil kwd_nil), kwd_nil - | `ENone region -> - EConstr (NoneExpr region), region - in $1, $2, $3, $4, init, region} + var COLON type_expr OP expr { + let region = expr_to_region $5 + in $1, $2, $3, $4, $5, region} const_decl: open_const_decl SEMI { @@ -441,12 +435,9 @@ var_decl: } | open_var_decl { $1 } -extended_expr: - expr { `Expr $1 } - instruction: - single_instr { Single $1 } -| block { Block $1 : instruction } + single_instr { Single $1 } +| block { Block $1 } single_instr: conditional { Cond $1 } @@ -590,7 +581,7 @@ if_clause: instruction { ClauseInstr $1 } -| LBRACE sep_or_term_list(statement,COMMA) RBRACE { +| LBRACE sep_or_term_list(statement,SEMI) RBRACE { let region = cover $1 $3 in let value = { lbrace = $1; @@ -712,16 +703,7 @@ interactive_expr: expr: case(expr) { ECase ($1 expr_to_region) } -| annot_expr { $1 } - -annot_expr: - LPAR disj_expr COLON type_expr RPAR { - let start = expr_to_region $2 - and stop = type_expr_to_region $4 in - let region = cover start stop - and value = ($2 , $4) in - (EAnnot {region; value}) - } + (*| annot_expr { $1 }*) | disj_expr { $1 } disj_expr: @@ -888,6 +870,7 @@ core_expr: | C_False { ELogic (BoolExpr (False $1)) } | C_True { ELogic (BoolExpr (True $1)) } | C_Unit { EUnit $1 } +| annot_expr { EAnnot $1 } | tuple_expr { ETuple $1 } | list_expr { EList $1 } | C_None { EConstr (NoneExpr $1) } @@ -907,6 +890,15 @@ core_expr: let region = cover $1 $2.region in EConstr (SomeApp {region; value = $1,$2})} +annot_expr: + LPAR disj_expr COLON type_expr RPAR { + let start = expr_to_region $2 + and stop = type_expr_to_region $4 in + let region = cover start stop + and value = ($2 , $4) + in {region; value} + } + set_expr: injection(Set,expr) { SetInj $1 }