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

CLI2: All args lexed

Browse Source 
- All arguments now lexed.
- A2::dump now includes Lexer::Type.
This commit is contained in:
Paul Beckingham
2015-06-13 16:36:26 -04:00
parent 92a9ce732c
commit e159c838ad
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/CLI2.cpp
View File

@@ -184,7 +184,7 @@ void A2::removeAttribute (const std::string& name)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
const std::string A2::dump () const const std::string A2::dump () const
{ {
std::string output = _name; std::string output = _name + " " + Lexer::typeToString (_lextype);
// Dump attributes. // Dump attributes.
std::string atts; std::string atts;
@@ -401,16 +401,8 @@ void CLI2::analyze ()
Lexer lex (raw); Lexer lex (raw);
lex.ambiguity (false); lex.ambiguity (false);
std::vector <std::pair <std::string, Lexer::Type>> lexemes;
while (lex.token (lexeme, type)) while (lex.token (lexeme, type))
{ _args.push_back (A2 ("arg", lexeme, type));
lexemes.push_back (std::pair <std::string, Lexer::Type> (lexeme, type));
context.debug (format ("lexeme {1} {2}", lexeme, lex.typeToString (type)));
}
// TODO Replace this with some discerning logic.
A2 arg ("arg", raw, Lexer::Type::word);
_args.push_back (arg);
} }
if (context.config.getInteger ("debug.parser") >= 3) if (context.config.getInteger ("debug.parser") >= 3)