Rename FileVariable -> FileVar for consistency with its class name,
likewise block and param. Reorder the layout of the Decl kind enum
so that the inheritance tree is reflected in the ordering. This allows
trivial range comparisons to determine whether something is an instance
of some abstract class, making classof faster.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Decl.cpp b/AST/Decl.cpp
index e629e9c..2011779 100644
--- a/AST/Decl.cpp
+++ b/AST/Decl.cpp
@@ -45,12 +45,12 @@
return "Typedef";
case Function:
return "Function";
- case BlockVariable:
- return "BlockVariable";
- case FileVariable:
- return "FileVariable";
- case ParmVariable:
- return "ParmVariable";
+ case BlockVar:
+ return "BlockVar";
+ case FileVar:
+ return "FileVar";
+ case ParmVar:
+ return "ParmVar";
case EnumConstant:
return "EnumConstant";
case ObjcInterface:
@@ -157,13 +157,13 @@
case Function:
nFuncs++;
break;
- case BlockVariable:
+ case BlockVar:
nBlockVars++;
break;
- case FileVariable:
+ case FileVar:
nFileVars++;
break;
- case ParmVariable:
+ case ParmVar:
nParmVars++;
break;
case EnumConstant: