jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

Parsing..... again.

Browse source
This commit is contained in:
Léonard Gérard 2010-06-30 15:28:53 +02:00
parent 92afdbfb98
commit 6ab18a65ec
3 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/heptagon/parsing/hept_lexer.mll
View file

@ -29,7 +29,6 @@ List.iter (fun (str,tok) -> Hashtbl.add keyword_table str tok) [
"end", END;
"fby", FBY;
"switch", SWITCH;
"when", WHEN;
"type", TYPE;
"every", EVERY;
"true", BOOL(true);
@ -164,7 +163,7 @@ rule token = parse
| '0' ['o' 'O'] ['0'-'7']+
| '0' ['b' 'B'] ['0'-'1']+
{ INT (int_of_string(Lexing.lexeme lexbuf)) }
| ['0'-'9']+ ('.' ['0'-'9']*)? (['e' 'E'] ['+' '-']? ['0'-'9']+)?
| ['0'-'9']+ ('.' ['0'-'9']+)? (['e' 'E'] ['+' '-']? ['0'-'9']+)?
{ FLOAT (float_of_string(Lexing.lexeme lexbuf)) }
| "(*@ " (['A'-'Z' 'a'-'z']('_' ? ['A'-'Z' 'a'-'z' ''' '0'-'9']) * as id)
{

38
compiler/heptagon/parsing/hept_parser.mly
View file

@ -16,7 +16,7 @@ open Parsetree
%token <bool> BOOL
%token <string * string> PRAGMA
%token TYPE FUN NODE RETURNS VAR VAL OPEN END CONST
%token FBY PRE SWITCH WHEN EVERY
%token FBY PRE SWITCH EVERY
%token OR STAR NOT
%token AMPERSAND
%token AMPERAMPER
@ -53,10 +53,10 @@ open Parsetree
%token <string> INFIX4
%token EOF
%right AROBASE
%left WITH
%nonassoc prec_ident
%nonassoc LBRACKET
%nonassoc DEFAULT
%left ELSE
%right ARROW
%left OR
@ -83,7 +83,7 @@ open Parsetree
%%
program:
| pragma_headers open_modules const_decs type_decs node_decs EOF
| pragma_headers open_modules const_decs type_decs node_decs EOF
{{ p_pragmas = $1;
p_opened = List.rev $2;
p_types = $4;
@ -209,7 +209,7 @@ contract:
c_enforce = $5;
c_controllables = $6 }}
;
opt_equs:
| /* empty */ { [] }
| LET equs TEL { $2 }
@ -400,9 +400,9 @@ node_name:
exp:
| simple_exp { $1 }
| simple_exp FBY exp
| simple_exp FBY exp
{ mk_exp (Eapp(mk_app Efby, [$1; $3])) }
| PRE exp
| PRE exp
{ mk_exp (Eapp(mk_app (Epre None), [$2])) }
| node_name LPAREN exps RPAREN
{ mk_exp (mk_call $1 $3) }
@ -438,30 +438,30 @@ exp:
{ mk_exp (Eapp(mk_app Earrow, [$1; $3])) }
| LAST IDENT
{ mk_exp (Elast $2) }
| exp DOT longname
| simple_exp DOT longname
{ mk_exp (Efield ($1, $3)) }
/*Array operations*/
| exp POWER simple_exp
| exp POWER simple_exp
{ mk_exp (mk_array_op_call Erepeat [$1; $3]) }
| exp indexes
| simple_exp indexes
{ mk_exp (mk_array_op_call (Eselect $2) [$1]) }
| exp DOT indexes DEFAULT exp
| simple_exp DOT indexes DEFAULT exp
{ mk_exp (mk_array_op_call Eselect_dyn ([$1; $5]@$3)) }
| exp WITH indexes EQUAL exp
{ mk_exp (mk_array_op_call (Eupdate $3) [$1; $5]) }
| exp LBRACKET exp DOUBLE_DOT exp RBRACKET
| LBRACKET exp WITH indexes EQUAL exp RBRACKET
{ mk_exp (mk_array_op_call (Eupdate $4) [$2; $6]) }
| simple_exp LBRACKET exp DOUBLE_DOT exp RBRACKET
{ mk_exp (mk_array_op_call Eselect_slice [$1; $3; $5]) }
| exp AROBASE exp
| exp AROBASE exp
{ mk_exp (mk_array_op_call Econcat [$1; $3]) }
/*Iterators*/
| iterator longname DOUBLE_LESS simple_exp DOUBLE_GREATER LPAREN exps RPAREN
{ mk_exp (mk_iterator_call $1 $2 [] ($4::$7)) }
| iterator LPAREN longname DOUBLE_LESS array_exp_list DOUBLE_GREATER
| iterator LPAREN longname DOUBLE_LESS array_exp_list DOUBLE_GREATER
RPAREN DOUBLE_LESS simple_exp DOUBLE_GREATER LPAREN exps RPAREN
{ mk_exp (mk_iterator_call $1 $3 $5 ($9::$12)) }
/*Records operators */
| exp WITH DOT longname EQUAL exp
{ mk_exp (Eapp (mk_app (Efield_update $4), [$1; $6])) }
| LBRACE e=simple_exp WITH DOT ln=longname EQUAL nv=exp RBRACE
{ mk_exp (Eapp (mk_app (Efield_update ln), [e; nv])) }
;
call_params:
@ -551,7 +551,7 @@ interface_decl:
| OPEN Constructor { mk_interface_decl (Iopen $2) }
| VAL node_or_fun ident node_params LPAREN params_signature RPAREN
RETURNS LPAREN params_signature RPAREN
{ mk_interface_decl (Isignature({ sig_name = $3;
{ mk_interface_decl (Isignature({ sig_name = $3;
sig_inputs = $6;
sig_statefull = $2;
sig_outputs = $10;

32
compiler/minils/parsing/mls_parser.mly
View file

@ -63,7 +63,7 @@ let mk_var name ty = mk_var_dec name ty
%left WHEN
%right FBY
%right PRE
%left POWER
%right POWER
%start program
@ -162,30 +162,30 @@ simple_exp:
| LPAREN e=exp RPAREN { e }
exp:
| e=simple_exp { e }
| c=const { mk_exp (Econst c) }
| const FBY exp { mk_exp (Efby(Some($1),$3)) }
| PRE exp { mk_exp (Efby(None,$2)) }
| op=funop a=exps r=reset { mk_exp (Ecall(op, a, r)) }
| e=simple_exp { e }
| c=const { mk_exp (Econst c) }
| const FBY exp { mk_exp (Efby(Some($1),$3)) }
| PRE exp { mk_exp (Efby(None,$2)) }
| op=funop a=exps r=reset { mk_exp (Ecall(op, a, r)) }
| e1=exp i_op=infix e2=exp
{ mk_exp (Ecall(mk_op ~op_kind:Efun i_op, [e1; e2], None)) }
| p_op=prefix e=exp %prec prefixs
{ mk_exp (Ecall(mk_op ~op_kind:Efun p_op, [e], None)) }
| IF e1=exp THEN e2=exp ELSE e3=exp { mk_exp (Eifthenelse(e1, e2, e3)) }
| e=simple_exp DOT m=longname { mk_exp (Efield(e, m)) }
| IF e1=exp THEN e2=exp ELSE e3=exp { mk_exp (Eifthenelse(e1, e2, e3)) }
| e=simple_exp DOT m=longname { mk_exp (Efield(e, m)) }
| e=exp WHEN c=constructor LPAREN n=ident RPAREN
{ mk_exp (Ewhen(e, c, n)) }
| MERGE n=ident h=handlers { mk_exp (Emerge(n, h)) }
{ mk_exp (Ewhen(e, c, n)) }
| MERGE n=ident h=handlers { mk_exp (Emerge(n, h)) }
| LPAREN r=exp WITH DOT ln=longname EQUAL nv=exp /*ordre louche...*/
{ mk_exp (Efield_update(ln, r, nv)) }
| op=array_op { mk_exp (Earray_op op) }
/* ??? TODO | Earray of exp list [e1,e2,e3...] ???? */
| op=array_op { mk_exp (Earray_op op) }
| LBRACKET es=slist(COMMA, exp) RBRACKET { mk_exp (Earray es) }
array_op: /* TODO quel vrai gain de séparer les array op ? gain pour cédric ?*/
| e=exp POWER p=e_param { Erepeat(p, e) } /*ordre louche...*/
| e=simple_exp i=indexes { Eselect(i, e) } /*ordre louche...*/
array_op:
| e=exp POWER p=e_param { Erepeat(p, e) }
| e=simple_exp i=indexes { Eselect(i, e) }
/*TODO | e=exp i=indexes_dyn DEFAULT d=exp { Eselect_dyn(i,???? ,e ,d) } */
| LPAREN e=exp WITH i=indexes EQUAL nv=exp { Eupdate(i, e, nv) } /*ordre louche...*/
| LPAREN e=exp WITH i=indexes EQUAL nv=exp { Eupdate(i, e, nv) }
| e=simple_exp LBRACKET i1=e_param DOTDOT i2=e_param RBRACKET
{ Eselect_slice(i1, i2, e) }
| e1=exp AROBASE e2=exp { Econcat(e1,e2) }