From f841d75cbb68089bc35b2e4639391bfa785c28f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 15 May 2017 13:50:50 +0200 Subject: [PATCH] [poincare] Implicit multiply Change-Id: Ib8e0c907e7d094cf1adad9c93dfe3a6b0162fb33 --- poincare/src/expression_parser.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/poincare/src/expression_parser.y b/poincare/src/expression_parser.y index 37b2c1e2a..54fdf1272 100644 --- a/poincare/src/expression_parser.y +++ b/poincare/src/expression_parser.y @@ -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); }