zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- PSymbol does not need to inherit from PTypeBase. This also means that there are no remaining references to any symbol object outside of the symbol tables.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-08 13:37:13 +01:00
parent 18c532c307
commit f1b3d60b2f
5 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dobject.h
View file

@ -205,6 +205,7 @@ enum EObjectFlags
OF_SerialSuccess = 1 << 9, // For debugging Serialize() calls OF_SerialSuccess = 1 << 9, // For debugging Serialize() calls
OF_Sentinel = 1 << 10, // Object is serving as the sentinel in a ring list OF_Sentinel = 1 << 10, // Object is serving as the sentinel in a ring list
OF_Transient = 1 << 11, // Object should not be archived (references to it will be nulled on disk) OF_Transient = 1 << 11, // Object should not be archived (references to it will be nulled on disk)
OF_Released = 1 << 12, // Object was released from the GC system and should not be processed by GC function
}; };
template<class T> class TObjPtr; template<class T> class TObjPtr;

14
src/dobjtype.cpp
View file

@ -489,20 +489,6 @@ void PNamedType::GetTypeIDs(intptr_t &id1, intptr_t &id2) const
id2 = TypeName; id2 = TypeName;
} }
//==========================================================================
//
// PNamedType :: QualifiedName
//
//==========================================================================
FString PNamedType::QualifiedName() const
{
FString out;
if (Outer != nullptr) out = Outer->QualifiedName();
out << "::" << TypeName;
return out;
}
/* PInt *******************************************************************/ /* PInt *******************************************************************/
IMPLEMENT_CLASS(PInt, false, false) IMPLEMENT_CLASS(PInt, false, false)

1
src/dobjtype.h
View file

@ -224,7 +224,6 @@ public:
virtual bool IsMatch(intptr_t id1, intptr_t id2) const; virtual bool IsMatch(intptr_t id1, intptr_t id2) const;
virtual void GetTypeIDs(intptr_t &id1, intptr_t &id2) const; virtual void GetTypeIDs(intptr_t &id1, intptr_t &id2) const;
virtual FString QualifiedName() const;
}; };
// Basic types -------------------------------------------------------------- // Basic types --------------------------------------------------------------

10
src/scripting/symbols.cpp
View file

@ -59,16 +59,6 @@ IMPLEMENT_POINTER(Parent)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
//==========================================================================
//
//
//
//==========================================================================
PSymbol::~PSymbol()
{
}
//========================================================================== //==========================================================================
// //
// //

15
src/scripting/symbols.h
View file

@ -19,23 +19,12 @@ class PTypeBase : public DObject
DECLARE_ABSTRACT_CLASS(PTypeBase, DObject) DECLARE_ABSTRACT_CLASS(PTypeBase, DObject)
public: public:
virtual FString QualifiedName() const
{
return "";
}
}; };
class PSymbol : public PTypeBase class PSymbol : public DObject
{ {
DECLARE_ABSTRACT_CLASS(PSymbol, PTypeBase); DECLARE_ABSTRACT_CLASS(PSymbol, DObject);
public: public:
virtual ~PSymbol();
virtual FString QualifiedName() const
{
return SymbolName.GetChars();
}
FName SymbolName; FName SymbolName;
protected: protected: