Commit 54a29ffd by Olli Etuaho Committed by Commit Bot

Refactor TSymbol to follow naming conventions

This will make it easier to make TStructure inherit from TSymbol. BUG=angleproject:2267 TEST=angle_unittests Change-Id: I73a5a25234c7f965b6970891821ee9d6f0a23aca Reviewed-on: https://chromium-review.googlesource.com/793812Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent ae04e1e4
...@@ -567,7 +567,7 @@ TIntermConstantUnion::TIntermConstantUnion(const TIntermConstantUnion &node) : T ...@@ -567,7 +567,7 @@ TIntermConstantUnion::TIntermConstantUnion(const TIntermConstantUnion &node) : T
void TFunctionSymbolInfo::setFromFunction(const TFunction &function) void TFunctionSymbolInfo::setFromFunction(const TFunction &function)
{ {
setName(function.getName()); setName(function.name());
setId(TSymbolUniqueId(function)); setId(TSymbolUniqueId(function));
} }
......
...@@ -219,7 +219,7 @@ TIntermSymbol *ReferenceGlobalVariable(const TString &name, const TSymbolTable & ...@@ -219,7 +219,7 @@ TIntermSymbol *ReferenceGlobalVariable(const TString &name, const TSymbolTable &
{ {
TVariable *var = reinterpret_cast<TVariable *>(symbolTable.findGlobal(name)); TVariable *var = reinterpret_cast<TVariable *>(symbolTable.findGlobal(name));
ASSERT(var); ASSERT(var);
return new TIntermSymbol(var->getUniqueId(), name, var->getType()); return new TIntermSymbol(var->uniqueId(), name, var->getType());
} }
TIntermSymbol *ReferenceBuiltInVariable(const TString &name, TIntermSymbol *ReferenceBuiltInVariable(const TString &name,
...@@ -229,7 +229,7 @@ TIntermSymbol *ReferenceBuiltInVariable(const TString &name, ...@@ -229,7 +229,7 @@ TIntermSymbol *ReferenceBuiltInVariable(const TString &name,
const TVariable *var = const TVariable *var =
reinterpret_cast<const TVariable *>(symbolTable.findBuiltIn(name, shaderVersion, true)); reinterpret_cast<const TVariable *>(symbolTable.findBuiltIn(name, shaderVersion, true));
ASSERT(var); ASSERT(var);
return new TIntermSymbol(var->getUniqueId(), name, var->getType()); return new TIntermSymbol(var->uniqueId(), name, var->getType());
} }
TIntermTyped *CreateBuiltInFunctionCallNode(const TString &name, TIntermTyped *CreateBuiltInFunctionCallNode(const TString &name,
......
...@@ -29,8 +29,8 @@ static const char kFunctionMangledNameSeparator = '('; ...@@ -29,8 +29,8 @@ static const char kFunctionMangledNameSeparator = '(';
} // anonymous namespace } // anonymous namespace
TSymbol::TSymbol(TSymbolTable *symbolTable, const TString *n) TSymbol::TSymbol(TSymbolTable *symbolTable, const TString *name)
: uniqueId(symbolTable->nextUniqueId()), name(n), extension(TExtension::UNDEFINED) : mUniqueId(symbolTable->nextUniqueId()), mName(name), mExtension(TExtension::UNDEFINED)
{ {
} }
...@@ -61,7 +61,7 @@ void TFunction::swapParameters(const TFunction &parametersSource) ...@@ -61,7 +61,7 @@ void TFunction::swapParameters(const TFunction &parametersSource)
const TString *TFunction::buildMangledName() const const TString *TFunction::buildMangledName() const
{ {
std::string newName = getName().c_str(); std::string newName = name().c_str();
newName += kFunctionMangledNameSeparator; newName += kFunctionMangledNameSeparator;
for (const auto &p : parameters) for (const auto &p : parameters)
...@@ -104,7 +104,7 @@ bool TSymbolTableLevel::insert(TSymbol *symbol) ...@@ -104,7 +104,7 @@ bool TSymbolTableLevel::insert(TSymbol *symbol)
bool TSymbolTableLevel::insertUnmangled(TFunction *function) bool TSymbolTableLevel::insertUnmangled(TFunction *function)
{ {
// returning true means symbol was added to the table // returning true means symbol was added to the table
tInsertResult result = level.insert(tLevelPair(function->getName(), function)); tInsertResult result = level.insert(tLevelPair(function->name(), function));
return result.second; return result.second;
} }
......
...@@ -48,25 +48,25 @@ class TSymbol : angle::NonCopyable ...@@ -48,25 +48,25 @@ class TSymbol : angle::NonCopyable
{ {
public: public:
POOL_ALLOCATOR_NEW_DELETE(); POOL_ALLOCATOR_NEW_DELETE();
TSymbol(TSymbolTable *symbolTable, const TString *n); TSymbol(TSymbolTable *symbolTable, const TString *name);
virtual ~TSymbol() virtual ~TSymbol()
{ {
// don't delete name, it's from the pool // don't delete name, it's from the pool
} }
const TString &getName() const { return *name; } const TString &name() const { return *mName; }
virtual const TString &getMangledName() const { return getName(); } virtual const TString &getMangledName() const { return name(); }
virtual bool isFunction() const { return false; } virtual bool isFunction() const { return false; }
virtual bool isVariable() const { return false; } virtual bool isVariable() const { return false; }
const TSymbolUniqueId &getUniqueId() const { return uniqueId; } const TSymbolUniqueId &uniqueId() const { return mUniqueId; }
void relateToExtension(TExtension ext) { extension = ext; } void relateToExtension(TExtension ext) { mExtension = ext; }
TExtension getExtension() const { return extension; } TExtension extension() const { return mExtension; }
private: private:
const TSymbolUniqueId uniqueId; const TSymbolUniqueId mUniqueId;
const TString *name; const TString *mName;
TExtension extension; TExtension mExtension;
}; };
// Variable, meaning a symbol that's not a function. // Variable, meaning a symbol that's not a function.
......
...@@ -16,7 +16,7 @@ TSymbolUniqueId::TSymbolUniqueId(TSymbolTable *symbolTable) : mId(symbolTable->n ...@@ -16,7 +16,7 @@ TSymbolUniqueId::TSymbolUniqueId(TSymbolTable *symbolTable) : mId(symbolTable->n
{ {
} }
TSymbolUniqueId::TSymbolUniqueId(const TSymbol &symbol) : mId(symbol.getUniqueId().get()) TSymbolUniqueId::TSymbolUniqueId(const TSymbol &symbol) : mId(symbol.uniqueId().get())
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment