kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Make Quantity parser accept 1/[unit] as [unit]^-1

Browse Source
This commit is contained in:
Oliver Oxtoby
2017-08-17 15:38:54 +02:00
committed by wmayer
parent 1165d3c6e0
commit 858df142e2
4 changed files with 418 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Base/QuantityParser.y
View File

@@ -17,12 +17,13 @@
%}
/* Bison declarations. */
%token UNIT NUM MINUSSIGN
%token UNIT ONE NUM MINUSSIGN
%token ACOS ASIN ATAN ATAN2 COS EXP ABS MOD LOG LOG10 POW SIN SINH TAN TANH SQRT;
%left MINUSSIGN '+'
%left '*' '/'
%left NEG /* negation--unary minus */
%right '^' /* exponentiation */
%left ONE NUM
@@ -37,6 +38,7 @@
| quantity quantity { QuantResult = $1 + $2; }
;
num: NUM { $$ = $1; }
| ONE { $$ = $1; }
| num '+' num { $$ = Quantity($1.getValue() + $3.getValue()); }
| num MINUSSIGN num { $$ = Quantity($1.getValue() - $3.getValue()); }
| num '*' num { $$ = Quantity($1.getValue() * $3.getValue()); }
@@ -60,6 +62,7 @@
;
unit: UNIT { $$ = $1; }
| ONE '/' unit { $$ = Quantity(1.0)/$3; }
| unit '*' unit { $$ = $1 * $3; }
| unit '/' unit { $$ = $1 / $3; }
| unit '^' num { $$ = $1.pow ($3); }