Converted to Lexer2.

This commit is contained in:
Paul Beckingham 2015-02-19 21:32:51 -08:00
parent 6683cc7e83
commit 15bec27e03

View file

@ -31,7 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <Nibbler.h> #include <Nibbler.h>
#include <Lexer.h> #include <Lexer2.h>
#include <Duration.h> #include <Duration.h>
#include <text.h> #include <text.h>
@ -295,7 +295,7 @@ bool Duration::parse (const std::string& input, std::string::size_type& start)
if (n.getOneOf (units, unit)) if (n.getOneOf (units, unit))
{ {
if (n.depleted () || if (n.depleted () ||
Lexer::is_ws (n.next ())) Lexer2::isWhitespace (n.next ()))
{ {
start = original_start + n.cursor (); start = original_start + n.cursor ();
@ -319,7 +319,7 @@ bool Duration::parse (const std::string& input, std::string::size_type& start)
if (n.getOneOf (units, unit)) if (n.getOneOf (units, unit))
{ {
if (n.depleted () || if (n.depleted () ||
Lexer::is_ws (n.next ())) Lexer2::isWhitespace (n.next ()))
{ {
start = original_start + n.cursor (); start = original_start + n.cursor ();
double quantity = strtod (number.c_str (), NULL); double quantity = strtod (number.c_str (), NULL);