Skip to content

Commit

Permalink
minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@grzegorzmazur
grzegorzmazur committed Oct 24, 2015
1 parent bb53bfe commit dd48839
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 27 deletions.
6 changes: 3 additions & 3 deletions src/commandline.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ bool CConsoleHistory::ArrowUp(std::string& s, unsigned c)

const std::string prefix(s.begin(), i);

std::vector<std::string>::reverse_iterator p = iHistory.rbegin();
auto p = iHistory.rbegin();
std::advance(p, iHistory.size() - history);

const std::vector<std::string>::reverse_iterator q =
Expand All @@ -278,7 +278,7 @@ bool CConsoleHistory::ArrowDown(std::string& s, unsigned c)

const std::string prefix(s.begin(), i);

std::vector<std::string>::iterator p = iHistory.begin();
auto p = iHistory.begin();
std::advance(p, history + 1);

const std::vector<std::string>::iterator q =
Expand Down Expand Up @@ -322,7 +322,7 @@ bool CConsoleHistory::Complete(std::string& s, unsigned& c)
utf8::advance(i, c, s.end());
const std::string prefix(s.begin(), i);

std::vector<std::string>::reverse_iterator p = iHistory.rbegin();
auto p = iHistory.rbegin();
std::advance(p, iHistory.size() - history);

const std::vector<std::string>::reverse_iterator q =
Expand Down
2 changes: 1 addition & 1 deletion src/infixparser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ LispInFixOperator* LispOperators::LookUp(const LispString* aString)
const auto i = _map.find(aString);
if (i != _map.end())
return &i->second;
return 0;
return nullptr;
}

void ParsedObject::ReadToken()
Expand Down
20 changes: 10 additions & 10 deletions src/lispenvironment.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ void LispEnvironment::SetVariable(const LispString* aVariable, LispPtr& aValue,
if (Protected(aVariable))
throw LispErrProtectedSymbol(*aVariable);

LispGlobal::iterator i = iGlobals.find(aVariable);
auto i = iGlobals.find(aVariable);
if (i != iGlobals.end())
i->second = LispGlobalVariable(aValue);
else
Expand All @@ -207,7 +207,7 @@ void LispEnvironment::GetVariable(const LispString* aVariable, LispPtr& aResult)
return;
}

LispGlobal::iterator i = iGlobals.find(aVariable);
auto i = iGlobals.find(aVariable);

