diff options
| author | jmmv <jmmv@FreeBSD.org> | 2013-11-16 21:57:53 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2013-11-16 21:57:53 +0000 |
| commit | b849e3606cf0dc725ff02712cd92907131c0188c (patch) | |
| tree | fbeeb9add4586c61211109aa7e0bddba2b3da3b5 /atf-c++/detail/parser.hpp | |
| parent | 8a14a5faecae49aa28319310fb98faae0e3c7290 (diff) | |
| download | FreeBSD-src-b849e3606cf0dc725ff02712cd92907131c0188c.zip FreeBSD-src-b849e3606cf0dc725ff02712cd92907131c0188c.tar.gz | |
Import atf-0.18:
Experimental version released on November 16th, 2013.
* Issue 45: Added require.memory support in atf-run for FreeBSD.
* Fixed an issue with the handling of cin with libc++.
* Issue 64: Fixed various mandoc formatting warnings.
* X-NetBSD-PR bin/48284: Made atf-check flush its progress message to
stdout so that an interrupted test case always shows the last message
being executed.
* X-NetBSD-PR bin/48285: Fixed atf_check examples in atf-sh-api(3).
Approved by: rpaulo (mentor)
Diffstat (limited to 'atf-c++/detail/parser.hpp')
| -rw-r--r-- | atf-c++/detail/parser.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/atf-c++/detail/parser.hpp b/atf-c++/detail/parser.hpp index f1595f5..f55973f 100644 --- a/atf-c++/detail/parser.hpp +++ b/atf-c++/detail/parser.hpp @@ -259,7 +259,7 @@ tokenizer< IS >::next(void) t = token(m_lineno, m_text_type, text); quoted = true; } else { - m_is.unget(); + m_is.putback(ch); done = true; } } else { @@ -271,13 +271,13 @@ tokenizer< IS >::next(void) t = token(m_lineno, (*idelim).second, std::string("") + ch); else - m_is.unget(); + m_is.putback(ch); } else if (ch == '\n') { done = true; if (text.empty()) t = token(m_lineno, m_nl_type, "<<NEWLINE>>"); else - m_is.unget(); + m_is.putback(ch); } else if (m_skipws && (ch == ' ' || ch == '\t')) { if (!text.empty()) done = true; |
