From 7f0a3f94bbc75a67d0ffe280902b445f6184329d Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Thu, 24 Mar 2016 10:39:00 +0100
Subject: [PATCH] Poincare: Simplifier -> Simplify

Change-Id: I1dfdf9e9d99ffd0ce604547b54c88263e621b97b
---
 poincare/Makefile                                         | 2 +-
 poincare/src/expression.cpp                               | 6 +++---
 poincare/src/simplify/simplifier_zero.h                   | 8 --------
 poincare/src/simplify/{simplifier.h => simplify.h}        | 4 ++--
 .../{simplifier_zero.cpp => simplify_product_zero.cpp}    | 4 ++--
 poincare/src/simplify/simplify_product_zero.h             | 8 ++++++++
 6 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 poincare/src/simplify/simplifier_zero.h
 rename poincare/src/simplify/{simplifier.h => simplify.h} (63%)
 rename poincare/src/simplify/{simplifier_zero.cpp => simplify_product_zero.cpp} (84%)
 create mode 100644 poincare/src/simplify/simplify_product_zero.h

diff --git a/poincare/Makefile b/poincare/Makefile
index 6233ea1c3..2c76c3b86 100644
--- a/poincare/Makefile
+++ b/poincare/Makefile
@@ -21,7 +21,7 @@ objs += $(addprefix poincare/src/layout/,\
   string_layout.o\
 )
 objs += $(addprefix poincare/src/simplify/,\
-  simplifier_zero.o\
+  simplify_product_zero.o\
 )
 tests += $(addprefix poincare/test/,\
   addition.cpp\
diff --git a/poincare/src/expression.cpp b/poincare/src/expression.cpp
index c6733f9b6..05a25d311 100644
--- a/poincare/src/expression.cpp
+++ b/poincare/src/expression.cpp
@@ -1,11 +1,11 @@
 #include <poincare/expression.h>
 #include "expression_parser.hpp"
 #include "expression_lexer.hpp"
-#include "simplify/simplifier.h"
-#include "simplify/simplifier_zero.h"
+#include "simplify/simplify.h"
+#include "simplify/simplify_product_zero.h"
 
 static expression_simplifier_t kSimplifiers[] = {
-  &SimplifierZero,
+  &SimplifyProductZero,
   nullptr
 };
 
diff --git a/poincare/src/simplify/simplifier_zero.h b/poincare/src/simplify/simplifier_zero.h
deleted file mode 100644
index 6ffd71bd7..000000000
--- a/poincare/src/simplify/simplifier_zero.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef POINCARE_SIMPLIFIER_ZERO_H
-#define POINCARE_SIMPLIFIER_ZERO_H
-
-#include "simplifier.h"
-
-Expression * SimplifierZero(Expression * e);
-
-#endif
diff --git a/poincare/src/simplify/simplifier.h b/poincare/src/simplify/simplify.h
similarity index 63%
rename from poincare/src/simplify/simplifier.h
rename to poincare/src/simplify/simplify.h
index 2216f0f2c..a4c21653e 100644
--- a/poincare/src/simplify/simplifier.h
+++ b/poincare/src/simplify/simplify.h
@@ -1,5 +1,5 @@
-#ifndef POINCARE_SIMPLIFIER_H
-#define POINCARE_SIMPLIFIER_H
+#ifndef POINCARE_SIMPLIFY_H
+#define POINCARE_SIMPLIFY_H
 
 #include <poincare/expression.h>
 
diff --git a/poincare/src/simplify/simplifier_zero.cpp b/poincare/src/simplify/simplify_product_zero.cpp
similarity index 84%
rename from poincare/src/simplify/simplifier_zero.cpp
rename to poincare/src/simplify/simplify_product_zero.cpp
index e5c5e290e..38e253237 100644
--- a/poincare/src/simplify/simplifier_zero.cpp
+++ b/poincare/src/simplify/simplify_product_zero.cpp
@@ -1,8 +1,8 @@
-#include "simplifier_zero.h"
+#include "simplify_product_zero.h"
 #include <poincare/product.h>
 #include <poincare/integer.h>
 
-Expression * SimplifierZero(Expression * e) {
+Expression * SimplifyProductZero(Expression * e) {
   if (e->type() != Expression::Type::Product) {
     return nullptr;
   }
diff --git a/poincare/src/simplify/simplify_product_zero.h b/poincare/src/simplify/simplify_product_zero.h
new file mode 100644
index 000000000..bf99b71a5
--- /dev/null
+++ b/poincare/src/simplify/simplify_product_zero.h
@@ -0,0 +1,8 @@
+#ifndef POINCARE_SIMPLIFY_PRODUCT_ZERO_H
+#define POINCARE_SIMPLIFY_PRODUCT_ZERO_H
+
+#include "simplify.h"
+
+Expression * SimplifyProductZero(Expression * e);
+
+#endif