Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-07 00:53:41 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

|| (or) operator added

Browse Source
This commit is contained in:
Pascal Brisset
2006-07-29 09:50:18 +00:00
parent e3f1e349bd
commit ce0a626a19
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/fp_lexer.mll
+1
View File
@@ -21,6 +21,7 @@ rule token = parse
| ']' { RB }
| "==" { EQ }
| "&&" { AND }
| "||" { OR }
| ">" { GT }
| ">=" { GEQ }
| "+" { PLUS }
sw/tools/fp_parser.mly
+4 -2
View File
@@ -6,13 +6,14 @@ open Fp_syntax
%token <float> FLOAT
%token <string> IDENT
%token EOF
%token COMMA SEMICOLON LP RP LC RC LB RB AND COLON
%token COMMA SEMICOLON LP RP LC RC LB RB AND COLON OR
%token EQ GT ASSIGN GEQ NOT
%token PLUS MINUS
%token MULT DIV
%left EQ GT ASSIGN GEQ /* lowest precedence */
%left AND OR /* lowest precedence */
%left EQ GT ASSIGN GEQ
%left PLUS MINUS
%left MULT DIV
%nonassoc NOT
@@ -28,6 +29,7 @@ expression:
| expression GEQ expression { CallOperator (">=",[$1;$3]) }
| expression EQ expression { CallOperator ("==",[$1;$3]) }
| expression AND expression { CallOperator ("&&",[$1;$3]) }
| expression OR expression { CallOperator ("||",[$1;$3]) }
| expression PLUS expression { CallOperator ("+",[$1;$3]) }
| expression MINUS expression { CallOperator ("-",[$1;$3]) }
| expression MULT expression { CallOperator ("*",[$1;$3]) }