h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 06:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

[muparser] Continue adopting ValueOrError

Browse Source
This commit is contained in:
ridiculousfish
2017-11-22 12:27:10 -08:00
parent bfd70880a5
commit 9649b132bd
8 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
muparser-2.2.5/samples/example1/example1.cpp
View File

@@ -416,7 +416,7 @@ void Calc() {
// 1.) If you know there is only a single return value or in case you only need the last
// result of an expression consisting of comma separated subexpressions you can
// simply use:
mu::console() << _T("ans=") << parser.Eval() << _T("\n");
mu::console() << _T("ans=") << *parser.Eval() << _T("\n");
// 2.) As an alternative you can also retrieve multiple return values using this API:
int nNum = parser.GetNumResults();
@@ -425,10 +425,11 @@ void Calc() {
// this is the hard way if you need to retrieve multiple subexpression
// results
value_type *v = parser.Eval(nNum);
std::vector<ValueOrError> vs;
parser.Eval(&vs);
mu::console() << std::setprecision(12);
for (int i = 0; i < nNum; ++i) {
mu::console() << v[i] << _T("\n");
for (const ValueOrError &v : vs) {
mu::console() << *v << _T("\n");
}
}
} catch (mu::Parser::exception_type &e) {
@@ -446,8 +447,8 @@ void Calc() {
//---------------------------------------------------------------------------
int main(int, char **) {
Splash();
SelfTest();
Help();
(void)SelfTest();
(void)Help();
// CheckLocale();
// CheckDiff();