Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.
This commit is contained in:
1 parent
a1be4cc70f
commit
57e8158efd
202 files changed
+4595
-4284
No files matched your search
+24
-24
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
@@ -26,15 +26,15 @@ using namespace std;
|
||||
using namespace mup;
|
||||
|
||||
RegexSearchFunction::RegexSearchFunction()
|
||||
:ICallback(cmFUNC, L"regexSearch", 2)
|
||||
: ICallback(cmFUNC, L"regexSearch", 2)
|
||||
{
|
||||
}
|
||||
|
||||
void RegexSearchFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int argc)
|
||||
void RegexSearchFunction::Eval(ptr_val_type& ret, const ptr_val_type* arg, int argc)
|
||||
{
|
||||
if(!arg[0]->IsString())
|
||||
if (!arg[0]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[0]->GetType(), 's', 1));
|
||||
if(!arg[1]->IsString())
|
||||
if (!arg[1]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[1]->GetType(), 's', 2));
|
||||
|
||||
wstring regexString = arg[0]->GetString();
|
||||
@@ -45,9 +45,9 @@ void RegexSearchFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int a
|
||||
bool found = regex_search(string, match, regex);
|
||||
|
||||
vector<Value> result;
|
||||
if(found)
|
||||
if (found)
|
||||
{
|
||||
for(unsigned i=0; i<match.size(); i++)
|
||||
for (unsigned i = 0; i < match.size(); i++)
|
||||
result.push_back(match.str(i));
|
||||
}
|
||||
|
||||
@@ -65,17 +65,17 @@ IToken* RegexSearchFunction::Clone() const
|
||||
}
|
||||
|
||||
RegexReplaceFunction::RegexReplaceFunction()
|
||||
:ICallback(cmFUNC, L"regexReplace", 3)
|
||||
: ICallback(cmFUNC, L"regexReplace", 3)
|
||||
{
|
||||
}
|
||||
|
||||
void RegexReplaceFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int argc)
|
||||
void RegexReplaceFunction::Eval(ptr_val_type& ret, const ptr_val_type* arg, int argc)
|
||||
{
|
||||
if(!arg[0]->IsString())
|
||||
if (!arg[0]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[0]->GetType(), 's', 1));
|
||||
if(!arg[1]->IsString())
|
||||
if (!arg[1]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[1]->GetType(), 's', 2));
|
||||
if(!arg[2]->IsString())
|
||||
if (!arg[2]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[2]->GetType(), 's', 3));
|
||||
|
||||
wstring regexString = arg[0]->GetString();
|
||||
|
||||
+17
-17
@@ -1,40 +1,40 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <mpParser.h>
|
||||
|
||||
class RegexSearchFunction:public mup::ICallback
|
||||
class RegexSearchFunction : public mup::ICallback
|
||||
{
|
||||
public:
|
||||
RegexSearchFunction();
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type *arg, int argc) override;
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* arg, int argc) override;
|
||||
const mup::char_type* GetDesc() const;
|
||||
mup::IToken* Clone() const override;
|
||||
};
|
||||
|
||||
class RegexReplaceFunction:public mup::ICallback
|
||||
class RegexReplaceFunction : public mup::ICallback
|
||||
{
|
||||
public:
|
||||
RegexReplaceFunction();
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type *arg, int argc) override;
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* arg, int argc) override;
|
||||
const mup::char_type* GetDesc() const;
|
||||
mup::IToken* Clone() const override;
|
||||
};
|
||||
@@ -26,16 +26,16 @@ using namespace std;
|
||||
using namespace mup;
|
||||
|
||||
ReadRegStringFunction::ReadRegStringFunction(FilterEngine* engine)
|
||||
:ICallback(cmFUNC, L"readRegString", 2)
|
||||
: ICallback(cmFUNC, L"readRegString", 2)
|
||||
{
|
||||
this->engine = engine;
|
||||
}
|
||||
|
||||
void ReadRegStringFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int argc)
|
||||
void ReadRegStringFunction::Eval(ptr_val_type& ret, const ptr_val_type* arg, int argc)
|
||||
{
|
||||
if(!arg[0]->IsString())
|
||||
if (!arg[0]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[0]->GetType(), 's', 1));
|
||||
if(!arg[1]->IsString())
|
||||
if (!arg[1]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[1]->GetType(), 's', 2));
|
||||
|
||||
wstring key = arg[0]->GetString();
|
||||
@@ -49,7 +49,7 @@ void ReadRegStringFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int
|
||||
|
||||
engine->watchRegistryKey(key);
|
||||
}
|
||||
catch(RegistryException e)
|
||||
catch (RegistryException e)
|
||||
{
|
||||
throw ParserError(e.getMessage());
|
||||
}
|
||||
@@ -66,16 +66,16 @@ IToken* ReadRegStringFunction::Clone() const
|
||||
}
|
||||
|
||||
ReadRegDWORDFunction::ReadRegDWORDFunction(FilterEngine* engine)
|
||||
:ICallback(cmFUNC, L"readRegDWORD", 2)
|
||||
: ICallback(cmFUNC, L"readRegDWORD", 2)
|
||||
{
|
||||
this->engine = engine;
|
||||
}
|
||||
|
||||
void ReadRegDWORDFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int argc)
|
||||
void ReadRegDWORDFunction::Eval(ptr_val_type& ret, const ptr_val_type* arg, int argc)
|
||||
{
|
||||
if(!arg[0]->IsString())
|
||||
if (!arg[0]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[0]->GetType(), 's', 1));
|
||||
if(!arg[1]->IsString())
|
||||
if (!arg[1]->IsString())
|
||||
throw ParserError(ErrorContext(ecTYPE_CONFLICT_FUN, -1, GetIdent(), arg[1]->GetType(), 's', 2));
|
||||
|
||||
wstring key = arg[0]->GetString();
|
||||
@@ -89,7 +89,7 @@ void ReadRegDWORDFunction::Eval(ptr_val_type& ret, const ptr_val_type *arg, int
|
||||
|
||||
engine->watchRegistryKey(key);
|
||||
}
|
||||
catch(RegistryException e)
|
||||
catch (RegistryException e)
|
||||
{
|
||||
throw ParserError(e.getMessage());
|
||||
}
|
||||
|
||||
+17
-17
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
class FilterEngine;
|
||||
|
||||
class ReadRegStringFunction:public mup::ICallback
|
||||
class ReadRegStringFunction : public mup::ICallback
|
||||
{
|
||||
public:
|
||||
ReadRegStringFunction(FilterEngine* engine);
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type *arg, int argc) override;
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* arg, int argc) override;
|
||||
const mup::char_type* GetDesc() const;
|
||||
mup::IToken* Clone() const override;
|
||||
|
||||
@@ -35,11 +35,11 @@ private:
|
||||
FilterEngine* engine;
|
||||
};
|
||||
|
||||
class ReadRegDWORDFunction:public mup::ICallback
|
||||
class ReadRegDWORDFunction : public mup::ICallback
|
||||
{
|
||||
public:
|
||||
ReadRegDWORDFunction(FilterEngine* engine);
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type *arg, int argc) override;
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* arg, int argc) override;
|
||||
const mup::char_type* GetDesc() const;
|
||||
mup::IToken* Clone() const override;
|
||||
|
||||
|
||||
+17
-17
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
@@ -23,22 +23,22 @@
|
||||
using namespace std;
|
||||
using namespace mup;
|
||||
|
||||
void AddOperator::Eval(ptr_val_type& ret, const ptr_val_type *arg, int argc)
|
||||
void AddOperator::Eval(ptr_val_type& ret, const ptr_val_type* arg, int argc)
|
||||
{
|
||||
if(!arg[0]->IsString() && !arg[1]->IsString())
|
||||
if (!arg[0]->IsString() && !arg[1]->IsString())
|
||||
{
|
||||
OprtAdd::Eval(ret, arg, argc);
|
||||
return;
|
||||
}
|
||||
|
||||
wstring firstString;
|
||||
if(arg[0]->IsString())
|
||||
if (arg[0]->IsString())
|
||||
firstString = arg[0]->GetString();
|
||||
else
|
||||
firstString = arg[0]->ToString();
|
||||
|
||||
wstring secondString;
|
||||
if(arg[1]->IsString())
|
||||
if (arg[1]->IsString())
|
||||
secondString = arg[1]->GetString();
|
||||
else
|
||||
secondString = arg[1]->ToString();
|
||||
|
||||
+15
-15
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
@@ -22,10 +22,10 @@
|
||||
#include <mpParser.h>
|
||||
#include <mpOprtNonCmplx.h>
|
||||
|
||||
class AddOperator:public mup::OprtAdd
|
||||
class AddOperator : public mup::OprtAdd
|
||||
{
|
||||
public:
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type *arg, int argc) override;
|
||||
void Eval(mup::ptr_val_type& ret, const mup::ptr_val_type* arg, int argc) override;
|
||||
const mup::char_type* GetDesc() const;
|
||||
mup::IToken* Clone() const override;
|
||||
};
|
||||
Reference in new issue
Block a user