aboutsummaryrefslogtreecommitdiff
path: root/build/lexer.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'build/lexer.cxx')
-rw-r--r--build/lexer.cxx84
1 files changed, 9 insertions, 75 deletions
diff --git a/build/lexer.cxx b/build/lexer.cxx
index 43c0690..9dce949 100644
--- a/build/lexer.cxx
+++ b/build/lexer.cxx
@@ -20,9 +20,9 @@ namespace build
bool sep (skip_spaces ());
xchar c (get ());
- uint64_t ln (c.line ()), cn (c.column ());
+ uint64_t ln (c.line), cn (c.column);
- if (is_eos (c))
+ if (eos (c))
return token (token_type::eos, sep, ln, cn);
switch (c)
@@ -106,11 +106,11 @@ namespace build
token lexer::
name (xchar c, bool sep)
{
- uint64_t ln (c.line ()), cn (c.column ());
+ uint64_t ln (c.line), cn (c.column);
string lexeme;
lexeme += (c != '\\' ? c : escape ());
- for (c = peek (); !is_eos (c); c = peek ())
+ for (c = peek (); !eos (c); c = peek ())
{
bool done (false);
@@ -202,9 +202,9 @@ namespace build
bool r (false);
xchar c (peek ());
- bool start (c.column () == 1);
+ bool start (c.column == 1);
- for (; !is_eos (c); c = peek ())
+ for (; !eos (c); c = peek ())
{
switch (c)
{
@@ -232,7 +232,7 @@ namespace build
// Read until newline or eos.
//
- for (c = peek (); !is_eos (c) && c != '\n'; c = peek ())
+ for (c = peek (); !eos (c) && c != '\n'; c = peek ())
get ();
r = true;
@@ -266,82 +266,16 @@ namespace build
{
xchar c (get ());
- if (is_eos (c))
+ if (eos (c))
fail (c) << "unterminated escape sequence";
return c;
}
- lexer::xchar lexer::
- peek ()
- {
- if (unget_)
- return buf_;
- else
- {
- if (eos_)
- return xchar (xchar::traits_type::eof (), l_, c_);
- else
- {
- xchar::int_type v (is_.peek ());
-
- if (v == xchar::traits_type::eof ())
- eos_ = true;
-
- return xchar (v, l_, c_);
- }
- }
- }
-
- lexer::xchar lexer::
- get ()
- {
- if (unget_)
- {
- unget_ = false;
- return buf_;
- }
- else
- {
- // When is_.get () returns eof, the failbit is also set (stupid,
- // isn't?) which may trigger an exception. To work around this
- // we will call peek() first and only call get() if it is not
- // eof. But we can only call peek() on eof once; any subsequent
- // calls will spoil the failbit (even more stupid).
- //
- xchar c (peek ());
-
- if (!is_eos (c))
- {
- is_.get ();
-
- if (c == '\n')
- {
- l_++;
- c_ = 1;
- }
- else
- c_++;
- }
-
- return c;
- }
- }
-
- void lexer::
- unget (const xchar& c)
- {
- // Because iostream::unget cannot work once eos is reached,
- // we have to provide our own implementation.
- //
- buf_ = c;
- unget_ = true;
- }
-
location_prologue lexer::fail_mark_base::
operator() (const xchar& c) const
{
return build::fail_mark_base<failed>::operator() (
- location (name_.c_str (), c.line (), c.column ()));
+ location (name_.c_str (), c.line, c.column));
}
}