if (i != iGlobals.end()) {
LispGlobalVariable* l = &i->second;
Expand Down Expand Up @@ -331,7 +331,7 @@ void LispEnvironment::SetCurrentOutput(std::ostream& aOutput)

LispUserFunction* LispEnvironment::UserFunction(LispPtr& aArguments)
{
LispUserFunctions::iterator i = iUserFunctions.find(aArguments->String());
auto i = iUserFunctions.find(aArguments->String());
if (i != iUserFunctions.end()) {
LispMultiUserFunction* multiUserFunc = &i->second;
LispInt arity = InternalListLength(aArguments)-1;
Expand All @@ -343,7 +343,7 @@ LispUserFunction* LispEnvironment::UserFunction(LispPtr& aArguments)

LispUserFunction* LispEnvironment::UserFunction(const LispString* aName, LispInt aArity)
{
LispUserFunctions::iterator i = iUserFunctions.find(aName);
auto i = iUserFunctions.find(aName);
if (i != iUserFunctions.end())
return i->second.UserFunc(aArity);

Expand All @@ -357,7 +357,7 @@ void LispEnvironment::UnFenceRule(const LispString* aOperator, LispInt aArity)
if (Protected(aOperator))
throw LispErrProtectedSymbol(*aOperator);

LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i == iUserFunctions.end())
throw LispErrInvalidArg();
Expand All @@ -377,7 +377,7 @@ void LispEnvironment::Retract(const LispString* aOperator, LispInt aArity)
if (Protected(aOperator))
throw LispErrProtectedSymbol(*aOperator);

LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i != iUserFunctions.end())
i->second.DeleteBase(aArity);
Expand Down Expand Up @@ -439,7 +439,7 @@ void LispEnvironment::DeclareMacroRuleBase(const LispString* aOperator, LispPtr&

LispMultiUserFunction* LispEnvironment::MultiUserFunction(const LispString* aOperator)
{
LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i != iUserFunctions.end())
return &i->second;
Expand All @@ -452,7 +452,7 @@ LispMultiUserFunction* LispEnvironment::MultiUserFunction(const LispString* aOpe

void LispEnvironment::HoldArgument(const LispString* aOperator, const LispString* aVariable)
{
LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i == iUserFunctions.end())
throw LispErrInvalidArg();
Expand Down Expand Up @@ -485,7 +485,7 @@ void LispEnvironment::DefineRule(const LispString* aOperator,LispInt aArity,
throw LispErrProtectedSymbol(*aOperator);

// Find existing multiuser func.
LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i == iUserFunctions.end())
throw LispErrCreatingRule();
Expand Down Expand Up @@ -518,7 +518,7 @@ void LispEnvironment::DefineRulePattern(const LispString* aOperator,LispInt aAri
// throw LispErrProtectedSymbol(*aOperator);

// Find existing multiuser func.
LispUserFunctions::iterator i = iUserFunctions.find(aOperator);
auto i = iUserFunctions.find(aOperator);

if (i == iUserFunctions.end())
throw LispErrCreatingRule();
Expand Down
4 changes: 1 addition & 3 deletions src/lisphash.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ const LispString* LispHashTable::LookUp(const std::string& s)

void LispHashTable::GarbageCollect()
{
typedef std::unordered_map<std::string, LispStringSmartPtr>::iterator iterator;

for (iterator i = _rep.begin(); i != _rep.end(); ++i)
for (auto i = _rep.begin(); i != _rep.end(); ++i)
while (i != _rep.end() && i->second->iReferenceCount == 1)
i = _rep.erase(i);
}
20 changes: 10 additions & 10 deletions src/yacasmain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@

#include "yacas/GPL_stuff.h"

CYacas* yacas = 0;
CCommandLine *commandline = 0;
CYacas* yacas = nullptr;
CCommandLine *commandline = nullptr;

bool use_stdin = false;
bool use_plain = false;
Expand Down Expand Up @@ -144,7 +144,7 @@ bool server_mode = false;
bool server_single_user = false;
int server_port = 9734;

const char* execute_commnd = 0;
const char* execute_commnd = nullptr;

static bool busy = true;
static bool restart = false;
Expand Down Expand Up @@ -313,12 +313,12 @@ void my_exit()
// at least we have a saved history
if (commandline) {
delete commandline;
commandline = 0;
commandline = nullptr;
}

if (yacas) {
delete yacas;
yacas = 0;
yacas = nullptr;
}

ReportNrCurrent();
Expand Down Expand Up @@ -349,7 +349,7 @@ void ShowResult(const std::string& prompt)
if (yacas->IsError())
std::cout << yacas->Error() << "\n";
else
if (yacas->getDefEnv().getEnv().PrettyPrinter() == 0)
if (yacas->getDefEnv().getEnv().PrettyPrinter() == nullptr)
std::cout << prompt << yacas->Result() << "\n";

if (use_texmacs_out)
Expand Down Expand Up @@ -418,7 +418,7 @@ void LoadYacas(std::ostream& os)
if (yacas->IsError())
{
ShowResult("");
read_eval_print = 0;
read_eval_print = nullptr;
}
}

Expand Down Expand Up @@ -892,7 +892,7 @@ int parse_options(int argc, char** argv)
if (!std::strcmp(argv[fileind],"--texmacs")) {
use_texmacs_out = true;
use_plain = true;
read_eval_print = 0;
read_eval_print = nullptr;
} else if (!std::strcmp(argv[fileind],"--patchload")) {
patchload = true;
} else if (!std::strcmp(argv[fileind],"--verbose-debug")) {
Expand All @@ -912,7 +912,7 @@ int parse_options(int argc, char** argv)
if (argv[fileind][0])
read_eval_print = argv[fileind];
else
read_eval_print = 0;
read_eval_print = nullptr;
}
} else if (!std::strcmp(argv[fileind],"--rootdir")) {
fileind++;
Expand Down Expand Up @@ -1167,7 +1167,7 @@ int main(int argc, char** argv)

if (restart) {
delete yacas;
yacas = 0;
yacas = nullptr;
LoadYacas(std::cout);
}

Expand Down

0 comments on commit dd48839

Please sign in to comment.