Add support for global types and type resolution. Fix several minor
formatting and spacing bugs. This is sufficient for llvm-upgrade to
correctly upgrade all of llvm/test.

llvm-svn: 32114
diff --git a/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
index b35c029..f01fa15 100644
--- a/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -1471,7 +1471,7 @@
 case 58:
 YY_RULE_SETUP
 #line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(OPAQUE,OpaqueTy,"opaque",false); }
+{ RET_TOK(OPAQUE); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP