gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI2: Added ::lexArguments to perform *all* lexing

Browse Source
This commit is contained in:
Paul Beckingham
2015-06-14 15:27:05 -04:00
parent ab367145c6
commit 9d5a10bd89
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/CLI2.cpp
View File

@@ -375,21 +375,10 @@ void CLI2::handleArg0 ()
}
////////////////////////////////////////////////////////////////////////////////
// Intended to be called after ::add() to perform the final analysis.
void CLI2::analyze ()
void CLI2::lexArguments ()
{
if (context.config.getInteger ("debug.parser") >= 3)
{
context.debug ("---------------------------------------------------------------------------------");
context.debug (dump ("CLI2::analyze start"));
}
// Start from scratch.
_args.clear ();
handleArg0 ();
// Look at each arg, and decide if it warrants lexing.
// Note: Starts interating at index 1.
// Note: Starts interating at index 1, because ::handleArg0 has already
// processed it.
for (unsigned int i = 1; i < _original_args.size (); ++i)
{
std::string lexeme;
@@ -401,7 +390,26 @@ void CLI2::analyze ()
_args.push_back (A2 ("arg", lexeme, type));
}
// Now process _args.
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (dump ("CLI2::analyze lexArguments"));
}
////////////////////////////////////////////////////////////////////////////////
// Intended to be called after ::add() to perform the final analysis.
void CLI2::analyze ()
{
if (context.config.getInteger ("debug.parser") >= 3)
{
context.debug ("---------------------------------------------------------------------------------");
context.debug (dump ("CLI2::analyze start"));
}
// Process _original_args.
_args.clear ();
handleArg0 ();
lexArguments ();
// Process _args.
aliasExpansion ();
findOverrides ();