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

Allow "and" as a synonym for "&"

Browse source
This commit is contained in:
Timothy Bourke 2017-01-21 18:16:58 +01:00 committed by Gwenaël Delaval
parent 3d75602a0d
commit 0ef0ac5529
2 changed files with 5 additions and 2 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) [
"true", BOOL(true);
"false", BOOL(false);
"pre", PRE;
"and", AND;
"or", OR;
"not", NOT;
"open", OPEN;

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

@ -47,7 +47,7 @@ open Hept_parsetree
%token <string * string> PRAGMA
%token TYPE FUN NODE RETURNS VAR VAL OPEN END CONST UNSAFE EXTERNAL
%token FBY PRE SWITCH EVERY
%token OR STAR NOT
%token AND OR STAR NOT
%token AMPERSAND
%token AMPERAMPER
%token AUTOMATON
@ -95,7 +95,7 @@ open Hept_parsetree
%left ELSE
%right ARROW
%left OR
%left AMPERSAND
%left AND AMPERSAND
%left INFIX0 EQUAL LESS_GREATER
%right INFIX1
%right WHEN WHENOT
@ -567,6 +567,8 @@ _exp:
{ mk_op_call "or" [$1; $3] }
| exp STAR exp
{ mk_op_call "*" [$1; $3] }
| exp AND exp
{ mk_op_call "&" [$1; $3] }
| exp AMPERSAND exp
{ mk_op_call "&" [$1; $3] }
| exp SUBTRACTIVE exp