From 91542cedaabbfc2f569cc5d2cd27302ec8f89a64 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 4 Oct 2017 11:50:17 +0100 Subject: [PATCH] [poincare] Rename class ReelPart and its constructor Reel => Real --- poincare/include/poincare/real_part.h | 4 ++-- poincare/src/expression_lexer.l | 2 +- poincare/src/real_part.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poincare/include/poincare/real_part.h b/poincare/include/poincare/real_part.h index 036aaaeb3..4634fb655 100644 --- a/poincare/include/poincare/real_part.h +++ b/poincare/include/poincare/real_part.h @@ -5,9 +5,9 @@ namespace Poincare { -class ReelPart : public Function { +class RealPart : public Function { public: - ReelPart(); + RealPart(); Type type() const override; Expression * cloneWithDifferentOperands(Expression ** newOperands, int numberOfOperands, bool cloneOperands = true) const override; diff --git a/poincare/src/expression_lexer.l b/poincare/src/expression_lexer.l index 302c9fd44..2f3ce2e51 100644 --- a/poincare/src/expression_lexer.l +++ b/poincare/src/expression_lexer.l @@ -124,7 +124,7 @@ prediction95 { poincare_expression_yylval.expression = new PredictionInterval(); prediction { poincare_expression_yylval.expression = new ConfidenceInterval(); return FUNCTION; } product { poincare_expression_yylval.expression = new Product(); return FUNCTION; } quo { poincare_expression_yylval.expression = new DivisionQuotient(); return FUNCTION; } -re { poincare_expression_yylval.expression = new ReelPart(); return FUNCTION; } +re { poincare_expression_yylval.expression = new RealPart(); return FUNCTION; } rem { poincare_expression_yylval.expression = new DivisionRemainder(); return FUNCTION; } root { poincare_expression_yylval.expression = new NthRoot(); return FUNCTION; } round { poincare_expression_yylval.expression = new Round(); return FUNCTION; } diff --git a/poincare/src/real_part.cpp b/poincare/src/real_part.cpp index 5a5798cc5..21abd9402 100644 --- a/poincare/src/real_part.cpp +++ b/poincare/src/real_part.cpp @@ -8,25 +8,25 @@ extern "C" { namespace Poincare { -ReelPart::ReelPart() : +RealPart::RealPart() : Function("re") { } -Expression::Type ReelPart::type() const { +Expression::Type RealPart::type() const { return Type::ReelPart; } -Expression * ReelPart::cloneWithDifferentOperands(Expression** newOperands, +Expression * RealPart::cloneWithDifferentOperands(Expression** newOperands, int numberOfOperands, bool cloneOperands) const { assert(newOperands != nullptr); - ReelPart * rp = new ReelPart(); + RealPart * rp = new RealPart(); rp->setArgument(newOperands, numberOfOperands, cloneOperands); return rp; } template -Complex ReelPart::templatedComputeComplex(const Complex c) const { +Complex RealPart::templatedComputeComplex(const Complex c) const { return Complex::Float(c.a()); }