From f71e656631acb06098b628d393a429349443eda3 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Thu, 30 Apr 2009 18:26:19 +0000 Subject: Rename the CurMultiClass formal parameter of TGParser::AddSubMultiClass so that it doesn't shadow the instance variable of the same name. Make the parameter names in method declarations match the definitions. llvm-svn: 70502 --- llvm/utils/TableGen/TGParser.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'llvm/utils/TableGen/TGParser.cpp') diff --git a/llvm/utils/TableGen/TGParser.cpp b/llvm/utils/TableGen/TGParser.cpp index 1907cf5666e..2e2ec3118b0 100644 --- a/llvm/utils/TableGen/TGParser.cpp +++ b/llvm/utils/TableGen/TGParser.cpp @@ -196,14 +196,14 @@ bool TGParser::AddSubClass(Record *CurRec, SubClassReference &SubClass) { } /// AddSubMultiClass - Add SubMultiClass as a subclass to -/// CurMultiClass, resolving its template args as SubMultiClass's +/// CurMC, resolving its template args as SubMultiClass's /// template arguments. -bool TGParser::AddSubMultiClass(MultiClass *CurMultiClass, +bool TGParser::AddSubMultiClass(MultiClass *CurMC, SubMultiClassReference &SubMultiClass) { MultiClass *SMC = SubMultiClass.MC; - Record *CurRec = &CurMultiClass->Rec; + Record *CurRec = &CurMC->Rec; - const std::vector &MCVals = CurMultiClass->Rec.getValues(); + const std::vector &MCVals = CurRec->getValues(); // Add all of the values in the subclass into the current class. const std::vector &SMCVals = SMC->Rec.getValues(); @@ -211,7 +211,7 @@ bool TGParser::AddSubMultiClass(MultiClass *CurMultiClass, if (AddValue(CurRec, SubMultiClass.RefLoc, SMCVals[i])) return true; - int newDefStart = CurMultiClass->DefPrototypes.size(); + int newDefStart = CurMC->DefPrototypes.size(); // Add all of the defs in the subclass into the current multiclass. for (MultiClass::RecordVector::const_iterator i = SMC->DefPrototypes.begin(), @@ -226,7 +226,7 @@ bool TGParser::AddSubMultiClass(MultiClass *CurMultiClass, if (AddValue(NewDef, SubMultiClass.RefLoc, MCVals[i])) return true; - CurMultiClass->DefPrototypes.push_back(NewDef); + CurMC->DefPrototypes.push_back(NewDef); } const std::vector &SMCTArgs = SMC->Rec.getTemplateArgs(); @@ -257,8 +257,8 @@ bool TGParser::AddSubMultiClass(MultiClass *CurMultiClass, // If a value is specified for this template arg, set it in the // new defs now. for (MultiClass::RecordVector::iterator j = - CurMultiClass->DefPrototypes.begin() + newDefStart, - jend = CurMultiClass->DefPrototypes.end(); + CurMC->DefPrototypes.begin() + newDefStart, + jend = CurMC->DefPrototypes.end(); j != jend; ++j) { Record *Def = *j; -- cgit v1.2.3