Converted to Lexer2.

This commit is contained in:
Paul Beckingham 2015-02-19 21:36:04 -08:00
parent 15bec27e03
commit be80bc4ea3

View file

@ -37,7 +37,7 @@
#ifdef NIBBLER_FEATURE_REGEX #ifdef NIBBLER_FEATURE_REGEX
#include <RX.h> #include <RX.h>
#endif #endif
#include <Lexer.h> #include <Lexer2.h>
static const char* _uuid_pattern = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"; static const char* _uuid_pattern = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
static const unsigned int _uuid_min_length = 8; static const unsigned int _uuid_min_length = 8;
@ -1005,12 +1005,12 @@ bool Nibbler::getName (std::string& result)
{ {
if (! isdigit (_input[i]) && if (! isdigit (_input[i]) &&
! ispunct (_input[i]) && ! ispunct (_input[i]) &&
! Lexer::is_ws (_input[i])) ! Lexer2::isWhitespace (_input[i]))
{ {
++i; ++i;
while (i < _length && while (i < _length &&
(_input[i] == '_' || ! ispunct (_input[i])) && (_input[i] == '_' || ! ispunct (_input[i])) &&
! Lexer::is_ws (_input[i])) ! Lexer2::isWhitespace (_input[i]))
{ {
++i; ++i;
} }
@ -1037,7 +1037,7 @@ bool Nibbler::getWord (std::string& result)
{ {
while (!isdigit (_input[i]) && while (!isdigit (_input[i]) &&
!isPunctuation (_input[i]) && !isPunctuation (_input[i]) &&
!Lexer::is_ws (_input[i])) !Lexer2::isWhitespace (_input[i]))
{ {
++i; ++i;
} }