From 83318018e6037c49b7785d210b4648c17d747c87 Mon Sep 17 00:00:00 2001 From: Christoph Kubisch Date: Wed, 17 Apr 2019 10:49:53 +0200 Subject: [PATCH] improve formating --- glslang/MachineIndependent/SymbolTable.cpp | 18 ++++++++---------- glslang/MachineIndependent/SymbolTable.h | 14 +++++++------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/glslang/MachineIndependent/SymbolTable.cpp b/glslang/MachineIndependent/SymbolTable.cpp index d0b6ecdee7..c0a02e68a7 100755 --- a/glslang/MachineIndependent/SymbolTable.cpp +++ b/glslang/MachineIndependent/SymbolTable.cpp @@ -176,7 +176,7 @@ void TType::buildMangledName(TString& mangledName) const // Dump functions. // -void TSymbol::dumpExtensions(TInfoSink &infoSink) const +void TSymbol::dumpExtensions(TInfoSink& infoSink) const { int numExtensions = getNumExtensions(); if (numExtensions) { @@ -189,13 +189,12 @@ void TSymbol::dumpExtensions(TInfoSink &infoSink) const } } -void TVariable::dump(TInfoSink &infoSink, bool complete) const +void TVariable::dump(TInfoSink& infoSink, bool complete) const { if (complete) { infoSink.debug << getName().c_str() << ": " << type.getCompleteString(); dumpExtensions(infoSink); - } else - { + } else { infoSink.debug << getName().c_str() << ": " << type.getStorageQualifierString() << " " << type.getBasicTypeString(); @@ -206,7 +205,7 @@ void TVariable::dump(TInfoSink &infoSink, bool complete) const infoSink.debug << "\n"; } -void TFunction::dump(TInfoSink &infoSink, bool complete) const +void TFunction::dump(TInfoSink& infoSink, bool complete) const { if (complete) { infoSink.debug << getName().c_str() << ": " << returnType.getCompleteString() << " " << getName().c_str() @@ -222,8 +221,7 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const infoSink.debug << ")"; dumpExtensions(infoSink); - } else - { + } else { infoSink.debug << getName().c_str() << ": " << returnType.getBasicTypeString() << " " << getMangledName().c_str() << "n"; } @@ -231,20 +229,20 @@ void TFunction::dump(TInfoSink &infoSink, bool complete) const infoSink.debug << "\n"; } -void TAnonMember::dump(TInfoSink &TInfoSink, bool complete) const +void TAnonMember::dump(TInfoSink& TInfoSink, bool complete) const { TInfoSink.debug << "anonymous member " << getMemberNumber() << " of " << getAnonContainer().getName().c_str() << "\n"; } -void TSymbolTableLevel::dump(TInfoSink &infoSink, bool complete) const +void TSymbolTableLevel::dump(TInfoSink& infoSink, bool complete) const { tLevel::const_iterator it; for (it = level.begin(); it != level.end(); ++it) (*it).second->dump(infoSink, complete); } -void TSymbolTable::dump(TInfoSink &infoSink, bool complete) const +void TSymbolTable::dump(TInfoSink& infoSink, bool complete) const { for (int level = currentLevel(); level >= 0; --level) { infoSink.debug << "LEVEL " << level << "\n"; diff --git a/glslang/MachineIndependent/SymbolTable.h b/glslang/MachineIndependent/SymbolTable.h index 591858ca3c..f3873cff02 100755 --- a/glslang/MachineIndependent/SymbolTable.h +++ b/glslang/MachineIndependent/SymbolTable.h @@ -116,8 +116,8 @@ class TSymbol { } virtual int getNumExtensions() const { return extensions == nullptr ? 0 : (int)extensions->size(); } virtual const char** getExtensions() const { return extensions->data(); } - virtual void dump(TInfoSink &infoSink, bool complete = false) const = 0; - void dumpExtensions(TInfoSink &infoSink) const; + virtual void dump(TInfoSink& infoSink, bool complete = false) const = 0; + void dumpExtensions(TInfoSink& infoSink) const; virtual bool isReadOnly() const { return ! writable; } virtual void makeReadOnly() { writable = false; } @@ -193,7 +193,7 @@ class TVariable : public TSymbol { } virtual const char** getMemberExtensions(int member) const { return (*memberExtensions)[member].data(); } - virtual void dump(TInfoSink &infoSink, bool complete = false) const; + virtual void dump(TInfoSink& infoSink, bool complete = false) const; protected: explicit TVariable(const TVariable&); @@ -314,7 +314,7 @@ class TFunction : public TSymbol { virtual TParameter& operator[](int i) { assert(writable); return parameters[i]; } virtual const TParameter& operator[](int i) const { return parameters[i]; } - virtual void dump(TInfoSink &infoSink, bool complete = false) const override; + virtual void dump(TInfoSink& infoSink, bool complete = false) const override; protected: explicit TFunction(const TFunction&); @@ -374,7 +374,7 @@ class TAnonMember : public TSymbol { virtual const char** getExtensions() const override { return anonContainer.getMemberExtensions(memberNumber); } virtual int getAnonId() const { return anonId; } - virtual void dump(TInfoSink &infoSink, bool complete = false) const override; + virtual void dump(TInfoSink& infoSink, bool complete = false) const override; protected: explicit TAnonMember(const TAnonMember&); @@ -542,7 +542,7 @@ class TSymbolTableLevel { void relateToOperator(const char* name, TOperator op); void setFunctionExtensions(const char* name, int num, const char* const extensions[]); - void dump(TInfoSink &infoSink, bool complete = false) const; + void dump(TInfoSink& infoSink, bool complete = false) const; TSymbolTableLevel* clone() const; void readOnly(); @@ -843,7 +843,7 @@ class TSymbolTable { } int getMaxSymbolId() { return uniqueId; } - void dump(TInfoSink &infoSink, bool complete = false) const; + void dump(TInfoSink& infoSink, bool complete = false) const; void copyTable(const TSymbolTable& copyOf); void setPreviousDefaultPrecisions(TPrecisionQualifier *p) { table[currentLevel()]->setPreviousDefaultPrecisions(p); }