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

Merge "Poincare: Simplifier -> Simplify"

Browse Source
This commit is contained in:
Romain Goyet
2016-03-24 11:54:45 +01:00
committed by Gerrit
parent 7b40c0a948 7f0a3f94bb
commit 657c4d8299
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/Makefile
View File

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

6
poincare/src/expression.cpp
View File

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

8
poincare/src/simplify/simplifier_zero.h
View File

@@ -1,8 +0,0 @@
#ifndef POINCARE_SIMPLIFIER_ZERO_H
#define POINCARE_SIMPLIFIER_ZERO_H
#include "simplifier.h"
Expression * SimplifierZero(Expression * e);
#endif

4
poincare/src/simplify/simplifier.h → poincare/src/simplify/simplify.h
View File

@@ -1,5 +1,5 @@
#ifndef POINCARE_SIMPLIFIER_H
#define POINCARE_SIMPLIFIER_H
#ifndef POINCARE_SIMPLIFY_H
#define POINCARE_SIMPLIFY_H
#include <poincare/expression.h>

4
poincare/src/simplify/simplifier_zero.cpp → poincare/src/simplify/simplify_product_zero.cpp
View File

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

8
poincare/src/simplify/simplify_product_zero.h Normal file
View File

@@ -0,0 +1,8 @@
#ifndef POINCARE_SIMPLIFY_PRODUCT_ZERO_H
#define POINCARE_SIMPLIFY_PRODUCT_ZERO_H
#include "simplify.h"
Expression * SimplifyProductZero(Expression * e);
#endif