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

[Poincare/parser] support ' as derivative

Browse Source
This commit is contained in:
Joachim LF
2021-02-12 08:36:57 +01:00
parent 859976423f
commit 491c873c90
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,8 @@ Expression Parser::parseUntil(Token::Type stoppingType) {
&Parser::parseTimes, // Token::Times
&Parser::parseSlash, // Token::Slash
&Parser::parseImplicitTimes, // Token::ImplicitTimes
&Parser::parseCaret, // Token::Power
&Parser::parseCaret, // Token::Power,
&Parser::parseSingleQuote, // Token::SingleQuote
&Parser::parseBang, // Token::Bang
&Parser::parseCaretWithParenthesis, // Token::CaretWithParenthesis
&Parser::parseMatrix, // Token::LeftBracket
@@ -330,6 +331,15 @@ void Parser::parseLeftSystemParenthesis(Expression & leftHandSide, Token::Type s
defaultParseLeftParenthesis(true, leftHandSide, stoppingType);
}
void Parser::parseSingleQuote(Expression & leftHandSide, Token::Type stoppingType) {
if (leftHandSide.isUninitialized()) {
m_status = Status::Error; // Left-hand side missing
} else {
leftHandSide = Derivative::Builder(leftHandSide, Symbol::Builder('x'), Symbol::Builder('x'));
}
isThereImplicitMultiplication();
}
void Parser::parseBang(Expression & leftHandSide, Token::Type stoppingType) {
if (leftHandSide.isUninitialized()) {
m_status = Status::Error; // Left-hand side missing

1
poincare/src/parsing/parser.h
View File

@@ -56,6 +56,7 @@ private:
void parseMatrix(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parseLeftParenthesis(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parseLeftSystemParenthesis(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parseSingleQuote(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parseBang(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parsePlus(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);
void parseMinus(Expression & leftHandSide, Token::Type stoppingType = (Token::Type)0);

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

@@ -39,6 +39,7 @@ public:
* the ImplicitTimes Token Type is defined here with the desired precedence,
* in order to allow the Parser to insert such Tokens where needed. */
Caret,
SingleQuote,
Bang,
CaretWithParenthesis,
LeftBracket,

3
poincare/src/parsing/tokenizer.cpp
View File

@@ -206,6 +206,9 @@ Token Tokenizer::popToken() {
}
return Token(Token::Caret);
}
if (c == '\'') {
return Token(Token::SingleQuote);
}
if (c == '!') {
return Token(Token::Bang);
}