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

[poincare] Design a temporary Makefile

Browse Source
This commit is contained in:
Émilie Feral
2018-08-08 15:47:36 +02:00
parent aaa20a58fa
commit d45f536821
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -31,9 +31,9 @@ include ion/Makefile
include kandinsky/Makefile
include poincare/Makefile
include python/Makefile
include escher/Makefile
#include escher/Makefile
# Executable Makefiles
include apps/Makefile
#include apps/Makefile
include build/struct_layout/Makefile
include quiz/Makefile # Quiz needs to be included at the end

9
poincare/Makefile
View File

@@ -5,10 +5,13 @@ SFLAGS += -Ipoincare/include
objs += $(addprefix poincare/src/,\
tree_node.o\
tree_pool.o\
tree_reference.o\
tree_by_reference.o\
tree_by_value.o\
undefined.o\
infinity.o\
)
objs += $(addprefix poincare/src/,\
objsExpected += $(addprefix poincare/src/,\
binomial_coefficient_layout_node.o\
bracket_layout_node.o\
bracket_pair_layout_node.o\
@@ -36,7 +39,7 @@ objs += $(addprefix poincare/src/,\
vertical_offset_layout_node.o\
)
objs += $(addprefix poincare/src/,\
objsExpected += $(addprefix poincare/src/,\
absolute_value.o\
addition.o\
approximation_helper.o\

7
poincare/include/poincare.h
View File

@@ -3,10 +3,10 @@
#define MATRICES_ARE_DEFINED 1
#if 0
#include <poincare/absolute_value.h>
#include <poincare/absolute_value_layout_node.h>
#include <poincare/addition.h>
#include <poincare/approximation.h>
#include <poincare/allocation_failed_layout_node.h>
#include <poincare/arc_cosine.h>
#include <poincare/arc_sine.h>
@@ -37,6 +37,7 @@
#include <poincare/expression_array.h>
#include <poincare/factor.h>
#include <poincare/factorial.h>
#include <poincare/float.h>
#include <poincare/floor.h>
#include <poincare/floor_layout_node.h>
#include <poincare/frac_part.h>
@@ -102,5 +103,9 @@
#include <poincare/undefined.h>
#include <poincare/variable_context.h>
#include <poincare/vertical_offset_layout_node.h>
#else
#include <poincare/print_float.h>
#endif
#endif

2
poincare/include/poincare/allocation_failure_expression_node.h
View File

@@ -25,7 +25,7 @@ public:
LayoutRef createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override { return AllocationFailedLayoutRef(); }
// TreeNode
size_t size() const override { return sizeof(AllocationFailureExpressionNode); }
size_t size() const override { return sizeof(AllocationFailureExpressionNode<T>); }
#if TREE_LOG
const char * description() const override { return "AllocationFailureExpression"; }
#endif

2
poincare/include/poincare/ghost_node.h
View File

@@ -18,7 +18,7 @@ public:
// Ghost
bool isGhost() const override { return true; }
// Allocation Failure
static TreeNode * FailedAllocationStaticNode();
static GhostNode * FailedAllocationStaticNode();
TreeNode * failedAllocationStaticNode() override { return FailedAllocationStaticNode(); }
};

2
poincare/src/ghost_node.cpp
View File

@@ -2,7 +2,7 @@
namespace Poincare {
TreeNode * GhostNode::FailedAllocationStaticNode() {
GhostNode * GhostNode::FailedAllocationStaticNode() {
static AllocationFailedGhostNode FailureNode;
TreePool::sharedPool()->registerStaticNodeIfRequired(&FailureNode);
return &FailureNode;