mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 15:05:16 +00:00
Code Issues Releases Wiki Activity

[2369] Use prefix syntax for increment/decrement operators

Browse Source
This commit is contained in:
Mukund Sivaraman
2012-11-07 12:31:30 +05:30
parent 24862b62d9
commit dce5a5557d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/dns/master_lexer_inputsource.cc
View File

@@ -96,9 +96,10 @@ InputSource::getChar() {
buffer_.push_back(c); buffer_.push_back(c);
} }
const int c = buffer_[buffer_pos_++]; const int c = buffer_[buffer_pos_];
++buffer_pos_;
if (c == '\n') { if (c == '\n') {
line_++; ++line_;
} }
return (c); return (c);
@@ -112,9 +113,9 @@ InputSource::ungetChar() {
isc_throw(UngetBeforeBeginning, isc_throw(UngetBeforeBeginning,
"Cannot skip before the start of buffer"); "Cannot skip before the start of buffer");
} else { } else {
buffer_pos_--; --buffer_pos_;
if (buffer_[buffer_pos_] == '\n') { if (buffer_[buffer_pos_] == '\n') {
line_--; --line_;
} }
} }
} }

12
src/lib/dns/tests/master_lexer_inputsource_unittest.cc
View File

@@ -71,7 +71,7 @@ void
checkGetAndUngetChar(InputSource& source, checkGetAndUngetChar(InputSource& source,
const char* str, const size_t str_length) const char* str, const size_t str_length)
{ {
for (size_t i = 0; i < str_length; i++) { for (size_t i = 0; i < str_length; ++i) {
EXPECT_EQ(str[i], source.getChar()); EXPECT_EQ(str[i], source.getChar());
EXPECT_FALSE(source.atEOF()); EXPECT_FALSE(source.atEOF());
} }
@@ -101,7 +101,7 @@ checkGetAndUngetChar(InputSource& source,
// Now, let's go backwards in a loop. Start by skipping the EOF. // Now, let's go backwards in a loop. Start by skipping the EOF.
source.ungetChar(); source.ungetChar();
for (size_t i = 0; i < str_length; i++) { for (size_t i = 0; i < str_length; ++i) {
const size_t index = str_length - 1 - i; const size_t index = str_length - 1 - i;
// Skip one character. // Skip one character.
source.ungetChar(); source.ungetChar();
@@ -153,7 +153,7 @@ TEST_F(InputSourceTest, compact) {
// Ungetting here must throw. // Ungetting here must throw.
EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning); EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
for (size_t i = 0; i < str_length_; i++) { for (size_t i = 0; i < str_length_; ++i) {
EXPECT_EQ(str_[i], source_.getChar()); EXPECT_EQ(str_[i], source_.getChar());
EXPECT_FALSE(source_.atEOF()); EXPECT_FALSE(source_.atEOF());
} }
@@ -206,7 +206,7 @@ TEST_F(InputSourceTest, markDuring) {
// Ungetting here must throw. // Ungetting here must throw.
EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning); EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
for (size_t i = 13; i < str_length_; i++) { for (size_t i = 13; i < str_length_; ++i) {
EXPECT_EQ(str_[i], source_.getChar()); EXPECT_EQ(str_[i], source_.getChar());
EXPECT_FALSE(source_.atEOF()); EXPECT_FALSE(source_.atEOF());
} }
@@ -226,7 +226,7 @@ TEST_F(InputSourceTest, markDuring) {
// Ungetting here must throw. // Ungetting here must throw.
EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning); EXPECT_THROW(source_.ungetChar(), InputSource::UngetBeforeBeginning);
for (size_t i = 13; i < str_length_; i++) { for (size_t i = 13; i < str_length_; ++i) {
EXPECT_EQ(str_[i], source_.getChar()); EXPECT_EQ(str_[i], source_.getChar());
EXPECT_FALSE(source_.atEOF()); EXPECT_FALSE(source_.atEOF());
} }
@@ -246,7 +246,7 @@ TEST_F(InputSourceTest, lines) {
size_t line = 1; size_t line = 1;
while (!source_.atEOF()) { while (!source_.atEOF()) {
if (source_.getChar() == '\n') { if (source_.getChar() == '\n') {
line++; ++line;
} }
EXPECT_EQ(line, source_.getCurrentLine()); EXPECT_EQ(line, source_.getCurrentLine());
} }