[llvm-commits] [llvm] r70502 - in /llvm/trunk/utils/TableGen: TGParser.cpp TGParser.h

[Bob Wilson]

Author: bwilson
Date: Thu Apr 30 13:26:19 2009
New Revision: 70502

URL: http://llvm.org/viewvc/llvm-project?rev=70502&view=rev
Log:
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.

Modified:
    llvm/trunk/utils/TableGen/TGParser.cpp
    llvm/trunk/utils/TableGen/TGParser.h

Modified: llvm/trunk/utils/TableGen/TGParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.cpp?rev=70502&r1=70501&r2=70502&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/TGParser.cpp (original)
+++ llvm/trunk/utils/TableGen/TGParser.cpp Thu Apr 30 13:26:19 2009
@@ -196,14 +196,14 @@
 }
 
 /// 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<RecordVal> &MCVals = CurMultiClass->Rec.getValues();
+  const std::vector<RecordVal> &MCVals = CurRec->getValues();
 
   // Add all of the values in the subclass into the current class.
   const std::vector<RecordVal> &SMCVals = SMC->Rec.getValues();
@@ -211,7 +211,7 @@
     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 @@
       if (AddValue(NewDef, SubMultiClass.RefLoc, MCVals[i]))
         return true;
 
-    CurMultiClass->DefPrototypes.push_back(NewDef);
+    CurMC->DefPrototypes.push_back(NewDef);
   }
 
   const std::vector<std::string> &SMCTArgs = SMC->Rec.getTemplateArgs();
@@ -257,8 +257,8 @@
       // 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;

Modified: llvm/trunk/utils/TableGen/TGParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.h?rev=70502&r1=70501&r2=70502&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/TGParser.h (original)
+++ llvm/trunk/utils/TableGen/TGParser.h Thu Apr 30 13:26:19 2009
@@ -67,7 +67,8 @@
   bool SetValue(Record *TheRec, TGLoc Loc, const std::string &ValName, 
                 const std::vector<unsigned> &BitList, Init *V);
   bool AddSubClass(Record *Rec, SubClassReference &SubClass);
-  bool AddSubMultiClass(MultiClass *MV, SubMultiClassReference &SubMultiClass);
+  bool AddSubMultiClass(MultiClass *CurMC,
+                        SubMultiClassReference &SubMultiClass);
 
 private:  // Parser methods.
   bool ParseObjectList();
@@ -88,7 +89,7 @@
   std::string ParseDeclaration(Record *CurRec, bool ParsingTemplateArgs);
 
   SubClassReference ParseSubClassReference(Record *CurRec, bool isDefm);
-  SubMultiClassReference ParseSubMultiClassReference(MultiClass *CurMultiClass);
+  SubMultiClassReference ParseSubMultiClassReference(MultiClass *CurMC);
 
   Init *ParseIDValue(Record *CurRec);
   Init *ParseIDValue(Record *CurRec, const std::string &Name, TGLoc NameLoc);