CLI
- Further restrictions on tag definition.
This commit is contained in:
@@ -28,7 +28,6 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream> // TODO Remove.
|
#include <iostream> // TODO Remove.
|
||||||
#include <ctype.h>
|
|
||||||
#include <Context.h>
|
#include <Context.h>
|
||||||
#include <Nibbler.h>
|
#include <Nibbler.h>
|
||||||
#include <Lexer.h>
|
#include <Lexer.h>
|
||||||
@@ -2069,12 +2068,12 @@ bool CLI::isCommand (const std::string& raw) const
|
|||||||
// Valid tag
|
// Valid tag
|
||||||
// - Length > 1
|
// - Length > 1
|
||||||
// - Starts with +/-
|
// - Starts with +/-
|
||||||
// - Tag does not start with a digit
|
// - The rest matches ::isName
|
||||||
bool CLI::isTag (const std::string& raw) const
|
bool CLI::isTag (const std::string& raw) const
|
||||||
{
|
{
|
||||||
if (raw.size () >= 2 &&
|
if (raw.size () >= 2 &&
|
||||||
(raw[0] == '+' || raw[0] == '-') &&
|
(raw[0] == '+' || raw[0] == '-') &&
|
||||||
! isdigit(raw[1]) &&
|
isName (raw.substr (1)) &&
|
||||||
raw.find (' ') == std::string::npos)
|
raw.find (' ') == std::string::npos)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user