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

improve syntax

Browse source
This commit is contained in:
Léonard Gérard 2011-05-11 18:22:25 +02:00
parent 88497a2da3
commit 40fcb4d73e
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,7 @@ List.iter (fun (str,tok) -> Hashtbl.add keyword_table str tok) [
"whenot", WHENOT;
"merge", MERGE;
"on", ON;
"onot", ONOT;
"map", MAP;
"mapi", MAPI;
"fold", FOLD;

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

@ -39,7 +39,7 @@ open Hept_parsetree
%token ASSUME
%token ENFORCE
%token WITH
%token WHEN WHENOT MERGE ON
%token WHEN WHENOT MERGE ON ONOT
%token POWER
%token LBRACKET LBRACKETGREATER
%token RBRACKET LESSRBRACKET
@ -285,8 +285,11 @@ ck:
on_ck:
| c=constructor_or_bool LPAREN x=IDENT RPAREN { Con(Cbase,c,x) }
| b=ck ON c=constructor_or_bool LPAREN x=IDENT RPAREN { Con(b,c,x) }
| x=IDENT { Con(Cbase,Q Initial.ptrue,x) }
| c=constructor_or_bool LPAREN x=IDENT RPAREN { Con(Cbase,c,x) }
| b=ck ON x=IDENT { Con(b,Q Initial.ptrue,x) }
| b=ck ONOT x=IDENT { Con(b,Q Initial.pfalse,x) }
| b=ck ON c=constructor_or_bool LPAREN x=IDENT RPAREN { Con(b,c,x) }
equs:

11
test/good/auto.ept
View file

@ -3,14 +3,19 @@ let
o = 0 fby (o + 1);
tel
node main() returns (c : bool)
node f() returns(x,y : bool)
let
(x,y) = (true,false)
tel
node main() returns (c,c1 : bool)
let
automaton
state One
do c = true;
do (c,c1) = f()
until count() = 5 then Two
state Two
do c = false
do (c,c1) = f()
until count() = 3 then One
end
tel