GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-09 18:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Portability: Updated to make main re-entrant()

Browse source 
- New INSTALL instructions to emscripten, and AUTHORS for contribution.
This commit is contained in:
Mark Scannell 2018-01-31 19:45:07 -05:00 • committed by Paul Beckingham
parent cae3f06b7d
commit 7af6db4c17
112 changed files with 960 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/commands/CmdCalc.cpp
View file

@ -29,8 +29,6 @@
#include <Filter.h>
#include <Eval.h>
extern Context context;
////////////////////////////////////////////////////////////////////////////////
CmdCalc::CmdCalc ()
{
@ -52,17 +50,17 @@ int CmdCalc::execute (std::string& output)
{
// Configurable infix/postfix
bool infix {true};
if (context.config.get ("expressions") == "postfix")
if (Context::getContext ().config.get ("expressions") == "postfix")
infix = false;
// Create an evaluator with DOM access.
Eval e;
e.addSource (domSource);
e.debug (context.config.getBoolean ("debug"));
e.debug (Context::getContext ().config.getBoolean ("debug"));
// Compile all the args into one expression.
std::string expression;
for (const auto& word : context.cli2.getWords ())
for (const auto& word : Context::getContext ().cli2.getWords ())
expression += word + ' ';
// Evaluate according to preference.