UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/*/expression_model] Make expressionAddress private

Browse Source
This commit is contained in:
Ruben Dashyan
2019-09-17 13:52:16 +02:00
committed by Léa Saviot
parent 78eea601c7
commit 9480bcacd5
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sequence/sequence.h
View File

@@ -121,18 +121,16 @@ private:
};
class DefinitionModel : public SequenceModel {
public:
void * expressionAddress(const Ion::Storage::Record * record) const override;
private:
void * expressionAddress(const Ion::Storage::Record * record) const override;
size_t expressionSize(const Ion::Storage::Record * record) const override;
void buildName(Sequence * sequence) override;
};
class InitialConditionModel : public SequenceModel {
public:
void * expressionAddress(const Ion::Storage::Record * record) const override;
private:
void updateMetaData(const Ion::Storage::Record * record, size_t newSize) override;
void * expressionAddress(const Ion::Storage::Record * record) const override;
size_t expressionSize(const Ion::Storage::Record * record) const override;
void buildName(Sequence * sequence) override;
virtual int conditionIndex() const = 0;

3
apps/shared/continuous_function.h
View File

@@ -106,9 +106,8 @@ private:
//char m_expression[0];
};
class Model : public ExpressionModel {
public:
void * expressionAddress(const Ion::Storage::Record * record) const override;
private:
void * expressionAddress(const Ion::Storage::Record * record) const override;
size_t expressionSize(const Ion::Storage::Record * record) const override;
};
size_t metaDataSize() const override { return sizeof(RecordDataBuffer); }

2
apps/shared/expression_model.h
View File

@@ -23,7 +23,6 @@ public:
// Property
bool isCircularlyDefined(const Ion::Storage::Record * record, Poincare::Context * context) const;
virtual void * expressionAddress(const Ion::Storage::Record * record) const = 0;
virtual void tidy() const;
protected:
@@ -33,6 +32,7 @@ protected:
mutable Poincare::Layout m_layout;
private:
virtual void updateNewDataWithExpression(Ion::Storage::Record * record, const Poincare::Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize);
virtual void * expressionAddress(const Ion::Storage::Record * record) const = 0;
virtual size_t expressionSize(const Ion::Storage::Record * record) const = 0;
mutable int m_circular;
};

2
apps/solver/equation.h
View File

@@ -19,8 +19,8 @@ private:
public:
Poincare::Expression standardForm(const Ion::Storage::Record * record, Poincare::Context * context) const;
void tidy() const override;
void * expressionAddress(const Ion::Storage::Record * record) const override;
private:
void * expressionAddress(const Ion::Storage::Record * record) const override;
size_t expressionSize(const Ion::Storage::Record * record) const override;
mutable Poincare::Expression m_standardForm;
};