UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 09:10:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Implicit multiply

Browse Source 
Change-Id: Ib8e0c907e7d094cf1adad9c93dfe3a6b0162fb33
This commit is contained in:
Émilie Feral
2017-05-15 13:50:50 +02:00
parent f147788c99
commit f841d75cbb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/src/expression_parser.y
View File

@@ -88,6 +88,7 @@ void poincare_expression_yyerror(Poincare::Expression ** expressionOutput, char
%left STO
%left PLUS
%left MINUS
%left IMPLICIT_MULTIPLY
%left MULTIPLY
%left DIVIDE
%left POW
@@ -155,6 +156,7 @@ exp:
| exp PLUS exp { Poincare::Expression * terms[2] = {$1,$3}; $$ = new Poincare::Addition(terms, false); }
| exp MINUS exp { Poincare::Expression * terms[2] = {$1,$3}; $$ = new Poincare::Subtraction(terms, false); }
| exp MULTIPLY exp { Poincare::Expression * terms[2] = {$1,$3}; $$ = new Poincare::Multiplication(terms, false); }
| exp exp %prec IMPLICIT_MULTIPLY { Poincare::Expression * terms[2] = {$1,$2}; $$ = new Poincare::Multiplication(terms, false); }
| exp DIVIDE exp { Poincare::Expression * terms[2] = {$1,$3}; $$ = new Poincare::Fraction(terms, false); }
| exp POW exp { Poincare::Expression * terms[2] = {$1,$3}; $$ = new Poincare::Power(terms, false); }
| MINUS exp { $$ = new Poincare::Opposite($2, false); }