solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Update wxMemoryInputStream::Peek to set last read count.

Browse source 
This aligns the memory stream's Peek with other streams' Peek impls by
making it set the last read count to 1 when it successfully peeks a
character, or 0 when it does not. While the formal docs do not link
Peek to LastCount directly, the in-source comments on the declaration
of both wxInputStream::Peek and wxInputStream::LastRead both indicate
that Peek will set the last read count.
This commit is contained in:
the-nerbs 2023-08-06 20:46:27 -04:00
parent d847f3b039
commit ffe520cb6d
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/mstream.cpp
View file

@ -112,10 +112,12 @@ char wxMemoryInputStream::Peek()
if ( pos == m_length ) if ( pos == m_length )
{ {
m_lasterror = wxSTREAM_READ_ERROR; m_lasterror = wxSTREAM_READ_ERROR;
m_lastcount = 0;
return 0; return 0;
} }
m_lastcount = 1;
return buf[pos]; return buf[pos];
} }

8
tests/streams/bstream.h
View file

@ -253,11 +253,19 @@ protected:
while (stream_in.IsOk()) while (stream_in.IsOk())
{ {
char peekChar = stream_in.Peek(); char peekChar = stream_in.Peek();
size_t peekLastRead = stream_in.LastRead();
char getChar = stream_in.GetC(); char getChar = stream_in.GetC();
// Peek and GetC should retrieve the same 0 or 1 characters.
CPPUNIT_ASSERT_EQUAL(peekLastRead, stream_in.LastRead());
if (stream_in.LastRead() == 1) if (stream_in.LastRead() == 1)
{
CPPUNIT_ASSERT_EQUAL(getChar, peekChar); CPPUNIT_ASSERT_EQUAL(getChar, peekChar);
} }
} }
}
// Just try to perform a Ungetch() on the input stream. // Just try to perform a Ungetch() on the input stream.
void Input_Ungetch() void Input_Ungetch()