Fixed comment.

2019-07-31 14:43:04 +02:00 · 2019-07-31 14:43:04 +02:00 · 6c818567fa
commit 6c818567fa
parent 5bc43fa430
20 changed files with 359 additions and 19 deletions
--- a/src/parser/pascaligo/Doc/pascaligo_01.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_01.bnf
@ -32,7 +32,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_02.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_02.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_03.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_03.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_04.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_04.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_05.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_05.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_06.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_06.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_07.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_07.bnf
@ -36,7 +36,7 @@ nsepseq(X,Sep) ::=
  X
 | X Sep nsepseq(X,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(X,Sep) ::=
  option(nsepseq(X,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_08.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_08.bnf
@ -39,7 +39,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_09.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_09.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_10.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_10.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_11.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_11.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_12.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_12.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_13.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_13.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_14.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_14.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_15.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_15.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_16.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_16.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_17.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_17.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_18.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_18.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_19.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_19.bnf
@ -46,7 +46,7 @@ nsepseq(item,Sep) ::=
  item
 | item Sep nsepseq(item,Sep)

-(* Possibly empy separated sequence of items *)
+(* Possibly empty separated sequence of items *)

 sepseq(item,Sep) ::=
  option(nsepseq(item,Sep))
--- a/src/parser/pascaligo/Doc/pascaligo_20.bnf
+++ b/src/parser/pascaligo/Doc/pascaligo_20.bnf
@ -0,0 +1,340 @@
+right_assoc(item,op) ::=
+  item
+| item op right_assoc(item,op)
+
+left_assoc(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(item) ::=
+  LPAR item RPAR
+
+brackets(item) ::=
+  LBRACKET item RBRACKET
+
+(* Sequences *)
+
+(* Possibly empty sequence of items *)
+
+seq(item) ::=
+  option(nseq(item))
+
+(* Non-empty sequence of items *)
+
+nseq(item) ::=
+  item seq(item)
+
+(* Non-empty separated sequence of items *)
+
+nsepseq(item,Sep) ::=
+  item
+| item Sep nsepseq(item,Sep)
+
+(* Possibly empty separated sequence of items *)
+
+sepseq(item,Sep) ::=
+  option(nsepseq(item,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 Is type_expr
+
+type_expr ::=
+  cartesian
+| nsepseq(variant,VBAR)
+| VBAR nsepseq(variant,VBAR)
+| Record series(field_decl,SEMI,End)
+| Record LBRACKET series(field_decl,SEMI,RBRACKET)
+
+variant ::=
+  Constr Of cartesian
+| Constr
+
+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))
+
+field_decl ::=
+  Ident (* field_name *) COLON type_expr
+
+(* Function and procedure declarations *)
+
+lambda_decl ::=
+  fun_decl
+| proc_decl
+| entry_decl
+
+fun_decl ::=
+  Function Ident parameters COLON type_expr Is
+    seq(local_decl)
+    block
+  With expr
+
+entry_decl ::=
+  Entrypoint Ident entry_params COLON type_expr Is
+    seq(local_decl)
+    block
+  With expr
+
+entry_params ::=
+  par(nsepseq(entry_param_decl,SEMI))
+
+proc_decl ::=
+  Procedure Ident parameters Is
+    seq(local_decl)
+    block
+
+parameters ::=
+  par(nsepseq(param_decl,SEMI))
+
+param_decl ::=
+  Var   Ident COLON param_type
+| Const Ident COLON param_type
+
+entry_param_decl ::=
+  param_decl
+| Storage Ident 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 ::=
+  block
+| 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 expr block
+| 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 paren_expr RPAR
+| injection(List,expr)
+| Nil
+| structure
+
+paren_expr ::=
+  disj_expr COLON type_expr
+| disj_expr
+| disj_expr COMMA nsepseq(expr,COMMA)
+| case(expr)
+| case(expr) COMMA nsepseq(expr,COMMA)
+
+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
+| LPAR paren_pattern RPAR
+
+paren_pattern ::=
+  core_pattern CONS pattern
+| core_pattern
+| core_pattern COMMA nsepseq(core_pattern,COMMA)