Commit 58e5b625 authored by ussrhero's avatar ussrhero
Browse files

fixed bug #3

parent 5eb3a61c
......@@ -38,19 +38,16 @@ Options::Options(const std::string& cmdline) :
showHelp(false),
runModule(false)
{
args = getArgsList( cmdline );
if ( args.empty() )
{
global = true;
}
bool globalByDefault = true;
for (auto it = args.begin(); it != args.end();)
{
if (*it == "--global" || *it == "-g")
{
global = true;
globalByDefault = false;
it = args.erase(it);
continue;
}
......@@ -58,41 +55,52 @@ Options::Options(const std::string& cmdline) :
if (*it == "--local" || *it == "-l")
{
global = false;
globalByDefault = false;
it = args.erase(it);
continue;
}
if (*it == "--help" || *it == "-h")
std::smatch mres;
if (std::regex_match(*it, mres, versionRe))
{
showHelp = true;
pyMajorVersion = atol(std::string(mres[1].first, mres[1].second).c_str());
if (mres[2].matched)
{
pyMinorVersion = atol(std::string(mres[2].first, mres[2].second).c_str());
}
it = args.erase(it);
continue;
}
if (*it == "--module" || *it == "-m")
break;
}
if ( args.empty() && globalByDefault)
{
runModule = true;
it = args.erase(it);
continue;
global = true;
}
std::smatch mres;
if (std::regex_match(*it, mres, versionRe))
for (auto it = args.begin(); it != args.end();)
{
pyMajorVersion = atol(std::string(mres[1].first, mres[1].second).c_str());
if (mres[2].matched)
if (*it == "--help" || *it == "-h")
{
pyMinorVersion = atol(std::string(mres[2].first, mres[2].second).c_str());
showHelp = true;
it = args.erase(it);
continue;
}
if (*it == "--module" || *it == "-m")
{
runModule = true;
it = args.erase(it);
continue;
}
break;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment