--- old/src/share/classes/com/sun/tools/javac/comp/Check.java 2011-10-23 21:53:54.820132229 -0700
+++ new/src/share/classes/com/sun/tools/javac/comp/Check.java 2011-10-23 21:53:54.751285383 -0700
@@ -987,7 +987,7 @@
* not final.
*/
private long implicitEnumFinalFlag(JCTree tree) {
- if (tree.getTag() != JCTree.CLASSDEF) return 0;
+ if (tree.getTag() != JCTree.Tag.CLASSDEF) return 0;
class SpecialTreeVisitor extends JCTree.Visitor {
boolean specialized;
SpecialTreeVisitor() {
@@ -1099,7 +1099,7 @@
// not parameterized at all.
if (tree.type.getEnclosingType().isRaw())
log.error(tree.pos(), "improperly.formed.type.inner.raw.param");
- if (tree.clazz.getTag() == JCTree.SELECT)
+ if (tree.clazz.getTag() == JCTree.Tag.SELECT)
visitSelectInternal((JCFieldAccess)tree.clazz);
}
}
@@ -2413,7 +2413,7 @@
// count them off as they're annotated
for (JCTree arg : a.args) {
- if (arg.getTag() != JCTree.ASSIGN) continue; // recovery
+ if (arg.getTag() != JCTree.Tag.ASSIGN) continue; // recovery
JCAssign assign = (JCAssign) arg;
Symbol m = TreeInfo.symbol(assign.lhs);
if (m == null || m.type.isErroneous()) continue;
@@ -2442,12 +2442,12 @@
a.args.tail == null)
return;
- if (a.args.head.getTag() != JCTree.ASSIGN) return; // error recovery
+ if (a.args.head.getTag() != JCTree.Tag.ASSIGN) return; // error recovery
JCAssign assign = (JCAssign) a.args.head;
Symbol m = TreeInfo.symbol(assign.lhs);
if (m.name != names.value) return;
JCTree rhs = assign.rhs;
- if (rhs.getTag() != JCTree.NEWARRAY) return;
+ if (rhs.getTag() != JCTree.Tag.NEWARRAY) return;
JCNewArray na = (JCNewArray) rhs;
Set targets = new HashSet();
for (JCTree elem : na.elems) {
@@ -2506,7 +2506,7 @@
try {
tree.sym.flags_field |= LOCKED;
for (JCTree def : tree.defs) {
- if (def.getTag() != JCTree.METHODDEF) continue;
+ if (def.getTag() != JCTree.Tag.METHODDEF) continue;
JCMethodDecl meth = (JCMethodDecl)def;
checkAnnotationResType(meth.pos(), meth.restype.type);
}
@@ -2614,7 +2614,7 @@
*/
int checkOperator(DiagnosticPosition pos,
OperatorSymbol operator,
- int tag,
+ JCTree.Tag tag,
Type left,
Type right) {
if (operator.opcode == ByteCodes.error) {
@@ -2650,7 +2650,8 @@
* Check for empty statements after if
*/
void checkEmptyIf(JCIf tree) {
- if (tree.thenpart.getTag() == JCTree.SKIP && tree.elsepart == null && lint.isEnabled(LintCategory.EMPTY))
+ if (tree.thenpart.getTag() == JCTree.Tag.SKIP && tree.elsepart == null &&
+ lint.isEnabled(LintCategory.EMPTY))
log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
}
@@ -2754,7 +2755,7 @@
}
// where
private boolean isCanonical(JCTree tree) {
- while (tree.getTag() == JCTree.SELECT) {
+ while (tree.getTag() == JCTree.Tag.SELECT) {
JCFieldAccess s = (JCFieldAccess) tree;
if (s.sym.owner != TreeInfo.symbol(s.selected))
return false;