BIND 10 master, updated. 4dbb7316aabd51e731a474eef597132aa0ae5863 [master] Fix changes from #2374 to match API changes
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Nov 27 13:50:04 UTC 2012
The branch, master has been updated
via 4dbb7316aabd51e731a474eef597132aa0ae5863 (commit)
from 2972b769eaa87705120211afd0cd4c4a5984c1c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4dbb7316aabd51e731a474eef597132aa0ae5863
Author: Jelte Jansen <jelte at isc.org>
Date: Tue Nov 27 14:49:40 2012 +0100
[master] Fix changes from #2374 to match API changes
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/master_lexer.cc | 6 ++--
src/lib/dns/tests/master_lexer_state_unittest.cc | 40 +++++++++++-----------
2 files changed, 23 insertions(+), 23 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc
index 164fe5f..8364f80 100644
--- a/src/lib/dns/master_lexer.cc
+++ b/src/lib/dns/master_lexer.cc
@@ -292,7 +292,7 @@ class Number : public State {
public:
Number() {}
virtual ~Number() {}
- virtual const State* handle(MasterLexer& lexer) const;
+ virtual void handle(MasterLexer& lexer) const;
};
// We use a common instance of a each state in a singleton-like way to save
@@ -446,7 +446,7 @@ QString::handle(MasterLexer& lexer) const {
}
}
-const State*
+void
Number::handle(MasterLexer& lexer) const {
MasterLexer::Token& token = getLexerImpl(lexer)->token_;
// Do we want to support octal and/or hex here?
@@ -473,7 +473,7 @@ Number::handle(MasterLexer& lexer) const {
token = MasterLexer::Token(&data.at(0),
data.size());
}
- return (NULL);
+ return;
}
if (!isdigit(c)) {
digits_only = false;
diff --git a/src/lib/dns/tests/master_lexer_state_unittest.cc b/src/lib/dns/tests/master_lexer_state_unittest.cc
index d2a4945..5b9cf54 100644
--- a/src/lib/dns/tests/master_lexer_state_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_state_unittest.cc
@@ -471,39 +471,39 @@ TEST_F(MasterLexerStateTest, basicNumbers) {
lexer.pushSource(ss);
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(0, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(1, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(12345, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(4294967295, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(0, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(1, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(2808348672, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(5, s_number.getToken(lexer).getNumber());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(42, s_number.getToken(lexer).getNumber());
EXPECT_EQ(s_null, State::start(lexer, common_options));
@@ -511,7 +511,7 @@ TEST_F(MasterLexerStateTest, basicNumbers) {
EXPECT_EQ(Token::END_OF_LINE, s_crlf.getToken(lexer).getType());
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
EXPECT_EQ(37, s_number.getToken(lexer).getNumber());
// If we continue we'll simply see the EOF
@@ -538,45 +538,45 @@ TEST_F(MasterLexerStateTest, stringNumbers) {
lexer.pushSource(ss);
EXPECT_EQ(&s_string, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_string.handle(lexer));
+ s_string.handle(lexer);
stringTokenCheck("-1", s_string.getToken(lexer), false);
// Starts out as a number, but ends up being a string
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
stringTokenCheck("123abc456", s_number.getToken(lexer), false);
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer));
+ s_number.handle(lexer);
stringTokenCheck("123\\456", s_number.getToken(lexer), false);
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("3scaped\\ space", s_number.getToken(lexer));
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("3scaped\\\ttab", s_number.getToken(lexer));
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("3scaped\\(paren", s_number.getToken(lexer));
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("3scaped\\)close", s_number.getToken(lexer));
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("3scaped\\;comment", s_number.getToken(lexer));
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' in mid
+ s_number.handle(lexer); // recognize str, see ' ' in mid
stringTokenCheck("3scaped\\\\", s_number.getToken(lexer));
// Confirm the word that follows the escaped '\' is correctly recognized.
EXPECT_EQ(&s_number, State::start(lexer, common_options));
- EXPECT_EQ(s_null, s_number.handle(lexer)); // recognize str, see ' ' at end
+ s_number.handle(lexer); // recognize str, see ' ' at end
stringTokenCheck("8ackslash", s_number.getToken(lexer));
// If we continue we'll simply see the EOF
More information about the bind10-changes
mailing list