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] Return uninitialized exp if record type does not match exp type

Browse Source 
In global context. This fixes the computation of a->a(a) in calculation,
which crashed.
This commit is contained in:
Léa Saviot
2018-10-16 10:09:00 +02:00
committed by Émilie Feral
parent c5713ce8c9
commit 00dcffbc69
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/global_context.cpp
View File

@@ -49,7 +49,9 @@ Poincare::Expression GlobalContext::ExpressionFromFunctionRecord(Ion::Storage::R
if (record.isNull() || record.value().size == 0) {
return Expression();
}
assert(Ion::Storage::FullNameHasExtension(record.fullName(), funcExtension, strlen(funcExtension)));
if (!Ion::Storage::FullNameHasExtension(record.fullName(), funcExtension, strlen(funcExtension))) {
return Expression();
}
/* An function record value has metadata before the expression. To get the
* expression, use the funciton record handle. */
StorageCartesianFunction f = StorageCartesianFunction(record);
@@ -101,6 +103,9 @@ const Expression GlobalContext::ExpressionForSymbolAndRecord(const SymbolAbstrac
const Expression GlobalContext::ExpressionForActualSymbol(const SymbolAbstract & symbol, Ion::Storage::Record r) {
assert(symbol.type() == ExpressionNode::Type::Symbol);
if (!Ion::Storage::FullNameHasExtension(r.fullName(), expExtension, strlen(expExtension))) {
return Expression();
}
// Constant symbols
Symbol s = static_cast<const Symbol &>(symbol);
if (s.isPi()) {