UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Fix parsing of serialised layout [[2^2, 3]]

Browse Source
This commit is contained in:
Léa Saviot
2018-11-22 15:30:21 +01:00
committed by Émilie Feral
parent 8346ca606f
commit 6eaf5c70c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/src/parsing/parser.cpp
View File

@@ -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

6
poincare/src/parsing/token.h
View File

@@ -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,