CLI2: Eliminated unnecessary ::findTerminator
This commit is contained in:
33
src/CLI2.cpp
33
src/CLI2.cpp
@@ -468,38 +468,6 @@ void CLI2::demoteDOM ()
|
|||||||
context.debug (dump ("CLI2::analyze demoteDOM"));
|
context.debug (dump ("CLI2::analyze demoteDOM"));
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
void CLI2::handleTerminator ()
|
|
||||||
{
|
|
||||||
bool changes = false;
|
|
||||||
bool terminated = false;
|
|
||||||
std::vector <A2> reconstructed;
|
|
||||||
for (auto& a : _args)
|
|
||||||
{
|
|
||||||
if (a._lextype == Lexer::Type::separator &&
|
|
||||||
! terminated)
|
|
||||||
{
|
|
||||||
terminated = true;
|
|
||||||
changes = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (terminated)
|
|
||||||
a._lextype = Lexer::Type::word;
|
|
||||||
|
|
||||||
reconstructed.push_back (a);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (changes)
|
|
||||||
{
|
|
||||||
_args = reconstructed;
|
|
||||||
|
|
||||||
if (context.config.getInteger ("debug.parser") >= 3)
|
|
||||||
context.debug (dump ("CLI2::analyze handleTerminator"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// Intended to be called after ::add() to perform the final analysis.
|
// Intended to be called after ::add() to perform the final analysis.
|
||||||
void CLI2::analyze ()
|
void CLI2::analyze ()
|
||||||
@@ -512,7 +480,6 @@ void CLI2::analyze ()
|
|||||||
handleArg0 ();
|
handleArg0 ();
|
||||||
lexArguments ();
|
lexArguments ();
|
||||||
demoteDOM ();
|
demoteDOM ();
|
||||||
handleTerminator ();
|
|
||||||
|
|
||||||
// Process _args.
|
// Process _args.
|
||||||
aliasExpansion ();
|
aliasExpansion ();
|
||||||
|
|||||||
@@ -87,7 +87,6 @@ private:
|
|||||||
void handleArg0 ();
|
void handleArg0 ();
|
||||||
void lexArguments ();
|
void lexArguments ();
|
||||||
void demoteDOM ();
|
void demoteDOM ();
|
||||||
void handleTerminator ();
|
|
||||||
void aliasExpansion ();
|
void aliasExpansion ();
|
||||||
void findOverrides ();
|
void findOverrides ();
|
||||||
bool findCommand ();
|
bool findCommand ();
|
||||||
|
|||||||
Reference in New Issue
Block a user