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/global_context] Fix Pi evaluation

Browse Source
This commit is contained in:
Léa Saviot
2018-10-19 14:33:56 +02:00
committed by Émilie Feral
parent fe4bb02984
commit c2adbe28c5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/shared/global_context.cpp
View File

@@ -91,9 +91,6 @@ void GlobalContext::setExpressionForSymbol(const Expression & expression, const
}
const Expression GlobalContext::ExpressionForSymbolAndRecord(const SymbolAbstract & symbol, Ion::Storage::Record r) {
if (r.isNull()) {
return Expression();
}
if (symbol.type() == ExpressionNode::Type::Symbol) {
return ExpressionForActualSymbol(symbol, r);
}
@@ -103,9 +100,7 @@ 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()) {
@@ -114,6 +109,9 @@ const Expression GlobalContext::ExpressionForActualSymbol(const SymbolAbstract &
if (s.isExponential()) {
return Float<double>(M_E);
}
if (r.isNull() || !Ion::Storage::FullNameHasExtension(r.fullName(), expExtension, strlen(expExtension))) {
return Expression();
}
// Look up the file system for symbol
return ExpressionFromSymbolRecord(r);
}