fmt
This commit is contained in:
parent
aa5009e94c
commit
7683cada98
GPG key ID:
A82D63DFF8D1317F
1 changed files with 113 additions and 111 deletions
|
|
@ -29,8 +29,8 @@ program:
|
|||
}
|
||||
/* Attrapes les erreurs de syntaxe */
|
||||
| e=located(error) {
|
||||
Error.error "parsing" (Position.position e) "Syntax error."
|
||||
}
|
||||
Error.error "parsing" (Position.position e) "Syntax error."
|
||||
}
|
||||
|
||||
|
||||
definition:
|
||||
|
|
@ -60,7 +60,9 @@ tdefinition:
|
|||
}
|
||||
|
||||
label_with_type:
|
||||
| l=located(label) COLON t=located(ty) { l, t }
|
||||
| l=located(label) COLON t=located(ty) {
|
||||
l, t
|
||||
}
|
||||
|
||||
|
||||
vdefinition:
|
||||
|
|
@ -97,17 +99,17 @@ fundef:
|
|||
* TODO : y'a environ 50 warnings ici, surtout au niveau du POr et PAnd */
|
||||
|
||||
branches:
|
||||
| b=separated_nonempty_list(PIPE,located(branch)){
|
||||
b
|
||||
}
|
||||
| PIPE b = separated_nonempty_list(PIPE,located(branch)){
|
||||
b
|
||||
}
|
||||
| b=separated_nonempty_list(PIPE, located(branch)) {
|
||||
b
|
||||
}
|
||||
| PIPE b=separated_nonempty_list(PIPE, located(branch)) {
|
||||
b
|
||||
}
|
||||
|
||||
branch:
|
||||
| p = located(pattern) ARROW e=located(expression){
|
||||
Branch(p,e)
|
||||
}
|
||||
| p=located(pattern) ARROW e=located(expression) {
|
||||
Branch(p, e)
|
||||
}
|
||||
|
||||
|
||||
simple_pattern:
|
||||
|
|
@ -125,7 +127,7 @@ simple_pattern:
|
|||
}
|
||||
/* Annotation de type */
|
||||
| p=located(simple_pattern) COLON ty=located(ty) {
|
||||
PTypeAnnotation(p,ty)
|
||||
PTypeAnnotation(p, ty)
|
||||
}
|
||||
/* Entier / Caractère / String */
|
||||
| l=located(literal) {
|
||||
|
|
@ -149,7 +151,7 @@ simple_pattern:
|
|||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(pattern))) RBRACE {
|
||||
PRecord(l, None)
|
||||
}
|
||||
| LBRACE l=separated_nonempty_list(COMMA,separated_pair(located(label), EQUAL, located(pattern))) RBRACE INFERIOR SUPERIOR {
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(pattern))) RBRACE INFERIOR SUPERIOR {
|
||||
PRecord(l, None)
|
||||
}
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(pattern))) RBRACE INFERIOR liste_ty=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR {
|
||||
|
|
@ -158,17 +160,17 @@ simple_pattern:
|
|||
/* Disjonction */
|
||||
|
||||
pattern:
|
||||
| p1=pattern_and{
|
||||
p1
|
||||
}
|
||||
| p1=pattern_and {
|
||||
p1
|
||||
}
|
||||
| p1=located(pattern_and) PIPE p_list=separated_nonempty_list(PIPE, located(pattern_and)) {
|
||||
POr(p1 :: p_list)
|
||||
}
|
||||
/* Conjonction */
|
||||
pattern_and:
|
||||
| p1=simple_pattern{
|
||||
p1
|
||||
}
|
||||
p1
|
||||
}
|
||||
| p1=located(simple_pattern) AND p_list=separated_nonempty_list(AND, located(simple_pattern)) {
|
||||
PAnd(p1 :: p_list)
|
||||
}
|
||||
|
|
@ -243,112 +245,111 @@ simple_expression:
|
|||
Literal l
|
||||
}
|
||||
/* Variable */
|
||||
| i = located(identifier){
|
||||
Variable(i,None)
|
||||
| i=located(identifier) {
|
||||
Variable(i, None)
|
||||
}
|
||||
| i = located(identifier) INFERIOR SUPERIOR {
|
||||
Variable(i,None)
|
||||
| i=located(identifier) INFERIOR SUPERIOR {
|
||||
Variable(i, None)
|
||||
}
|
||||
| i = located(identifier) INFERIOR t_list = option(separated_nonempty_list(COMMA,located(ty))) SUPERIOR{
|
||||
Variable(i,t_list)
|
||||
| i=located(identifier) INFERIOR t_list=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR {
|
||||
Variable(i, t_list)
|
||||
}
|
||||
|
||||
/* Tuple n = 0 and n > 1 */
|
||||
| LPAREN RPAREN {
|
||||
| LPAREN RPAREN {
|
||||
Tuple([])
|
||||
}
|
||||
| LPAREN e=located(expression) COMMA e_list = separated_nonempty_list(COMMA,located(expression)) RPAREN {
|
||||
| LPAREN e=located(expression) COMMA e_list=separated_nonempty_list(COMMA, located(expression)) RPAREN {
|
||||
Tuple(e::e_list)
|
||||
}
|
||||
|
||||
/* Tagged Value*/
|
||||
/* K */
|
||||
| const = located(constructor){
|
||||
Tagged(const,None,[])
|
||||
/* K */
|
||||
| const=located(constructor) {
|
||||
Tagged(const, None, [])
|
||||
}
|
||||
/* K < > */
|
||||
| const = located(constructor) INFERIOR SUPERIOR{
|
||||
Tagged(const,None,[])
|
||||
/* K < > */
|
||||
| const=located(constructor) INFERIOR SUPERIOR {
|
||||
Tagged(const, None, [])
|
||||
}
|
||||
/* K < > (e1, ..., en) */
|
||||
| const = located(constructor) INFERIOR SUPERIOR LPAREN e_list=separated_nonempty_list(COMMA,located(expression)) RPAREN {
|
||||
Tagged(const,None,e_list)
|
||||
/* K < > (e1, ..., en) */
|
||||
| const=located(constructor) INFERIOR SUPERIOR LPAREN e_list=separated_nonempty_list(COMMA, located(expression)) RPAREN {
|
||||
Tagged(const, None, e_list)
|
||||
}
|
||||
/* K <ty_1, ... ty_m> */
|
||||
| const = located(constructor) INFERIOR t_list = option(separated_nonempty_list(COMMA,located(ty))) SUPERIOR {
|
||||
Tagged(const,t_list,[])
|
||||
/* K <ty_1, ... ty_m> */
|
||||
| const=located(constructor) INFERIOR t_list=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR {
|
||||
Tagged(const, t_list, [])
|
||||
}
|
||||
/* K <ty_1, ..., ty_m> (e1,...,en) */
|
||||
| const = located(constructor) INFERIOR t_list = option(separated_nonempty_list(COMMA,located(ty))) SUPERIOR LPAREN e_list=separated_nonempty_list(COMMA,located(expression)) RPAREN{
|
||||
Tagged(const,t_list,e_list)
|
||||
/* K <ty_1, ..., ty_m> (e1,...,en) */
|
||||
| const=located(constructor) INFERIOR t_list=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR LPAREN e_list=separated_nonempty_list(COMMA, located(expression)) RPAREN {
|
||||
Tagged(const, t_list, e_list)
|
||||
}
|
||||
|
||||
/* Record */
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE {
|
||||
/* Record */
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE {
|
||||
Record(l, None)
|
||||
}
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE INFERIOR SUPERIOR {
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE INFERIOR SUPERIOR {
|
||||
Record(l, None)
|
||||
}
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE INFERIOR t_list = option(separated_nonempty_list(COMMA,located(ty))) SUPERIOR{
|
||||
| LBRACE l=separated_nonempty_list(COMMA, separated_pair(located(label), EQUAL, located(expression))) RBRACE INFERIOR t_list=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR {
|
||||
Record(l, t_list)
|
||||
}
|
||||
|
||||
/* Lecture de variable */
|
||||
/* ! expr */
|
||||
| EXCLA e=located(simple_expression) {
|
||||
/* Lecture de variable */
|
||||
/* ! expr */
|
||||
| EXCLA e=located(simple_expression) {
|
||||
Read(e)
|
||||
}
|
||||
|
||||
|
||||
|
||||
expression:
|
||||
| e=simple_expression{
|
||||
expression:
|
||||
| e=simple_expression {
|
||||
e
|
||||
}
|
||||
/* Field */
|
||||
/* Field */
|
||||
|
||||
/* e.l */
|
||||
| e=located(expression) DOT l = located(label){
|
||||
Field(e,l,None)
|
||||
/* e.l */
|
||||
| e=located(expression) DOT l=located(label) {
|
||||
Field(e, l, None)
|
||||
}
|
||||
/* e.l < > */
|
||||
| e=located(expression) DOT l = located(label) INFERIOR SUPERIOR {
|
||||
Field(e,l,None)
|
||||
/* e.l < > */
|
||||
| e=located(expression) DOT l=located(label) INFERIOR SUPERIOR {
|
||||
Field(e, l, None)
|
||||
}
|
||||
/* e.l <ty_1...ty_n>*/
|
||||
| e = located(expression) DOT l=located(label) INFERIOR t_list = option(separated_nonempty_list(COMMA,located(ty))) SUPERIOR {
|
||||
Field(e,l,t_list)
|
||||
/* e.l <ty_1...ty_n>*/
|
||||
| e=located(expression) DOT l=located(label) INFERIOR t_list=option(separated_nonempty_list(COMMA, located(ty))) SUPERIOR {
|
||||
Field(e, l, t_list)
|
||||
}
|
||||
/* Sequence */
|
||||
/* Pas sûr, voir s'il ne fuat pas une troisième couche d'expression */
|
||||
| e = located(simple_expression) SEMICOLON e_list = separated_nonempty_list(SEMICOLON,located(simple_expression)){
|
||||
/* Sequence */
|
||||
/* Pas sûr, voir s'il ne fuat pas une troisième couche d'expression */
|
||||
| e=located(simple_expression) SEMICOLON e_list=separated_nonempty_list(SEMICOLON, located(simple_expression)) {
|
||||
Sequence(e::e_list)
|
||||
}
|
||||
|
||||
/* Definition locale */
|
||||
| vd= vdefinition SEMICOLON e=located(expression){
|
||||
Define(vd,e)
|
||||
/* Definition locale */
|
||||
| vd=vdefinition SEMICOLON e=located(expression) {
|
||||
Define(vd, e)
|
||||
}
|
||||
|
||||
/* Fonction anonyme */
|
||||
| BACKSLASH p=located(pattern) ARROW e=located(expression){
|
||||
Fun(FunctionDefinition(p,e))
|
||||
/* Fonction anonyme */
|
||||
| BACKSLASH p=located(pattern) ARROW e=located(expression) {
|
||||
Fun(FunctionDefinition(p, e))
|
||||
}
|
||||
|
||||
/* Application */
|
||||
| e1=located(expression) e2=located(expression){
|
||||
Apply(e1,e2)
|
||||
/* Application */
|
||||
| e1=located(expression) e2=located(expression) {
|
||||
Apply(e1, e2)
|
||||
}
|
||||
|
||||
/* TODO operation binaire mais j'ai pas très bien compris encore */
|
||||
|
||||
|
||||
/* Match (exp) {| ...| ... | ...} */
|
||||
| MATCH LPAREN e=located(expression) RPAREN
|
||||
LBRACE b=branches RBRACE {
|
||||
Case(e,b)
|
||||
}
|
||||
/* Match (exp) {| ...| ... | ...} */
|
||||
| MATCH LPAREN e=located(expression) RPAREN LBRACE b=branches RBRACE {
|
||||
Case(e, b)
|
||||
}
|
||||
|
||||
/* TODO if ( exp ) then { expr } j'ai RIEN COMPRIS */
|
||||
/*
|
||||
|
|
@ -357,52 +358,53 @@ simple_expression:
|
|||
IfThenElse(e,e2,None)
|
||||
}
|
||||
*/
|
||||
/* if ( expr ) then { expr } else { expr } */
|
||||
| IF LPAREN e=located(expression) RPAREN
|
||||
THEN LBRACE e2=located(expression) RBRACE
|
||||
ELSE LBRACE e3=located(expression) RBRACE {
|
||||
IfThenElse(e,e2,e3)
|
||||
}
|
||||
/* if ( expr ) then { expr } else { expr } */
|
||||
| IF LPAREN e=located(expression) RPAREN
|
||||
THEN LBRACE e2=located(expression) RBRACE
|
||||
ELSE LBRACE e3=located(expression) RBRACE {
|
||||
IfThenElse(e, e2, e3)
|
||||
}
|
||||
|
||||
/* Reference ref expr */
|
||||
|
||||
| REF e=located(expression){
|
||||
| REF e=located(expression) {
|
||||
Ref(e)
|
||||
}
|
||||
|
||||
/* Affectation */
|
||||
/* expr := expr */
|
||||
/* Affectation */
|
||||
/* expr := expr */
|
||||
|
||||
| e1=located(expression) ASSIGN e2=located(expression){
|
||||
Assign(e1,e2)
|
||||
| e1=located(expression) ASSIGN e2=located(expression) {
|
||||
Assign(e1, e2)
|
||||
}
|
||||
|
||||
/* While */
|
||||
/* while ( expr ) { expr } */
|
||||
| WHILE LPAREN e=located(expression) RPAREN
|
||||
/* While */
|
||||
/* while ( expr ) { expr } */
|
||||
| WHILE LPAREN e=located(expression) RPAREN
|
||||
LBRACE e2=located(expression) RBRACE {
|
||||
While(e,e2)
|
||||
While(e, e2)
|
||||
}
|
||||
|
||||
/* Do while TODO */
|
||||
/* do { expr } until ( expr ) */
|
||||
/* Do while TODO */
|
||||
/* do { expr } until ( expr ) */
|
||||
|
||||
/* boucle for */
|
||||
/* for x in (e1 to e2) { expr } */
|
||||
| FOR x=located(identifier)
|
||||
/* boucle for */
|
||||
/* for x in (e1 to e2) { expr } */
|
||||
| FOR x=located(identifier)
|
||||
FROM LPAREN e1=located(expression) RPAREN TO LPAREN e2=located(expression) RPAREN
|
||||
LBRACE e3=located(expression) RBRACE
|
||||
{ For(x,e1,e2,e3)}
|
||||
LBRACE e3=located(expression) RBRACE {
|
||||
For(x, e1, e2, e3)
|
||||
}
|
||||
|
||||
/* Parenthésage pas sûr mais je vois pas sinon*/
|
||||
| LPAREN e=expression RPAREN {
|
||||
/* Parenthésage pas sûr mais je vois pas sinon*/
|
||||
| LPAREN e=expression RPAREN {
|
||||
e
|
||||
}
|
||||
|
||||
/* Annotation de type */
|
||||
/* (e : ty) */
|
||||
| LPAREN e=located(expression) COLON t=located(ty) RPAREN {
|
||||
TypeAnnotation(e,t)
|
||||
/* Annotation de type */
|
||||
/* (e : ty) */
|
||||
| LPAREN e=located(expression) COLON t=located(ty) RPAREN {
|
||||
TypeAnnotation(e, t)
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Reference in a new issue