diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-12 13:09:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-15 15:47:30 +0200 |
| commit | ac432839329866659e339b582d31a1980c035c2e (patch) | |
| tree | f1fcf2470e4182cdbb2ac005229016372238666d /idl/source/objects/types.cxx | |
| parent | d4a10f00c96c2fc4be2755873f6b26e72a996ca6 (diff) | |
move item and struct parsing into SvIdlParser
Change-Id: I1ba88bca82b5b251ed34330ab5e0cb8bd88a5815
Diffstat (limited to 'idl/source/objects/types.cxx')
| -rw-r--r-- | idl/source/objects/types.cxx | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index c5c799d83dc2..13174100b1ff 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -74,7 +74,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, bOk = true; SvToken& rTok = rInStm.GetToken(); - if( bOk && rTok.IsChar() && rTok.GetChar() == '(' ) + if( rTok.IsChar() && rTok.GetChar() == '(' ) { tools::SvRef<SvMetaType> xT(new SvMetaType() ); xT->SetRef( GetType() ); @@ -164,7 +164,7 @@ SvMetaType * SvMetaType::GetReturnType() const return static_cast<SvMetaType *>(GetRef()); } -bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, +bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & , SvTokenStream & rInStm ) { bool bOk = false; @@ -181,26 +181,6 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, SetType( MetaTypeType::Shell ); bOk = ReadNamesSvIdl( rInStm ); } - else if( rTok.Is( SvHash_struct() ) ) - { - SetType( MetaTypeType::Struct ); - bOk = ReadNamesSvIdl( rInStm ); - } - else if( rTok.Is( SvHash_enum() ) ) - { - SetType( MetaTypeType::Enum ); - bOk = ReadNameSvIdl( rInStm ); - } - else if( rTok.Is( SvHash_item() ) ) - { - bIsItem = true; - - SvMetaType * pType = rBase.ReadKnownType( rInStm ); - if( !pType ) - throw SvParseException( rInStm, "wrong typedef: "); - SetRef( pType ); - bOk = ReadNameSvIdl( rInStm ); - } if( !bOk ) rInStm.Seek( nTokPos ); return bOk; @@ -344,12 +324,6 @@ SvMetaEnumValue::SvMetaEnumValue() { } -bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & , - SvTokenStream & rInStm ) -{ - return ReadNameSvIdl( rInStm ); -} - SvMetaTypeEnum::SvMetaTypeEnum() { } |