From b27f98c2875555ba85c9c542dd8d23915c24be4f Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Thu, 4 Oct 2018 11:10:33 +0200
Subject: [PATCH] [poincare] Rename Power Token as Caret

---
 poincare/src/parsing/parser.cpp    | 6 ++----
 poincare/src/parsing/parser.h      | 2 +-
 poincare/src/parsing/token.h       | 2 +-
 poincare/src/parsing/tokenizer.cpp | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/poincare/src/parsing/parser.cpp b/poincare/src/parsing/parser.cpp
index 870495562..bc5ddec6e 100644
--- a/poincare/src/parsing/parser.cpp
+++ b/poincare/src/parsing/parser.cpp
@@ -21,7 +21,7 @@ Expression Parser::parseUntil(Token::Type stoppingType) {
     &Parser::parseMinus,
     &Parser::parseTimes,
     &Parser::parseSlash,
-    &Parser::parsePower,
+    &Parser::parseCaret,
     &Parser::parseSquareRoot,
     &Parser::parseBang,
     &Parser::parseMatrix, //LeftBracket,
@@ -96,18 +96,16 @@ Expression Parser::parseMinus(const Expression & leftHandSide) {
   }
 }
 
-Expression Parser::parsePower(const Expression & leftHandSide) {
+Expression Parser::parseCaret(const Expression & leftHandSide) {
   return parseBinaryOperator<Power>(leftHandSide, Token::Type::Slash); // Power is right-associative
 }
 
 Expression Parser::parseLeftParenthesis(const Expression & leftHandSide) {
   assert(leftHandSide.isUninitialized());
   Expression rightHandSide = parseUntil(Token::Type::RightParenthesis);
-
   if (!expect(Token::Type::RightParenthesis)) {
     return Expression();
   }
-
   return Parenthesis(rightHandSide);
 }
 
diff --git a/poincare/src/parsing/parser.h b/poincare/src/parsing/parser.h
index 77dc43e3a..160d756bf 100644
--- a/poincare/src/parsing/parser.h
+++ b/poincare/src/parsing/parser.h
@@ -58,7 +58,7 @@ private:
   Expression parseTimes(const Expression & leftHandSide);
   Expression parseSlash(const Expression & leftHandSide);
   Expression parseMinus(const Expression & leftHandSide);
-  Expression parsePower(const Expression & leftHandSide);
+  Expression parseCaret(const Expression & leftHandSide);
   Expression parseLeftParenthesis(const Expression & leftHandSide);
   Expression parseSquareRoot(const Expression & leftHandSide);
   Expression parseBang(const Expression & leftHandSide);
diff --git a/poincare/src/parsing/token.h b/poincare/src/parsing/token.h
index 2d4fd9061..f87741d60 100644
--- a/poincare/src/parsing/token.h
+++ b/poincare/src/parsing/token.h
@@ -20,7 +20,7 @@ public:
     Minus,
     Times,
     Slash,
-    Power,
+    Caret,
     SquareRoot,
     Bang,
     LeftBracket,
diff --git a/poincare/src/parsing/tokenizer.cpp b/poincare/src/parsing/tokenizer.cpp
index e10c6fabf..eeaca31c8 100644
--- a/poincare/src/parsing/tokenizer.cpp
+++ b/poincare/src/parsing/tokenizer.cpp
@@ -104,7 +104,7 @@ Token Tokenizer::popToken() {
     return Token(Token::Type::RightBracket);
   }
   if (canPopChar('^')) {
-    return Token(Token::Type::Power);
+    return Token(Token::Type::Caret);
   }
   if (canPopChar('{')) {
     return Token(Token::Type::LeftBrace);