Benjamin_Loison/Synchronous_reactive_systems
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Add reset keyword

Browse Source
This commit is contained in:
Benjamin Loison 2022-12-10 02:18:04 +01:00
parent dcf7320c0d
commit 45d64f6960
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ast.ml
View File

@ -47,6 +47,7 @@ type t_expression =
| ETriOp of full_ty * triop * t_expression * t_expression * t_expression | ETriOp of full_ty * triop * t_expression * t_expression * t_expression
| EComp of full_ty * compop * t_expression * t_expression | EComp of full_ty * compop * t_expression * t_expression
| EWhen of full_ty * t_expression * t_expression | EWhen of full_ty * t_expression * t_expression
| EReset of full_ty * t_expression * t_expression
| EConst of full_ty * const | EConst of full_ty * const
| ETuple of full_ty * (t_expression list) | ETuple of full_ty * (t_expression list)
| EApp of full_ty * t_node * t_expression | EApp of full_ty * t_node * t_expression

1
src/lexer.mll
View File

@ -30,6 +30,7 @@
("else", ELSE); ("else", ELSE);
("merge", TO_merge); ("merge", TO_merge);
("when", WHEN); ("when", WHEN);
("reset", RESET);
("pre", MO_pre); ("pre", MO_pre);
("true", CONST_BOOL(true)); ("true", CONST_BOOL(true));
("false", CONST_BOOL(false)); ("false", CONST_BOOL(false));

9
src/parser.mly
View File

@ -35,6 +35,7 @@
| ETriOp (full_ty , _ , _ , _ , _) -> full_ty | ETriOp (full_ty , _ , _ , _ , _) -> full_ty
| EComp (full_ty , _ , _ , _) -> full_ty | EComp (full_ty , _ , _ , _) -> full_ty
| EWhen (full_ty , _ , _) -> full_ty | EWhen (full_ty , _ , _) -> full_ty
| EReset (full_ty , _ , _) -> full_ty
| EConst (full_ty , _) -> full_ty | EConst (full_ty , _) -> full_ty
| ETuple (full_ty , _) -> full_ty | ETuple (full_ty , _) -> full_ty
| EApp (full_ty , _ , _) -> full_ty | EApp (full_ty , _ , _) -> full_ty
@ -160,6 +161,7 @@
%token TO_merge %token TO_merge
%token WHEN %token WHEN
%token RESET
%token IF %token IF
%token THEN %token THEN
@ -359,6 +361,13 @@ expr:
then EWhen (type_exp $1, $1, $3) then EWhen (type_exp $1, $1, $3)
else raise (MyParsingError ("The when does not type-check!", else raise (MyParsingError ("The when does not type-check!",
current_location())) } current_location())) }
| expr RESET expr
{ let e1 = $1 in let t1 = type_exp e1 in
let e2 = $3 in let t2 = type_exp e2 in
if t2 = FTBase TBool
then EReset (type_exp $1, $1, $3)
else raise (MyParsingError ("The reset does not type-check!",
current_location())) }
/* Constants */ /* Constants */
| CONST_INT { EConst (FTBase TInt, CInt $1) } | CONST_INT { EConst (FTBase TInt, CInt $1) }
| CONST_BOOL { EConst (FTBase TBool, CBool $1) } | CONST_BOOL { EConst (FTBase TBool, CBool $1) }

7
src/pp.ml
View File

@ -40,6 +40,13 @@ let pp_expression =
(pp_expression_aux (upd_prefix prefix)) e1 (pp_expression_aux (upd_prefix prefix)) e1
(pp_expression_aux (upd_prefix prefix)) e2 (pp_expression_aux (upd_prefix prefix)) e2
end end
| EReset (_, e1, e2) ->
begin
Format.fprintf fmt "\t\t\t%sRESET\n%a\t\t\tRESET\n%a"
prefix
(pp_expression_aux (upd_prefix prefix)) e1
(pp_expression_aux (upd_prefix prefix)) e2
end
| EConst (_, c) -> | EConst (_, c) ->
begin match c with begin match c with
| CBool true -> Format.fprintf fmt "\t\t\t%s<true : bool>\n" prefix | CBool true -> Format.fprintf fmt "\t\t\t%s<true : bool>\n" prefix