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/inc | |
| parent | d4a10f00c96c2fc4be2755873f6b26e72a996ca6 (diff) | |
move item and struct parsing into SvIdlParser
Change-Id: I1ba88bca82b5b251ed34330ab5e0cb8bd88a5815
Diffstat (limited to 'idl/inc')
| -rw-r--r-- | idl/inc/parser.hxx | 6 | ||||
| -rw-r--r-- | idl/inc/types.hxx | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx index 9284096d2b7e..8418d0be77da 100644 --- a/idl/inc/parser.hxx +++ b/idl/inc/parser.hxx @@ -26,6 +26,8 @@ class SvTokenStream; class SvIdlDataBase; class SvMetaModule; class SvMetaTypeEnum; +class SvStringHashEntry; +class SvMetaType; class SvIdlParser { @@ -38,12 +40,16 @@ public: bool ReadModuleBody(SvMetaModule& rModule); void ReadModuleElement( SvMetaModule& rModule ); void ReadInclude( SvMetaModule& rModule ); + void ReadItem(); + void ReadStruct(); void ReadEnum(); void ReadEnumValue( SvMetaTypeEnum& rEnum ); + SvMetaType* ReadKnownType(); void ReadChar(char cChar); void ReadDelimiter(); OString ReadIdentifier(); OString ReadString(); + void ReadToken(SvStringHashEntry*); }; #endif // INCLUDED_IDL_INC_PARSER_HXX diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 47c56722bab1..3be88e1b2eb8 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -30,13 +30,12 @@ typedef SvRefMemberList< SvMetaSlot* > SvSlotElementList; class SvMetaAttribute : public SvMetaReference { - tools::SvRef<SvMetaType> aType; - SvIdentifier aSlotId; - protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) override; public: + tools::SvRef<SvMetaType> aType; + SvIdentifier aSlotId; SvMetaAttribute(); SvMetaAttribute( SvMetaType * ); @@ -81,6 +80,7 @@ public: MetaTypeType GetMetaTypeType() const { return nType; } SvMetaType * GetBaseType() const; SvMetaType * GetReturnType() const; + void SetItem(bool b) { bIsItem = b; } bool IsItem() const { return bIsItem; } virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; @@ -101,8 +101,6 @@ class SvMetaEnumValue : public SvMetaObject { public: SvMetaEnumValue(); - - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; }; class SvMetaTypeEnum : public SvMetaType |