From 6eaf5c70c4d9e2dbeb5bb7d07f5dc32ad311becb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 22 Nov 2018 15:30:21 +0100 Subject: [PATCH] [poincare] Fix parsing of serialised layout [[2^2, 3]] --- poincare/src/parsing/parser.cpp | 2 +- poincare/src/parsing/token.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poincare/src/parsing/parser.cpp b/poincare/src/parsing/parser.cpp index 1803de31e..31e174bfe 100644 --- a/poincare/src/parsing/parser.cpp +++ b/poincare/src/parsing/parser.cpp @@ -54,11 +54,11 @@ Expression Parser::parseUntil(Token::Type stoppingType) { &Parser::parseUnexpected, // Token::EndOfStream &Parser::parseStore, // Token::Store &Parser::parseEqual, // Token::Equal - &Parser::parseSuperscript, // Token::Superscript &Parser::parseUnexpected, // Token::RightBracket &Parser::parseUnexpected, // Token::RightParenthesis &Parser::parseUnexpected, // Token::RightBrace &Parser::parseUnexpected, // Token::Comma + &Parser::parseSuperscript, // Token::Superscript &Parser::parsePlus, // Token::Plus &Parser::parseMinus, // Token::Minus &Parser::parseTimes, // Token::Times diff --git a/poincare/src/parsing/token.h b/poincare/src/parsing/token.h index 1887dbf07..8ee64fbc6 100644 --- a/poincare/src/parsing/token.h +++ b/poincare/src/parsing/token.h @@ -24,13 +24,13 @@ public: * token of lesser precedence than Equal, and this prevents expressions * such as "3=4>a". Tokenizer::parseStore uses a special algorithm that * prevents (3>4=a). */ - Superscript, - /* Superscript marks the limit of a power. For instance: - * 2 Superscript 3! Superscript ! is (2^(3!))! */ RightBracket, RightParenthesis, RightBrace, Comma, + Superscript, + /* Superscript marks the limit of a power. For instance: + * 2 Superscript 3! Superscript ! is (2^(3!))! */ Plus, Minus, Times,