diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-17 09:01:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-17 11:22:26 +0200 |
| commit | b94272a55ee208b22cf73e8738152d9feaa7916f (patch) | |
| tree | 3f37e456b9f8ae68fa06fa8f4de9bc6232b76fba /idl/inc | |
| parent | cd3bb3047d3f4c9cc9b4aa0c0eb8a42930b9bb86 (diff) | |
cleanup the Read*() methods in SvIdlParser
to be consistent about when they move to the next token
Change-Id: I8f5b1eab497fb4a7cb2a2267e815668c3d363de7
Diffstat (limited to 'idl/inc')
| -rw-r--r-- | idl/inc/lex.hxx | 50 | ||||
| -rw-r--r-- | idl/inc/parser.hxx | 7 |
2 files changed, 35 insertions, 22 deletions
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index f513e9ec68fb..7a715206211e 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -181,28 +181,38 @@ public: SvToken& GetToken() const { return *(*pCurToken).get(); } bool ReadIf( char cChar ) - { - if( (*pCurToken)->IsChar() - && cChar == (*pCurToken)->GetChar() ) - { - GetToken_Next(); - return true; - } - else - return false; - } + { + if( GetToken().IsChar() && cChar == GetToken().GetChar() ) + { + GetToken_Next(); + return true; + } + else + return false; + } + + bool ReadIf( SvStringHashEntry* pEntry ) + { + if( GetToken().Is( pEntry ) ) + { + GetToken_Next(); + return true; + } + else + return false; + } bool ReadIfDelimiter() - { - if( (*pCurToken)->IsChar() - && (';' == (*pCurToken)->GetChar() - || ',' == (*pCurToken)->GetChar()) ) - { - GetToken_Next(); - return true; - } - return false; - } + { + if( GetToken().IsChar() + && (';' == GetToken().GetChar() + || ',' == GetToken().GetChar()) ) + { + GetToken_Next(); + return true; + } + return false; + } sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); } diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx index 612fda03b778..fd1a3526a1a2 100644 --- a/idl/inc/parser.hxx +++ b/idl/inc/parser.hxx @@ -52,11 +52,14 @@ public: void ReadEnumValue( SvMetaTypeEnum& rEnum ); SvMetaClass* ReadKnownClass(); SvMetaType* ReadKnownType(); - void ReadChar(char cChar); + void Read(char cChar); + bool ReadIf(char cChar); void ReadDelimiter(); + bool ReadIfDelimiter(); OString ReadIdentifier(); OString ReadString(); - void ReadToken(SvStringHashEntry*); + void Read(SvStringHashEntry*); + bool ReadIf(SvStringHashEntry*); }; #endif // INCLUDED_IDL_INC_PARSER_HXX |