6921494: provide way to print javac tree tag values
Reviewed-by: jjg, mcimadamore
Contributed-by: vicenterz@yahoo.es
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Tue Nov 08 11:51:05 2011 -0800
@@ -325,7 +325,7 @@
ListBuffer<TypeElement> elements = new ListBuffer<TypeElement>();
for (JCCompilationUnit unit : units) {
for (JCTree node : unit.defs) {
- if (node.getTag() == JCTree.CLASSDEF) {
+ if (node.hasTag(JCTree.Tag.CLASSDEF)) {
JCClassDecl cdef = (JCClassDecl) node;
if (cdef.sym != null) // maybe null if errors in anno processing
elements.append(cdef.sym);
@@ -383,12 +383,12 @@
private void handleFlowResults(Queue<Env<AttrContext>> queue, ListBuffer<Element> elems) {
for (Env<AttrContext> env: queue) {
switch (env.tree.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
JCClassDecl cdef = (JCClassDecl) env.tree;
if (cdef.sym != null)
elems.append(cdef.sym);
break;
- case JCTree.TOPLEVEL:
+ case TOPLEVEL:
JCCompilationUnit unit = (JCCompilationUnit) env.tree;
if (unit.packge != null)
elems.append(unit.packge);
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Tue Nov 08 11:51:05 2011 -0800
@@ -207,7 +207,7 @@
if (sym == null && TreeInfo.isDeclaration(tree)) {
for (TreePath p = path; p != null; p = p.getParentPath()) {
JCTree t = (JCTree) p.getLeaf();
- if (t.getTag() == JCTree.CLASSDEF) {
+ if (t.hasTag(JCTree.Tag.CLASSDEF)) {
JCClassDecl ct = (JCClassDecl) t;
if (ct.sym != null) {
if ((ct.sym.flags_field & Flags.UNATTRIBUTED) != 0) {
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
/** Enter annotations on symbols. Annotations accumulate in a queue,
* which is processed at the top level of any set of recursive calls
* requesting it be processed.
@@ -148,7 +150,7 @@
return new Attribute.Compound(a.type, List.<Pair<MethodSymbol,Attribute>>nil());
}
List<JCExpression> args = a.args;
- if (args.length() == 1 && args.head.getTag() != JCTree.ASSIGN) {
+ if (args.length() == 1 && !args.head.hasTag(ASSIGN)) {
// special case: elided "value=" assumed
args.head = make.at(args.head.pos).
Assign(make.Ident(names.value), args.head);
@@ -157,12 +159,12 @@
new ListBuffer<Pair<MethodSymbol,Attribute>>();
for (List<JCExpression> tl = args; tl.nonEmpty(); tl = tl.tail) {
JCExpression t = tl.head;
- if (t.getTag() != JCTree.ASSIGN) {
+ if (!t.hasTag(ASSIGN)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
continue;
}
JCAssign assign = (JCAssign)t;
- if (assign.lhs.getTag() != JCTree.IDENT) {
+ if (!assign.lhs.hasTag(IDENT)) {
log.error(t.pos(), "annotation.value.must.be.name.value");
continue;
}
@@ -222,14 +224,14 @@
(((JCFieldAccess) tree).selected).type);
}
if ((expected.tsym.flags() & Flags.ANNOTATION) != 0) {
- if (tree.getTag() != JCTree.ANNOTATION) {
+ if (!tree.hasTag(ANNOTATION)) {
log.error(tree.pos(), "annotation.value.must.be.annotation");
expected = syms.errorType;
}
return enterAnnotation((JCAnnotation)tree, expected, env);
}
if (expected.tag == TypeTags.ARRAY) { // should really be isArray()
- if (tree.getTag() != JCTree.NEWARRAY) {
+ if (!tree.hasTag(NEWARRAY)) {
tree = make.at(tree.pos).
NewArray(null, List.<JCExpression>nil(), List.of(tree));
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue Nov 08 11:51:05 2011 -0800
@@ -49,8 +49,13 @@
import com.sun.source.util.SimpleTreeVisitor;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This is the main context-dependent analysis phase in GJC. It
* encompasses name resolution, type checking and constant folding as
@@ -245,7 +250,7 @@
((v.flags() & HASINIT) != 0
||
!((base == null ||
- (base.getTag() == JCTree.IDENT && TreeInfo.name(base) == names._this)) &&
+ (base.hasTag(IDENT) && TreeInfo.name(base) == names._this)) &&
isAssignableAsBlankFinal(v, env)))) {
if (v.isResourceVariable()) { //TWR resource
log.error(pos, "try.resource.may.not.be.assigned", v);
@@ -263,7 +268,7 @@
* @param tree The candidate tree.
*/
boolean isStaticReference(JCTree tree) {
- if (tree.getTag() == JCTree.SELECT) {
+ if (tree.hasTag(SELECT)) {
Symbol lsym = TreeInfo.symbol(((JCFieldAccess) tree).selected);
if (lsym == null || lsym.kind != TYP) {
return false;
@@ -693,7 +698,7 @@
// disable implicit outer instance from being passed.
// (This would be an illegal access to "this before super").
if (env.info.isSelfCall &&
- env.tree.getTag() == JCTree.NEWCLASS &&
+ env.tree.hasTag(NEWCLASS) &&
((JCNewClass) env.tree).encl == null)
{
c.flags_field |= NOOUTERTHIS;
@@ -863,7 +868,7 @@
chk.checkDeprecatedAnnotation(tree.pos(), v);
if (tree.init != null) {
- if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+ if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
// In this case, `v' is final. Ensure that it's initializer is
// evaluated.
v.getConstValue(); // ensure initializer is evaluated
@@ -971,8 +976,8 @@
public void visitLabelled(JCLabeledStatement tree) {
// Check that label is not used in an enclosing statement
Env<AttrContext> env1 = env;
- while (env1 != null && env1.tree.getTag() != JCTree.CLASSDEF) {
- if (env1.tree.getTag() == JCTree.LABELLED &&
+ while (env1 != null && !env1.tree.hasTag(CLASSDEF)) {
+ if (env1.tree.hasTag(LABELLED) &&
((JCLabeledStatement) env1.tree).label == tree.label) {
log.error(tree.pos(), "label.already.in.use",
tree.label);
@@ -1052,14 +1057,14 @@
private static void addVars(List<JCStatement> stats, Scope switchScope) {
for (;stats.nonEmpty(); stats = stats.tail) {
JCTree stat = stats.head;
- if (stat.getTag() == JCTree.VARDEF)
+ if (stat.hasTag(VARDEF))
switchScope.enter(((JCVariableDecl) stat).sym);
}
}
// where
/** Return the selected enumeration constant symbol, or null. */
private Symbol enumConstant(JCTree tree, Type enumType) {
- if (tree.getTag() != JCTree.IDENT) {
+ if (!tree.hasTag(IDENT)) {
log.error(tree.pos(), "enum.label.must.be.unqualified.enum");
return syms.errSymbol;
}
@@ -1094,7 +1099,7 @@
localEnv;
// Attribute resource declarations
for (JCTree resource : tree.resources) {
- if (resource.getTag() == JCTree.VARDEF) {
+ if (resource.hasTag(VARDEF)) {
attribStat(resource, tryEnv);
chk.checkType(resource, resource.type, syms.autoCloseableType, "try.not.applicable.to.type");
@@ -1312,7 +1317,7 @@
* @param env The environment current at the jump statement.
*/
private JCTree findJumpTarget(DiagnosticPosition pos,
- int tag,
+ JCTree.Tag tag,
Name label,
Env<AttrContext> env) {
// Search environments outwards from the point of jump.
@@ -1320,15 +1325,15 @@
LOOP:
while (env1 != null) {
switch (env1.tree.getTag()) {
- case JCTree.LABELLED:
+ case LABELLED:
JCLabeledStatement labelled = (JCLabeledStatement)env1.tree;
if (label == labelled.label) {
// If jump is a continue, check that target is a loop.
- if (tag == JCTree.CONTINUE) {
- if (labelled.body.getTag() != JCTree.DOLOOP &&
- labelled.body.getTag() != JCTree.WHILELOOP &&
- labelled.body.getTag() != JCTree.FORLOOP &&
- labelled.body.getTag() != JCTree.FOREACHLOOP)
+ if (tag == CONTINUE) {
+ if (!labelled.body.hasTag(DOLOOP) &&
+ !labelled.body.hasTag(WHILELOOP) &&
+ !labelled.body.hasTag(FORLOOP) &&
+ !labelled.body.hasTag(FOREACHLOOP))
log.error(pos, "not.loop.label", label);
// Found labelled statement target, now go inwards
// to next non-labelled tree.
@@ -1338,17 +1343,17 @@
}
}
break;
- case JCTree.DOLOOP:
- case JCTree.WHILELOOP:
- case JCTree.FORLOOP:
- case JCTree.FOREACHLOOP:
+ case DOLOOP:
+ case WHILELOOP:
+ case FORLOOP:
+ case FOREACHLOOP:
if (label == null) return env1.tree;
break;
- case JCTree.SWITCH:
- if (label == null && tag == JCTree.BREAK) return env1.tree;
+ case SWITCH:
+ if (label == null && tag == BREAK) return env1.tree;
break;
- case JCTree.METHODDEF:
- case JCTree.CLASSDEF:
+ case METHODDEF:
+ case CLASSDEF:
break LOOP;
default:
}
@@ -1356,7 +1361,7 @@
}
if (label != null)
log.error(pos, "undef.label", label);
- else if (tag == JCTree.CONTINUE)
+ else if (tag == CONTINUE)
log.error(pos, "cont.outside.loop");
else
log.error(pos, "break.outside.switch.loop");
@@ -1452,7 +1457,7 @@
if (encl.tag == CLASS) {
// we are calling a nested class
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
JCTree qualifier = ((JCFieldAccess) tree.meth).selected;
// We are seeing a prefixed call, of the form
@@ -1468,7 +1473,7 @@
rs.resolveImplicitThis(tree.meth.pos(),
localEnv, site, true);
}
- } else if (tree.meth.getTag() == JCTree.SELECT) {
+ } else if (tree.meth.hasTag(SELECT)) {
log.error(tree.meth.pos(), "illegal.qual.not.icls",
site.tsym);
}
@@ -1522,7 +1527,7 @@
// as a special case, array.clone() has a result that is
// the same as static type of the array being cloned
- if (tree.meth.getTag() == JCTree.SELECT &&
+ if (tree.meth.hasTag(SELECT) &&
allowCovariantReturns &&
methName == names.clone &&
types.isArray(((JCFieldAccess) tree.meth).selected.type))
@@ -1531,7 +1536,7 @@
// as a special case, x.getClass() has type Class<? extends |X|>
if (allowGenerics &&
methName == names.getClass && tree.args.isEmpty()) {
- Type qualifier = (tree.meth.getTag() == JCTree.SELECT)
+ Type qualifier = (tree.meth.hasTag(SELECT))
? ((JCFieldAccess) tree.meth).selected.type
: env.enclClass.sym.type;
restype = new
@@ -1560,7 +1565,7 @@
JCMethodDecl enclMethod = env.enclMethod;
if (enclMethod != null && enclMethod.name == names.init) {
JCBlock body = enclMethod.body;
- if (body.stats.head.getTag() == JCTree.EXEC &&
+ if (body.stats.head.hasTag(EXEC) &&
((JCExpressionStatement) body.stats.head).expr == tree)
return true;
}
@@ -1591,7 +1596,7 @@
// complete class name to be fully qualified
JCExpression clazz = tree.clazz; // Class field following new
JCExpression clazzid = // Identifier in class field
- (clazz.getTag() == JCTree.TYPEAPPLY)
+ (clazz.hasTag(TYPEAPPLY))
? ((JCTypeApply) clazz).clazz
: clazz;
@@ -1610,7 +1615,7 @@
attribExpr(tree.encl, env));
clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
((JCIdent) clazzid).name);
- if (clazz.getTag() == JCTree.TYPEAPPLY)
+ if (clazz.hasTag(TYPEAPPLY))
clazz = make.at(tree.pos).
TypeApply(clazzid1,
((JCTypeApply) clazz).arguments);
@@ -1689,7 +1694,7 @@
// Enums may not be instantiated except implicitly
if (allowEnums &&
(clazztype.tsym.flags_field&Flags.ENUM) != 0 &&
- (env.tree.getTag() != JCTree.VARDEF ||
+ (!env.tree.hasTag(VARDEF) ||
(((JCVariableDecl) env.tree).mods.flags&Flags.ENUM) == 0 ||
((JCVariableDecl) env.tree).init != tree))
log.error(tree.pos(), "enum.cant.be.instantiated");
@@ -1930,7 +1935,7 @@
Name name = TreeInfo.name(arg);
if (name == names._this || name == names._super) return arg;
- int optag = JCTree.NULLCHK;
+ JCTree.Tag optag = NULLCHK;
JCUnary tree = make.at(arg.pos).Unary(optag, arg);
tree.operator = syms.nullcheck;
tree.type = arg.type;
@@ -1991,7 +1996,7 @@
Type operand = attribExpr(tree.rhs, env);
// Find operator.
Symbol operator = tree.operator = rs.resolveBinaryOperator(
- tree.pos(), tree.getTag() - JCTree.ASGOffset, env,
+ tree.pos(), tree.getTag().noAssignOp(), env,
owntype, operand);
if (operator.kind == MTH &&
@@ -1999,7 +2004,7 @@
!operand.isErroneous()) {
chk.checkOperator(tree.pos(),
(OperatorSymbol)operator,
- tree.getTag() - JCTree.ASGOffset,
+ tree.getTag().noAssignOp(),
owntype,
operand);
chk.checkDivZero(tree.rhs.pos(), operator, operand);
@@ -2012,7 +2017,7 @@
public void visitUnary(JCUnary tree) {
// Attribute arguments.
- Type argtype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+ Type argtype = (tree.getTag().isIncOrDecUnaryOp())
? attribTree(tree.arg, env, VAR, Type.noType)
: chk.checkNonVoid(tree.arg.pos(), attribExpr(tree.arg, env));
@@ -2023,7 +2028,7 @@
Type owntype = types.createErrorType(tree.type);
if (operator.kind == MTH &&
!argtype.isErroneous()) {
- owntype = (JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC)
+ owntype = (tree.getTag().isIncOrDecUnaryOp())
? tree.arg.type
: operator.type.getReturnType();
int opc = ((OperatorSymbol)operator).opcode;
@@ -2621,7 +2626,7 @@
canOwnInitializer(env.info.scope.owner) &&
v.owner == env.info.scope.owner.enclClass() &&
((v.flags() & STATIC) != 0) == Resolve.isStatic(env) &&
- (env.tree.getTag() != JCTree.ASSIGN ||
+ (!env.tree.hasTag(ASSIGN) ||
TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
String suffix = (env.info.enclVar == v) ?
"self.ref" : "forward.ref";
@@ -2812,10 +2817,10 @@
}
Type elemtype = types.elemtype(argtype);
switch (tree.getTag()) {
- case JCTree.APPLY:
+ case APPLY:
((JCMethodInvocation) tree).varargsElement = elemtype;
break;
- case JCTree.NEWCLASS:
+ case NEWCLASS:
((JCNewClass) tree).varargsElement = elemtype;
break;
default:
@@ -2896,9 +2901,9 @@
if (clazzOuter.tag == CLASS) {
Type site;
JCExpression clazz = TreeInfo.typeIn(tree.clazz);
- if (clazz.getTag() == JCTree.IDENT) {
+ if (clazz.hasTag(IDENT)) {
site = env.enclClass.sym.type;
- } else if (clazz.getTag() == JCTree.SELECT) {
+ } else if (clazz.hasTag(SELECT)) {
site = ((JCFieldAccess) clazz).selected.type;
} else throw new AssertionError(""+tree);
if (clazzOuter.tag == CLASS && site != clazzOuter) {
@@ -3068,7 +3073,7 @@
* Attribute an env for either a top level tree or class declaration.
*/
public void attrib(Env<AttrContext> env) {
- if (env.tree.getTag() == JCTree.TOPLEVEL)
+ if (env.tree.hasTag(TOPLEVEL))
attribTopLevel(env);
else
attribClass(env.tree.pos(), env.enclClass.sym);
@@ -3245,7 +3250,7 @@
((c.flags() & STATIC) == 0 || c.name == names.empty) &&
(TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
Symbol sym = null;
- if (l.head.getTag() == JCTree.VARDEF) sym = ((JCVariableDecl) l.head).sym;
+ if (l.head.hasTag(VARDEF)) sym = ((JCVariableDecl) l.head).sym;
if (sym == null ||
sym.kind != VAR ||
((VarSymbol) sym).getConstValue() == null)
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Nov 08 11:51:05 2011 -0800
@@ -42,10 +42,14 @@
import com.sun.tools.javac.code.Symbol.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.code.Flags.SYNCHRONIZED;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTags.WILDCARD;
import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Type checking helper class for the attribution phase.
*
@@ -987,7 +991,7 @@
* <i>not</i> final.
*/
private long implicitEnumFinalFlag(JCTree tree) {
- if (tree.getTag() != JCTree.CLASSDEF) return 0;
+ if (!tree.hasTag(CLASSDEF)) return 0;
class SpecialTreeVisitor extends JCTree.Visitor {
boolean specialized;
SpecialTreeVisitor() {
@@ -1099,7 +1103,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.hasTag(SELECT))
visitSelectInternal((JCFieldAccess)tree.clazz);
}
}
@@ -2413,7 +2417,7 @@
// count them off as they're annotated
for (JCTree arg : a.args) {
- if (arg.getTag() != JCTree.ASSIGN) continue; // recovery
+ if (!arg.hasTag(ASSIGN)) continue; // recovery
JCAssign assign = (JCAssign) arg;
Symbol m = TreeInfo.symbol(assign.lhs);
if (m == null || m.type.isErroneous()) continue;
@@ -2442,12 +2446,12 @@
a.args.tail == null)
return;
- if (a.args.head.getTag() != JCTree.ASSIGN) return; // error recovery
+ if (!a.args.head.hasTag(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.hasTag(NEWARRAY)) return;
JCNewArray na = (JCNewArray) rhs;
Set<Symbol> targets = new HashSet<Symbol>();
for (JCTree elem : na.elems) {
@@ -2506,7 +2510,7 @@
try {
tree.sym.flags_field |= LOCKED;
for (JCTree def : tree.defs) {
- if (def.getTag() != JCTree.METHODDEF) continue;
+ if (!def.hasTag(METHODDEF)) continue;
JCMethodDecl meth = (JCMethodDecl)def;
checkAnnotationResType(meth.pos(), meth.restype.type);
}
@@ -2614,7 +2618,7 @@
*/
int checkOperator(DiagnosticPosition pos,
OperatorSymbol operator,
- int tag,
+ JCTree.Tag tag,
Type left,
Type right) {
if (operator.opcode == ByteCodes.error) {
@@ -2650,7 +2654,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.hasTag(SKIP) && tree.elsepart == null &&
+ lint.isEnabled(LintCategory.EMPTY))
log.warning(LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
}
@@ -2754,7 +2759,7 @@
}
// where
private boolean isCanonical(JCTree tree) {
- while (tree.getTag() == JCTree.SELECT) {
+ while (tree.hasTag(SELECT)) {
JCFieldAccess s = (JCFieldAccess) tree;
if (s.sym.owner != TreeInfo.symbol(s.selected))
return false;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Tue Nov 08 11:51:05 2011 -0800
@@ -228,7 +228,7 @@
* only, and members go into the class member scope.
*/
Scope enterScope(Env<AttrContext> env) {
- return (env.tree.getTag() == JCTree.CLASSDEF)
+ return (env.tree.hasTag(JCTree.Tag.CLASSDEF))
? ((JCClassDecl) env.tree).sym.members_field
: env.info.scope;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -116,9 +116,9 @@
/** Return closest enclosing environment which points to a tree with given tag.
*/
- public Env<A> enclosing(int tag) {
+ public Env<A> enclosing(JCTree.Tag tag) {
Env<A> env1 = this;
- while (env1 != null && env1.tree.getTag() != tag) env1 = env1.next;
+ while (env1 != null && !env1.tree.hasTag(tag)) env1 = env1.next;
return env1;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Nov 08 11:51:05 2011 -0800
@@ -40,8 +40,10 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This pass implements dataflow analysis for Java programs.
* Liveness analysis checks that every statement is reachable.
@@ -321,7 +323,7 @@
log.error(exit.tree.pos(),
"unreported.exception.default.constructor",
exit.thrown);
- } else if (exit.tree.getTag() == JCTree.VARDEF &&
+ } else if (exit.tree.hasTag(VARDEF) &&
((JCVariableDecl)exit.tree).sym.isResourceVariable()) {
log.error(exit.tree.pos(),
"unreported.exception.implicit.close",
@@ -416,7 +418,7 @@
*/
void letInit(JCTree tree) {
tree = TreeInfo.skipParens(tree);
- if (tree.getTag() == JCTree.IDENT || tree.getTag() == JCTree.SELECT) {
+ if (tree.hasTag(IDENT) || tree.hasTag(SELECT)) {
Symbol sym = TreeInfo.symbol(tree);
if (sym.kind == VAR) {
letInit(tree.pos(), (VarSymbol)sym);
@@ -452,7 +454,7 @@
pendingExits = oldPendingExits;
for (; exits.nonEmpty(); exits = exits.tail) {
PendingExit exit = exits.head;
- if (exit.tree.getTag() == JCTree.BREAK &&
+ if (exit.tree.hasTag(BREAK) &&
((JCBreak) exit.tree).target == tree) {
inits.andSet(exit.inits);
uninits.andSet(exit.uninits);
@@ -471,7 +473,7 @@
pendingExits = new ListBuffer<PendingExit>();
for (; exits.nonEmpty(); exits = exits.tail) {
PendingExit exit = exits.head;
- if (exit.tree.getTag() == JCTree.CONTINUE &&
+ if (exit.tree.hasTag(CONTINUE) &&
((JCContinue) exit.tree).target == tree) {
inits.andSet(exit.inits);
uninits.andSet(exit.uninits);
@@ -517,7 +519,7 @@
*/
void scanDef(JCTree tree) {
scanStat(tree);
- if (tree != null && tree.getTag() == JCTree.BLOCK && !alive) {
+ if (tree != null && tree.hasTag(JCTree.Tag.BLOCK) && !alive) {
log.error(tree.pos(),
"initializer.must.be.able.to.complete.normally");
}
@@ -528,7 +530,7 @@
void scanStat(JCTree tree) {
if (!alive && tree != null) {
log.error(tree.pos(), "unreachable.stmt");
- if (tree.getTag() != JCTree.SKIP) alive = true;
+ if (!tree.hasTag(SKIP)) alive = true;
}
scan(tree);
}
@@ -614,7 +616,7 @@
try {
// define all the static fields
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.VARDEF) {
+ if (l.head.hasTag(VARDEF)) {
JCVariableDecl def = (JCVariableDecl)l.head;
if ((def.mods.flags & STATIC) != 0) {
VarSymbol sym = def.sym;
@@ -626,7 +628,7 @@
// process all the static initializers
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() != JCTree.METHODDEF &&
+ if (!l.head.hasTag(METHODDEF) &&
(TreeInfo.flags(l.head) & STATIC) != 0) {
scanDef(l.head);
errorUncaught();
@@ -653,7 +655,7 @@
// define all the instance fields
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.VARDEF) {
+ if (l.head.hasTag(VARDEF)) {
JCVariableDecl def = (JCVariableDecl)l.head;
if ((def.mods.flags & STATIC) == 0) {
VarSymbol sym = def.sym;
@@ -665,7 +667,7 @@
// process all the instance initializers
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() != JCTree.METHODDEF &&
+ if (!l.head.hasTag(METHODDEF) &&
(TreeInfo.flags(l.head) & STATIC) == 0) {
scanDef(l.head);
errorUncaught();
@@ -691,7 +693,7 @@
// process all the methods
for (List<JCTree> l = tree.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.METHODDEF) {
+ if (l.head.hasTag(METHODDEF)) {
scan(l.head);
errorUncaught();
}
@@ -760,7 +762,7 @@
PendingExit exit = exits.head;
exits = exits.tail;
if (exit.thrown == null) {
- Assert.check(exit.tree.getTag() == JCTree.RETURN);
+ Assert.check(exit.tree.hasTag(RETURN));
if (isInitialConstructor) {
inits = exit.inits;
for (int i = firstadr; i < nextadr; i++)
@@ -989,7 +991,7 @@
Bits uninits) {
for (;stats.nonEmpty(); stats = stats.tail) {
JCTree stat = stats.head;
- if (stat.getTag() == JCTree.VARDEF) {
+ if (stat.hasTag(VARDEF)) {
int adr = ((JCVariableDecl) stat).sym.adr;
inits.excl(adr);
uninits.incl(adr);
@@ -1346,7 +1348,7 @@
public void visitUnary(JCUnary tree) {
switch (tree.getTag()) {
- case JCTree.NOT:
+ case NOT:
scanCond(tree.arg);
Bits t = initsWhenFalse;
initsWhenFalse = initsWhenTrue;
@@ -1355,8 +1357,8 @@
uninitsWhenFalse = uninitsWhenTrue;
uninitsWhenTrue = t;
break;
- case JCTree.PREINC: case JCTree.POSTINC:
- case JCTree.PREDEC: case JCTree.POSTDEC:
+ case PREINC: case POSTINC:
+ case PREDEC: case POSTDEC:
scanExpr(tree.arg);
letInit(tree.arg);
break;
@@ -1367,7 +1369,7 @@
public void visitBinary(JCBinary tree) {
switch (tree.getTag()) {
- case JCTree.AND:
+ case AND:
scanCond(tree.lhs);
Bits initsWhenFalseLeft = initsWhenFalse;
Bits uninitsWhenFalseLeft = uninitsWhenFalse;
@@ -1377,7 +1379,7 @@
initsWhenFalse.andSet(initsWhenFalseLeft);
uninitsWhenFalse.andSet(uninitsWhenFalseLeft);
break;
- case JCTree.OR:
+ case OR:
scanCond(tree.lhs);
Bits initsWhenTrueLeft = initsWhenTrue;
Bits uninitsWhenTrueLeft = uninitsWhenTrue;
@@ -1418,7 +1420,7 @@
private boolean is292targetTypeCast(JCTypeCast tree) {
boolean is292targetTypeCast = false;
JCExpression expr = TreeInfo.skipParens(tree.expr);
- if (expr.getTag() == JCTree.APPLY) {
+ if (expr.hasTag(APPLY)) {
JCMethodInvocation apply = (JCMethodInvocation)expr;
Symbol sym = TreeInfo.symbol(apply.meth);
is292targetTypeCast = sym != null &&
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Tue Nov 08 11:51:05 2011 -0800
@@ -633,13 +633,13 @@
//the polymorphic signature call environment is nested.
switch (env.next.tree.getTag()) {
- case JCTree.TYPECAST:
+ case TYPECAST:
JCTypeCast castTree = (JCTypeCast)env.next.tree;
restype = (TreeInfo.skipParens(castTree.expr) == env.tree) ?
castTree.clazz.type :
syms.objectType;
break;
- case JCTree.EXEC:
+ case EXEC:
JCTree.JCExpressionStatement execTree =
(JCTree.JCExpressionStatement)env.next.tree;
restype = (TreeInfo.skipParens(execTree.expr) == env.tree) ?
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue Nov 08 11:51:05 2011 -0800
@@ -42,9 +42,11 @@
import com.sun.tools.javac.jvm.Target;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.jvm.ByteCodes.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** This pass translates away some syntactic sugar: inner classes,
* class literals, assertions, foreach loops, etc.
@@ -303,7 +305,7 @@
Symbol constructor = TreeInfo.symbol(tree.meth);
ClassSymbol c = (ClassSymbol)constructor.owner;
if (c.hasOuterInstance() &&
- tree.meth.getTag() != JCTree.SELECT &&
+ !tree.meth.hasTag(SELECT) &&
outerThisStack.head != null)
visitSymbol(outerThisStack.head);
}
@@ -508,7 +510,7 @@
* @param optag The operators tree tag.
* @param arg The operator's argument.
*/
- JCUnary makeUnary(int optag, JCExpression arg) {
+ JCUnary makeUnary(JCTree.Tag optag, JCExpression arg) {
JCUnary tree = make.Unary(optag, arg);
tree.operator = rs.resolveUnaryOperator(
make_pos, optag, attrEnv, arg.type);
@@ -521,7 +523,7 @@
* @param lhs The operator's left argument.
* @param rhs The operator's right argument.
*/
- JCBinary makeBinary(int optag, JCExpression lhs, JCExpression rhs) {
+ JCBinary makeBinary(JCTree.Tag optag, JCExpression lhs, JCExpression rhs) {
JCBinary tree = make.Binary(optag, lhs, rhs);
tree.operator = rs.resolveBinaryOperator(
make_pos, optag, attrEnv, lhs.type, rhs.type);
@@ -534,10 +536,10 @@
* @param lhs The operator's left argument.
* @param rhs The operator's right argument.
*/
- JCAssignOp makeAssignop(int optag, JCTree lhs, JCTree rhs) {
+ JCAssignOp makeAssignop(JCTree.Tag optag, JCTree lhs, JCTree rhs) {
JCAssignOp tree = make.Assignop(optag, lhs, rhs);
tree.operator = rs.resolveBinaryOperator(
- make_pos, tree.getTag() - JCTree.ASGOffset, attrEnv, lhs.type, rhs.type);
+ make_pos, tree.getTag().noAssignOp(), attrEnv, lhs.type, rhs.type);
tree.type = lhs.type;
return tree;
}
@@ -720,7 +722,7 @@
// where
private boolean isTranslatedClassAvailable(ClassSymbol c) {
for (JCTree tree: translated) {
- if (tree.getTag() == JCTree.CLASSDEF
+ if (tree.hasTag(CLASSDEF)
&& ((JCClassDecl) tree).sym == c) {
return true;
}
@@ -802,13 +804,13 @@
private static int accessCode(JCTree tree, JCTree enclOp) {
if (enclOp == null)
return DEREFcode;
- else if (enclOp.getTag() == JCTree.ASSIGN &&
+ else if (enclOp.hasTag(ASSIGN) &&
tree == TreeInfo.skipParens(((JCAssign) enclOp).lhs))
return ASSIGNcode;
- else if (JCTree.PREINC <= enclOp.getTag() && enclOp.getTag() <= JCTree.POSTDEC &&
+ else if (enclOp.getTag().isIncOrDecUnaryOp() &&
tree == TreeInfo.skipParens(((JCUnary) enclOp).arg))
- return (enclOp.getTag() - JCTree.PREINC) * 2 + PREINCcode;
- else if (JCTree.BITOR_ASG <= enclOp.getTag() && enclOp.getTag() <= JCTree.MOD_ASG &&
+ return mapTagToUnaryOpCode(enclOp.getTag());
+ else if (enclOp.getTag().isAssignop() &&
tree == TreeInfo.skipParens(((JCAssignOp) enclOp).lhs))
return accessCode(((OperatorSymbol) ((JCAssignOp) enclOp).operator).opcode);
else
@@ -832,39 +834,39 @@
/** Return tree tag for assignment operation corresponding
* to given binary operator.
*/
- private static int treeTag(OperatorSymbol operator) {
+ private static JCTree.Tag treeTag(OperatorSymbol operator) {
switch (operator.opcode) {
case ByteCodes.ior: case ByteCodes.lor:
- return JCTree.BITOR_ASG;
+ return BITOR_ASG;
case ByteCodes.ixor: case ByteCodes.lxor:
- return JCTree.BITXOR_ASG;
+ return BITXOR_ASG;
case ByteCodes.iand: case ByteCodes.land:
- return JCTree.BITAND_ASG;
+ return BITAND_ASG;
case ByteCodes.ishl: case ByteCodes.lshl:
case ByteCodes.ishll: case ByteCodes.lshll:
- return JCTree.SL_ASG;
+ return SL_ASG;
case ByteCodes.ishr: case ByteCodes.lshr:
case ByteCodes.ishrl: case ByteCodes.lshrl:
- return JCTree.SR_ASG;
+ return SR_ASG;
case ByteCodes.iushr: case ByteCodes.lushr:
case ByteCodes.iushrl: case ByteCodes.lushrl:
- return JCTree.USR_ASG;
+ return USR_ASG;
case ByteCodes.iadd: case ByteCodes.ladd:
case ByteCodes.fadd: case ByteCodes.dadd:
case ByteCodes.string_add:
- return JCTree.PLUS_ASG;
+ return PLUS_ASG;
case ByteCodes.isub: case ByteCodes.lsub:
case ByteCodes.fsub: case ByteCodes.dsub:
- return JCTree.MINUS_ASG;
+ return MINUS_ASG;
case ByteCodes.imul: case ByteCodes.lmul:
case ByteCodes.fmul: case ByteCodes.dmul:
- return JCTree.MUL_ASG;
+ return MUL_ASG;
case ByteCodes.idiv: case ByteCodes.ldiv:
case ByteCodes.fdiv: case ByteCodes.ddiv:
- return JCTree.DIV_ASG;
+ return DIV_ASG;
case ByteCodes.imod: case ByteCodes.lmod:
case ByteCodes.fmod: case ByteCodes.dmod:
- return JCTree.MOD_ASG;
+ return MOD_ASG;
default:
throw new AssertionError();
}
@@ -1003,7 +1005,7 @@
if (!currentClass.isSubClass(sym.owner, types))
return true;
if ((sym.flags() & STATIC) != 0 ||
- tree.getTag() != JCTree.SELECT ||
+ !tree.hasTag(SELECT) ||
TreeInfo.name(((JCFieldAccess) tree).selected) == names._super)
return false;
return !((JCFieldAccess) tree).selected.type.tsym.isSubClass(currentClass, types);
@@ -1018,7 +1020,7 @@
if (protAccess) {
Symbol qualifier = null;
ClassSymbol c = currentClass;
- if (tree.getTag() == JCTree.SELECT && (sym.flags() & STATIC) == 0) {
+ if (tree.hasTag(SELECT) && (sym.flags() & STATIC) == 0) {
qualifier = ((JCFieldAccess) tree).selected.type.tsym;
while (!qualifier.isSubClass(c, types)) {
c = c.owner.enclClass();
@@ -1058,7 +1060,7 @@
Assert.check(sym != null && (sym.flags_field & FINAL) != 0);
tree = make.at(tree.pos).Ident(sym);
}
- JCExpression base = (tree.getTag() == JCTree.SELECT) ? ((JCFieldAccess) tree).selected : null;
+ JCExpression base = (tree.hasTag(SELECT)) ? ((JCFieldAccess) tree).selected : null;
switch (sym.kind) {
case TYP:
if (sym.owner.kind != PCK) {
@@ -1068,11 +1070,11 @@
while (base != null &&
TreeInfo.symbol(base) != null &&
TreeInfo.symbol(base).kind != PCK) {
- base = (base.getTag() == JCTree.SELECT)
+ base = (base.hasTag(SELECT))
? ((JCFieldAccess) base).selected
: null;
}
- if (tree.getTag() == JCTree.IDENT) {
+ if (tree.hasTag(IDENT)) {
((JCIdent) tree).name = flatname;
} else if (base == null) {
tree = make.at(tree.pos).Ident(sym);
@@ -1220,6 +1222,42 @@
}
}
+ /** Maps unary operator integer codes to JCTree.Tag objects
+ * @param unaryOpCode the unary operator code
+ */
+ private static Tag mapUnaryOpCodeToTag(int unaryOpCode){
+ switch (unaryOpCode){
+ case PREINCcode:
+ return PREINC;
+ case PREDECcode:
+ return PREDEC;
+ case POSTINCcode:
+ return POSTINC;
+ case POSTDECcode:
+ return POSTDEC;
+ default:
+ return NO_TAG;
+ }
+ }
+
+ /** Maps JCTree.Tag objects to unary operator integer codes
+ * @param tag the JCTree.Tag
+ */
+ private static int mapTagToUnaryOpCode(Tag tag){
+ switch (tag){
+ case PREINC:
+ return PREINCcode;
+ case PREDEC:
+ return PREDECcode;
+ case POSTINC:
+ return POSTINCcode;
+ case POSTDEC:
+ return POSTDECcode;
+ default:
+ return -1;
+ }
+ }
+
/** Construct definition of an access method.
* @param pos The source code position of the definition.
* @param vsym The private or protected symbol.
@@ -1259,8 +1297,7 @@
expr = make.Assign(ref, args.head);
break;
case PREINCcode: case POSTINCcode: case PREDECcode: case POSTDECcode:
- expr = makeUnary(
- ((acode1 - PREINCcode) >> 1) + JCTree.PREINC, ref);
+ expr = makeUnary(mapUnaryOpCodeToTag(acode1), ref);
break;
default:
expr = make.Assignop(
@@ -1576,7 +1613,7 @@
}
private JCExpression makeNonNullCheck(JCExpression expression) {
- return makeBinary(JCTree.NE, expression, makeNull());
+ return makeBinary(NE, expression, makeNull());
}
/** Construct a tree that represents the outer instance
@@ -1808,7 +1845,7 @@
// $newcache.getClass().getComponentType().getClassLoader() : cl$"
JCExpression clvalue =
make.Conditional(
- makeBinary(JCTree.EQ, make.Ident(clsym), makeNull()),
+ makeBinary(EQ, make.Ident(clsym), makeNull()),
make.Assign(
make.Ident(clsym),
makeCall(
@@ -1976,7 +2013,7 @@
writer.xClassName(type).toString().replace('/', '.');
Symbol cs = cacheSym(pos, sig);
return make_at(pos).Conditional(
- makeBinary(JCTree.EQ, make.Ident(cs), makeNull()),
+ makeBinary(EQ, make.Ident(cs), makeNull()),
make.Assign(
make.Ident(cs),
make.App(
@@ -2023,7 +2060,7 @@
List.<Type>nil());
JCClassDecl containerDef = classDef(container);
make_at(containerDef.pos());
- JCExpression notStatus = makeUnary(JCTree.NOT, make.App(make.Select(
+ JCExpression notStatus = makeUnary(NOT, make.App(make.Select(
classOfType(types.erasure(outermostClass.type),
containerDef.pos()),
desiredAssertionStatusSym)));
@@ -2032,7 +2069,7 @@
containerDef.defs = containerDef.defs.prepend(assertDisabledDef);
}
make_at(pos);
- return makeUnary(JCTree.NOT, make.Ident(assertDisabledSym));
+ return makeUnary(NOT, make.Ident(assertDisabledSym));
}
@@ -2062,9 +2099,9 @@
JCTree abstractRval(JCTree rval, Type type, TreeBuilder builder) {
rval = TreeInfo.skipParens(rval);
switch (rval.getTag()) {
- case JCTree.LITERAL:
+ case LITERAL:
return builder.build(rval);
- case JCTree.IDENT:
+ case IDENT:
JCIdent id = (JCIdent) rval;
if ((id.sym.flags() & FINAL) != 0 && id.sym.owner.kind == MTH)
return builder.build(rval);
@@ -2097,9 +2134,9 @@
JCTree abstractLval(JCTree lval, final TreeBuilder builder) {
lval = TreeInfo.skipParens(lval);
switch (lval.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return builder.build(lval);
- case JCTree.SELECT: {
+ case SELECT: {
final JCFieldAccess s = (JCFieldAccess)lval;
JCTree selected = TreeInfo.skipParens(s.selected);
Symbol lid = TreeInfo.symbol(s.selected);
@@ -2110,7 +2147,7 @@
}
});
}
- case JCTree.INDEXED: {
+ case INDEXED: {
final JCArrayAccess i = (JCArrayAccess)lval;
return abstractRval(i.indexed, new TreeBuilder() {
public JCTree build(final JCTree indexed) {
@@ -2125,7 +2162,7 @@
}
});
}
- case JCTree.TYPECAST: {
+ case TYPECAST: {
return abstractLval(((JCTypeCast)lval).expr, builder);
}
}
@@ -2345,7 +2382,7 @@
for (List<JCTree> defs = tree.defs;
defs.nonEmpty();
defs=defs.tail) {
- if (defs.head.getTag() == JCTree.VARDEF && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
+ if (defs.head.hasTag(VARDEF) && (((JCVariableDecl) defs.head).mods.flags & ENUM) != 0) {
JCVariableDecl var = (JCVariableDecl)defs.head;
visitEnumConstantDef(var, nextOrdinal++);
values.append(make.QualIdent(var.sym));
@@ -2757,9 +2794,9 @@
List.<JCExpression>nil() : List.of(translate(tree.detail));
if (!tree.cond.type.isFalse()) {
cond = makeBinary
- (JCTree.AND,
+ (AND,
cond,
- makeUnary(JCTree.NOT, tree.cond));
+ makeUnary(NOT, tree.cond));
}
result =
make.If(cond,
@@ -2816,7 +2853,7 @@
// first argument.
if (c.hasOuterInstance()) {
JCExpression thisArg;
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
thisArg = attr.
makeNullCheck(translate(((JCFieldAccess) tree.meth).selected));
tree.meth = make.Ident(constructor);
@@ -2837,7 +2874,7 @@
// If the translated method itself is an Apply tree, we are
// seeing an access method invocation. In this case, append
// the method arguments to the arguments of the access method.
- if (tree.meth.getTag() == JCTree.APPLY) {
+ if (tree.meth.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.meth;
app.args = tree.args.prependList(app.args);
result = app;
@@ -2971,7 +3008,7 @@
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, append
// right hand side as last argument of the access method.
- if (tree.lhs.getTag() == JCTree.APPLY) {
+ if (tree.lhs.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
app.args = List.of(tree.rhs).prependList(app.args);
result = app;
@@ -2988,7 +3025,7 @@
// (but without recomputing x)
JCTree newTree = abstractLval(tree.lhs, new TreeBuilder() {
public JCTree build(final JCTree lhs) {
- int newTag = tree.getTag() - JCTree.ASGOffset;
+ JCTree.Tag newTag = tree.getTag().noAssignOp();
// Erasure (TransTypes) can change the type of
// tree.lhs. However, we can still get the
// unerased type of tree.lhs as it is stored
@@ -3018,7 +3055,7 @@
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, append
// right hand side as last argument of the access method.
- if (tree.lhs.getTag() == JCTree.APPLY) {
+ if (tree.lhs.hasTag(APPLY)) {
JCMethodInvocation app = (JCMethodInvocation)tree.lhs;
// if operation is a += on strings,
// make sure to convert argument to string
@@ -3038,13 +3075,13 @@
// or
// translate to tmp1=lval(e); tmp2=tmp1; (typeof tree)tmp1 OP 1; tmp2
// where OP is += or -=
- final boolean cast = TreeInfo.skipParens(tree.arg).getTag() == JCTree.TYPECAST;
+ final boolean cast = TreeInfo.skipParens(tree.arg).hasTag(TYPECAST);
return abstractLval(tree.arg, new TreeBuilder() {
public JCTree build(final JCTree tmp1) {
return abstractRval(tmp1, tree.arg.type, new TreeBuilder() {
public JCTree build(final JCTree tmp2) {
- int opcode = (tree.getTag() == JCTree.POSTINC)
- ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+ JCTree.Tag opcode = (tree.hasTag(POSTINC))
+ ? PLUS_ASG : MINUS_ASG;
JCTree lhs = cast
? make.TypeCast(tree.arg.type, (JCExpression)tmp1)
: tmp1;
@@ -3059,25 +3096,24 @@
}
public void visitUnary(JCUnary tree) {
- boolean isUpdateOperator =
- JCTree.PREINC <= tree.getTag() && tree.getTag() <= JCTree.POSTDEC;
+ boolean isUpdateOperator = tree.getTag().isIncOrDecUnaryOp();
if (isUpdateOperator && !tree.arg.type.isPrimitive()) {
switch(tree.getTag()) {
- case JCTree.PREINC: // ++ e
+ case PREINC: // ++ e
// translate to e += 1
- case JCTree.PREDEC: // -- e
+ case PREDEC: // -- e
// translate to e -= 1
{
- int opcode = (tree.getTag() == JCTree.PREINC)
- ? JCTree.PLUS_ASG : JCTree.MINUS_ASG;
+ JCTree.Tag opcode = (tree.hasTag(PREINC))
+ ? PLUS_ASG : MINUS_ASG;
JCAssignOp newTree = makeAssignop(opcode,
tree.arg,
make.Literal(1));
result = translate(newTree, tree.type);
return;
}
- case JCTree.POSTINC: // e ++
- case JCTree.POSTDEC: // e --
+ case POSTINC: // e ++
+ case POSTDEC: // e --
{
result = translate(lowerBoxedPostop(tree), tree.type);
return;
@@ -3088,14 +3124,14 @@
tree.arg = boxIfNeeded(translate(tree.arg, tree), tree.type);
- if (tree.getTag() == JCTree.NOT && tree.arg.type.constValue() != null) {
+ if (tree.hasTag(NOT) && tree.arg.type.constValue() != null) {
tree.type = cfolder.fold1(bool_not, tree.arg.type);
}
// If translated left hand side is an Apply, we are
// seeing an access method invocation. In this case, return
// that access method invocation as result.
- if (isUpdateOperator && tree.arg.getTag() == JCTree.APPLY) {
+ if (isUpdateOperator && tree.arg.hasTag(APPLY)) {
result = tree.arg;
} else {
result = tree;
@@ -3106,7 +3142,7 @@
List<Type> formals = tree.operator.type.getParameterTypes();
JCTree lhs = tree.lhs = translate(tree.lhs, formals.head);
switch (tree.getTag()) {
- case JCTree.OR:
+ case OR:
if (lhs.type.isTrue()) {
result = lhs;
return;
@@ -3116,7 +3152,7 @@
return;
}
break;
- case JCTree.AND:
+ case AND:
if (lhs.type.isFalse()) {
result = lhs;
return;
@@ -3186,9 +3222,9 @@
indexdef.init.type = indexdef.type = syms.intType.constType(0);
List<JCStatement> loopinit = List.of(arraycachedef, lencachedef, indexdef);
- JCBinary cond = makeBinary(JCTree.LT, make.Ident(index), make.Ident(lencache));
-
- JCExpressionStatement step = make.Exec(makeUnary(JCTree.PREINC, make.Ident(index)));
+ JCBinary cond = makeBinary(LT, make.Ident(index), make.Ident(lencache));
+
+ JCExpressionStatement step = make.Exec(makeUnary(PREINC, make.Ident(index)));
Type elemtype = types.elemtype(tree.expr.type);
JCExpression loopvarinit = make.Indexed(make.Ident(arraycache),
@@ -3592,7 +3628,7 @@
// need to special case-access of the form C.super.x
// these will always need an access method.
boolean qualifiedSuperAccess =
- tree.selected.getTag() == JCTree.SELECT &&
+ tree.selected.hasTag(SELECT) &&
TreeInfo.name(tree.selected) == names._super;
tree.selected = translate(tree.selected);
if (tree.name == names._class)
@@ -3642,7 +3678,7 @@
endPositions = env.toplevel.endPositions;
currentClass = null;
currentMethodDef = null;
- outermostClassDef = (cdef.getTag() == JCTree.CLASSDEF) ? (JCClassDecl)cdef : null;
+ outermostClassDef = (cdef.hasTag(CLASSDEF)) ? (JCClassDecl)cdef : null;
outermostMemberDef = null;
this.translated = new ListBuffer<JCTree>();
classdefs = new HashMap<ClassSymbol,JCClassDecl>();
@@ -3838,7 +3874,7 @@
JCIdent fLocUsageId = make.Ident(otherVarSym);
JCExpression sel = make.Select(fLocUsageId, ordinalSymbol);
- JCBinary bin = makeBinary(JCTree.MINUS, id1, sel);
+ JCBinary bin = makeBinary(MINUS, id1, sel);
JCReturn ret = make.Return(bin);
blockStatements.append(ret);
JCMethodDecl compareToMethod = make.MethodDef((MethodSymbol)compareToSym,
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Nov 08 11:51:05 2011 -0800
@@ -40,8 +40,10 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
/** This is the second phase of Enter, in which classes are completed
@@ -644,7 +646,7 @@
tree.sym = v;
if (tree.init != null) {
v.flags_field |= HASINIT;
- if ((v.flags_field & FINAL) != 0 && tree.init.getTag() != JCTree.NEWCLASS) {
+ if ((v.flags_field & FINAL) != 0 && !tree.init.hasTag(NEWCLASS)) {
Env<AttrContext> initEnv = getInitEnv(tree, env);
initEnv.info.enclVar = v;
v.setLazyConstValue(initEnv(tree, initEnv), attr, tree.init);
@@ -868,7 +870,7 @@
// If this is a toplevel-class, make sure any preceding import
// clauses have been seen.
if (c.owner.kind == PCK) {
- memberEnter(env.toplevel, env.enclosing(JCTree.TOPLEVEL));
+ memberEnter(env.toplevel, env.enclosing(TOPLEVEL));
todo.append(env);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Tue Nov 08 11:51:05 2011 -0800
@@ -49,9 +49,12 @@
import javax.lang.model.element.ElementVisitor;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Helper class for name resolution, used mostly by the attribution phase.
*
@@ -1269,7 +1272,7 @@
staticOnly = true;
}
- if (env.tree.getTag() != JCTree.IMPORT) {
+ if (!env.tree.hasTag(IMPORT)) {
sym = findGlobalType(env, env.toplevel.namedImportScope, name);
if (sym.exists()) return sym;
else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
@@ -1796,7 +1799,7 @@
* @param env The environment current at the operation.
* @param argtypes The types of the operands.
*/
- Symbol resolveOperator(DiagnosticPosition pos, int optag,
+ Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
Env<AttrContext> env, List<Type> argtypes) {
startResolution();
Name name = treeinfo.operatorName(optag);
@@ -1815,7 +1818,7 @@
* @param env The environment current at the operation.
* @param arg The type of the operand.
*/
- Symbol resolveUnaryOperator(DiagnosticPosition pos, int optag, Env<AttrContext> env, Type arg) {
+ Symbol resolveUnaryOperator(DiagnosticPosition pos, JCTree.Tag optag, Env<AttrContext> env, Type arg) {
return resolveOperator(pos, optag, env, List.of(arg));
}
@@ -1827,7 +1830,7 @@
* @param right The types of the right operand.
*/
Symbol resolveBinaryOperator(DiagnosticPosition pos,
- int optag,
+ JCTree.Tag optag,
Env<AttrContext> env,
Type left,
Type right) {
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Tue Nov 08 11:51:05 2011 -0800
@@ -532,7 +532,7 @@
*/
public int endPos(JCTree tree) {
if (tree == null) return Position.NOPOS;
- if (tree.getTag() == JCTree.BLOCK)
+ if (tree.hasTag(JCTree.Tag.BLOCK))
return ((JCBlock) tree).endpos;
Integer endpos = endPositions.get(tree);
if (endpos != null)
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue Nov 08 11:51:05 2011 -0800
@@ -47,6 +47,8 @@
import static com.sun.tools.javac.jvm.ByteCodes.*;
import static com.sun.tools.javac.jvm.CRTFlags.*;
import static com.sun.tools.javac.main.OptionName.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
/** This pass maps flat Java (i.e. without inner classes) to bytecodes.
*
@@ -433,7 +435,7 @@
*/
boolean hasFinally(JCTree target, Env<GenContext> env) {
while (env.tree != target) {
- if (env.tree.getTag() == JCTree.TRY && env.info.finalize.hasFinalizer())
+ if (env.tree.hasTag(TRY) && env.info.finalize.hasFinalizer())
return true;
env = env.next;
}
@@ -460,17 +462,17 @@
for (List<JCTree> l = defs; l.nonEmpty(); l = l.tail) {
JCTree def = l.head;
switch (def.getTag()) {
- case JCTree.BLOCK:
+ case BLOCK:
JCBlock block = (JCBlock)def;
if ((block.flags & STATIC) != 0)
clinitCode.append(block);
else
initCode.append(block);
break;
- case JCTree.METHODDEF:
+ case METHODDEF:
methodDefs.append(def);
break;
- case JCTree.VARDEF:
+ case VARDEF:
JCVariableDecl vdef = (JCVariableDecl) def;
VarSymbol sym = vdef.sym;
checkDimension(vdef.pos(), sym.type);
@@ -707,7 +709,7 @@
}
int startpc = code.curPc();
genStat(tree, env);
- if (tree.getTag() == JCTree.BLOCK) crtFlags |= CRT_BLOCK;
+ if (tree.hasTag(BLOCK)) crtFlags |= CRT_BLOCK;
code.crt.put(tree, crtFlags, startpc, code.curPc());
}
@@ -717,7 +719,7 @@
if (code.isAlive()) {
code.statBegin(tree.pos);
genDef(tree, env);
- } else if (env.info.isSwitch && tree.getTag() == JCTree.VARDEF) {
+ } else if (env.info.isSwitch && tree.hasTag(VARDEF)) {
// variables whose declarations are in a switch
// can be used even if the decl is unreachable.
code.newLocal(((JCVariableDecl) tree).sym);
@@ -784,7 +786,7 @@
*/
public CondItem genCond(JCTree _tree, boolean markBranches) {
JCTree inner_tree = TreeInfo.skipParens(_tree);
- if (inner_tree.getTag() == JCTree.CONDEXPR) {
+ if (inner_tree.hasTag(CONDEXPR)) {
JCConditional tree = (JCConditional)inner_tree;
CondItem cond = genCond(tree.cond, CRT_FLOW_CONTROLLER);
if (cond.isTrue()) {
@@ -1033,7 +1035,7 @@
Env<GenContext> localEnv = env.dup(tree, new GenContext());
genStats(tree.stats, localEnv);
// End the scope of all block-local variables in variable info.
- if (env.tree.getTag() != JCTree.METHODDEF) {
+ if (!env.tree.hasTag(METHODDEF)) {
code.statBegin(tree.endpos);
code.endScopes(limit);
code.pendingStatPos = Position.NOPOS;
@@ -1628,11 +1630,11 @@
// Optimize x++ to ++x and x-- to --x.
JCExpression e = tree.expr;
switch (e.getTag()) {
- case JCTree.POSTINC:
- ((JCUnary) e).setTag(JCTree.PREINC);
+ case POSTINC:
+ ((JCUnary) e).setTag(PREINC);
break;
- case JCTree.POSTDEC:
- ((JCUnary) e).setTag(JCTree.PREDEC);
+ case POSTDEC:
+ ((JCUnary) e).setTag(PREDEC);
break;
}
genExpr(tree.expr, tree.expr.type).drop();
@@ -1819,13 +1821,13 @@
// If we have an increment of -32768 to +32767 of a local
// int variable we can use an incr instruction instead of
// proceeding further.
- if ((tree.getTag() == JCTree.PLUS_ASG || tree.getTag() == JCTree.MINUS_ASG) &&
+ if ((tree.hasTag(PLUS_ASG) || tree.hasTag(MINUS_ASG)) &&
l instanceof LocalItem &&
tree.lhs.type.tag <= INT &&
tree.rhs.type.tag <= INT &&
tree.rhs.type.constValue() != null) {
int ival = ((Number) tree.rhs.type.constValue()).intValue();
- if (tree.getTag() == JCTree.MINUS_ASG) ival = -ival;
+ if (tree.hasTag(MINUS_ASG)) ival = -ival;
((LocalItem)l).incr(ival);
result = l;
return;
@@ -1841,29 +1843,29 @@
public void visitUnary(JCUnary tree) {
OperatorSymbol operator = (OperatorSymbol)tree.operator;
- if (tree.getTag() == JCTree.NOT) {
+ if (tree.hasTag(NOT)) {
CondItem od = genCond(tree.arg, false);
result = od.negate();
} else {
Item od = genExpr(tree.arg, operator.type.getParameterTypes().head);
switch (tree.getTag()) {
- case JCTree.POS:
+ case POS:
result = od.load();
break;
- case JCTree.NEG:
+ case NEG:
result = od.load();
code.emitop0(operator.opcode);
break;
- case JCTree.COMPL:
+ case COMPL:
result = od.load();
emitMinusOne(od.typecode);
code.emitop0(operator.opcode);
break;
- case JCTree.PREINC: case JCTree.PREDEC:
+ case PREINC: case PREDEC:
od.duplicate();
if (od instanceof LocalItem &&
(operator.opcode == iadd || operator.opcode == isub)) {
- ((LocalItem)od).incr(tree.getTag() == JCTree.PREINC ? 1 : -1);
+ ((LocalItem)od).incr(tree.hasTag(PREINC) ? 1 : -1);
result = od;
} else {
od.load();
@@ -1877,12 +1879,12 @@
result = items.makeAssignItem(od);
}
break;
- case JCTree.POSTINC: case JCTree.POSTDEC:
+ case POSTINC: case POSTDEC:
od.duplicate();
if (od instanceof LocalItem &&
(operator.opcode == iadd || operator.opcode == isub)) {
Item res = od.load();
- ((LocalItem)od).incr(tree.getTag() == JCTree.POSTINC ? 1 : -1);
+ ((LocalItem)od).incr(tree.hasTag(POSTINC) ? 1 : -1);
result = res;
} else {
Item res = od.load();
@@ -1898,7 +1900,7 @@
result = res;
}
break;
- case JCTree.NULLCHK:
+ case NULLCHK:
result = od.load();
code.emitop0(dup);
genNullCheck(tree.pos());
@@ -1926,7 +1928,7 @@
// Convert buffer to string.
bufferToString(tree.pos());
result = items.makeStackItem(syms.stringType);
- } else if (tree.getTag() == JCTree.AND) {
+ } else if (tree.hasTag(AND)) {
CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
if (!lcond.isFalse()) {
Chain falseJumps = lcond.jumpFalse();
@@ -1940,7 +1942,7 @@
} else {
result = lcond;
}
- } else if (tree.getTag() == JCTree.OR) {
+ } else if (tree.hasTag(OR)) {
CondItem lcond = genCond(tree.lhs, CRT_FLOW_CONTROLLER);
if (!lcond.isTrue()) {
Chain trueJumps = lcond.jumpTrue();
@@ -1997,7 +1999,7 @@
*/
void appendStrings(JCTree tree) {
tree = TreeInfo.skipParens(tree);
- if (tree.getTag() == JCTree.PLUS && tree.type.constValue() == null) {
+ if (tree.hasTag(PLUS) && tree.type.constValue() == null) {
JCBinary op = (JCBinary) tree;
if (op.operator.kind == MTH &&
((OperatorSymbol) op.operator).opcode == string_add) {
@@ -2240,7 +2242,7 @@
if (nerrs != 0) {
// if errors, discard code
for (List<JCTree> l = cdef.defs; l.nonEmpty(); l = l.tail) {
- if (l.head.getTag() == JCTree.METHODDEF)
+ if (l.head.hasTag(METHODDEF))
((JCMethodDecl) l.head).sym.code = null;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Nov 08 11:51:05 2011 -0800
@@ -1506,20 +1506,20 @@
for (List<JCTree> it = tree.defs; it.tail != null; it = it.tail) {
JCTree t = it.head;
switch (t.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
if (isInterface ||
(((JCClassDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
(((JCClassDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCClassDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
break;
- case JCTree.METHODDEF:
+ case METHODDEF:
if (isInterface ||
(((JCMethodDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
((JCMethodDecl) t).sym.name == names.init ||
(((JCMethodDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCMethodDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
break;
- case JCTree.VARDEF:
+ case VARDEF:
if (isInterface || (((JCVariableDecl) t).mods.flags & (Flags.PROTECTED|Flags.PUBLIC)) != 0 ||
(((JCVariableDecl) t).mods.flags & (Flags.PRIVATE)) == 0 && ((JCVariableDecl) t).sym.packge().getQualifiedName() == names.java_lang)
newdefs.append(t);
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.Name;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import static javax.lang.model.util.ElementFilter.methodsIn;
/**
@@ -288,7 +289,7 @@
}
}
public void visitArray(Attribute.Array array) {
- if (tree.getTag() == JCTree.NEWARRAY &&
+ if (tree.hasTag(NEWARRAY) &&
types.elemtype(array.type).tsym == findme.type.tsym) {
List<JCExpression> elems = ((JCNewArray) tree).elems;
for (Attribute value : array.values) {
@@ -327,7 +328,7 @@
scan(t.args);
}
public void visitAssign(JCAssign t) {
- if (t.lhs.getTag() == JCTree.IDENT) {
+ if (t.lhs.hasTag(IDENT)) {
JCIdent ident = (JCIdent) t.lhs;
if (ident.sym == sym)
result = t.rhs;
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue Nov 08 11:51:05 2011 -0800
@@ -37,8 +37,16 @@
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.ASSERT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CASE;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.CATCH;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.EQ;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.GT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT;
+import static com.sun.tools.javac.parser.Tokens.TokenKind.LT;
import static com.sun.tools.javac.util.ListBuffer.lb;
-import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** The parser maps a token sequence into an abstract syntax
* tree. It operates by recursive descent, with code derived
@@ -758,7 +766,7 @@
Assert.check(top == 0);
t = odStack[0];
- if (t.getTag() == JCTree.PLUS) {
+ if (t.hasTag(JCTree.Tag.PLUS)) {
StringBuffer buf = foldStrings(t);
if (buf != null) {
t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString()));
@@ -791,7 +799,7 @@
return null;
List<String> buf = List.nil();
while (true) {
- if (tree.getTag() == JCTree.LITERAL) {
+ if (tree.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) tree;
if (lit.typetag == TypeTags.CLASS) {
StringBuffer sbuf =
@@ -802,9 +810,9 @@
}
return sbuf;
}
- } else if (tree.getTag() == JCTree.PLUS) {
+ } else if (tree.hasTag(JCTree.Tag.PLUS)) {
JCBinary op = (JCBinary)tree;
- if (op.rhs.getTag() == JCTree.LITERAL) {
+ if (op.rhs.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) op.rhs;
if (lit.typetag == TypeTags.CLASS) {
buf = buf.prepend((String) lit.value);
@@ -900,7 +908,7 @@
t = term3();
if ((mode & TYPE) != 0 && token.kind == LT) {
// Could be a cast to a parameterized type
- int op = JCTree.LT;
+ JCTree.Tag op = JCTree.Tag.LT;
int pos1 = token.pos;
nextToken();
mode &= (EXPR | TYPE);
@@ -1154,7 +1162,7 @@
while ((token.kind == PLUSPLUS || token.kind == SUBSUB) && (mode & EXPR) != 0) {
mode = EXPR;
t = to(F.at(token.pos).Unary(
- token.kind == PLUSPLUS ? JCTree.POSTINC : JCTree.POSTDEC, t));
+ token.kind == PLUSPLUS ? POSTINC : POSTDEC, t));
nextToken();
}
return toP(t);
@@ -1627,7 +1635,7 @@
default:
Token prevToken = token;
JCExpression t = term(EXPR | TYPE);
- if (token.kind == COLON && t.getTag() == JCTree.IDENT) {
+ if (token.kind == COLON && t.hasTag(IDENT)) {
nextToken();
JCStatement stat = parseStatement();
stats.append(F.at(pos).Labelled(prevToken.name(), stat));
@@ -1702,7 +1710,7 @@
accept(LPAREN);
List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit();
if (inits.length() == 1 &&
- inits.head.getTag() == JCTree.VARDEF &&
+ inits.head.hasTag(VARDEF) &&
((JCVariableDecl) inits.head).init == null &&
token.kind == COLON) {
checkForeach();
@@ -1835,7 +1843,7 @@
default:
Token prevToken = token;
JCExpression expr = parseExpression();
- if (token.kind == COLON && expr.getTag() == JCTree.IDENT) {
+ if (token.kind == COLON && expr.hasTag(IDENT)) {
nextToken();
JCStatement stat = parseStatement();
return F.at(pos).Labelled(prevToken.name(), stat);
@@ -2088,7 +2096,7 @@
if (token.kind == IDENTIFIER) {
mode = EXPR;
JCExpression t1 = term1();
- if (t1.getTag() == JCTree.IDENT && token.kind == EQ) {
+ if (t1.hasTag(IDENT) && token.kind == EQ) {
int pos = token.pos;
accept(EQ);
JCExpression v = annotationValue();
@@ -2618,7 +2626,7 @@
} else {
type = parseType();
}
- if (token.kind == LPAREN && !isInterface && type.getTag() == JCTree.IDENT) {
+ if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) {
if (isInterface || tk.name() != className)
error(pos, "invalid.meth.decl.ret.type.req");
return List.of(methodDeclaratorRest(
@@ -2815,15 +2823,15 @@
*/
protected JCExpression checkExprStat(JCExpression t) {
switch(t.getTag()) {
- case JCTree.PREINC: case JCTree.PREDEC:
- case JCTree.POSTINC: case JCTree.POSTDEC:
- case JCTree.ASSIGN:
- case JCTree.BITOR_ASG: case JCTree.BITXOR_ASG: case JCTree.BITAND_ASG:
- case JCTree.SL_ASG: case JCTree.SR_ASG: case JCTree.USR_ASG:
- case JCTree.PLUS_ASG: case JCTree.MINUS_ASG:
- case JCTree.MUL_ASG: case JCTree.DIV_ASG: case JCTree.MOD_ASG:
- case JCTree.APPLY: case JCTree.NEWCLASS:
- case JCTree.ERRONEOUS:
+ case PREINC: case PREDEC:
+ case POSTINC: case POSTDEC:
+ case ASSIGN:
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG:
+ case MUL_ASG: case DIV_ASG: case MOD_ASG:
+ case APPLY: case NEWCLASS:
+ case ERRONEOUS:
return t;
default:
JCExpression ret = F.at(t.pos).Erroneous(List.<JCTree>of(t));
@@ -2836,8 +2844,8 @@
* -1 if token is not a binary operator. @see TreeInfo.opPrec
*/
static int prec(TokenKind token) {
- int oc = optag(token);
- return (oc >= 0) ? TreeInfo.opPrec(oc) : -1;
+ JCTree.Tag oc = optag(token);
+ return (oc != NO_TAG) ? TreeInfo.opPrec(oc) : -1;
}
/**
@@ -2853,96 +2861,96 @@
}
/** Return operation tag of binary operator represented by token,
- * -1 if token is not a binary operator.
+ * No_TAG if token is not a binary operator.
*/
- static int optag(TokenKind token) {
+ static JCTree.Tag optag(TokenKind token) {
switch (token) {
case BARBAR:
- return JCTree.OR;
+ return OR;
case AMPAMP:
- return JCTree.AND;
+ return AND;
case BAR:
- return JCTree.BITOR;
+ return BITOR;
case BAREQ:
- return JCTree.BITOR_ASG;
+ return BITOR_ASG;
case CARET:
- return JCTree.BITXOR;
+ return BITXOR;
case CARETEQ:
- return JCTree.BITXOR_ASG;
+ return BITXOR_ASG;
case AMP:
- return JCTree.BITAND;
+ return BITAND;
case AMPEQ:
- return JCTree.BITAND_ASG;
+ return BITAND_ASG;
case EQEQ:
- return JCTree.EQ;
+ return JCTree.Tag.EQ;
case BANGEQ:
- return JCTree.NE;
+ return NE;
case LT:
- return JCTree.LT;
+ return JCTree.Tag.LT;
case GT:
- return JCTree.GT;
+ return JCTree.Tag.GT;
case LTEQ:
- return JCTree.LE;
+ return LE;
case GTEQ:
- return JCTree.GE;
+ return GE;
case LTLT:
- return JCTree.SL;
+ return SL;
case LTLTEQ:
- return JCTree.SL_ASG;
+ return SL_ASG;
case GTGT:
- return JCTree.SR;
+ return SR;
case GTGTEQ:
- return JCTree.SR_ASG;
+ return SR_ASG;
case GTGTGT:
- return JCTree.USR;
+ return USR;
case GTGTGTEQ:
- return JCTree.USR_ASG;
+ return USR_ASG;
case PLUS:
- return JCTree.PLUS;
+ return JCTree.Tag.PLUS;
case PLUSEQ:
- return JCTree.PLUS_ASG;
+ return PLUS_ASG;
case SUB:
- return JCTree.MINUS;
+ return MINUS;
case SUBEQ:
- return JCTree.MINUS_ASG;
+ return MINUS_ASG;
case STAR:
- return JCTree.MUL;
+ return MUL;
case STAREQ:
- return JCTree.MUL_ASG;
+ return MUL_ASG;
case SLASH:
- return JCTree.DIV;
+ return DIV;
case SLASHEQ:
- return JCTree.DIV_ASG;
+ return DIV_ASG;
case PERCENT:
- return JCTree.MOD;
+ return MOD;
case PERCENTEQ:
- return JCTree.MOD_ASG;
+ return MOD_ASG;
case INSTANCEOF:
- return JCTree.TYPETEST;
+ return TYPETEST;
default:
- return -1;
+ return NO_TAG;
}
}
/** Return operation tag of unary operator represented by token,
- * -1 if token is not a binary operator.
+ * No_TAG if token is not a binary operator.
*/
- static int unoptag(TokenKind token) {
+ static JCTree.Tag unoptag(TokenKind token) {
switch (token) {
case PLUS:
- return JCTree.POS;
+ return POS;
case SUB:
- return JCTree.NEG;
+ return NEG;
case BANG:
- return JCTree.NOT;
+ return NOT;
case TILDE:
- return JCTree.COMPL;
+ return COMPL;
case PLUSPLUS:
- return JCTree.PREINC;
+ return PREINC;
case SUBSUB:
- return JCTree.PREDEC;
+ return PREDEC;
default:
- return -1;
+ return NO_TAG;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue Nov 08 11:51:05 2011 -0800
@@ -1222,7 +1222,7 @@
List<ClassSymbol> classes = List.nil();
for (JCCompilationUnit unit : units) {
for (JCTree node : unit.defs) {
- if (node.getTag() == JCTree.CLASSDEF) {
+ if (node.hasTag(JCTree.Tag.CLASSDEF)) {
ClassSymbol sym = ((JCClassDecl) node).sym;
Assert.checkNonNull(sym);
classes = classes.prepend(sym);
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Tue Nov 08 11:51:05 2011 -0800
@@ -42,6 +42,7 @@
import com.sun.source.tree.*;
import static com.sun.tools.javac.code.BoundKind.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/**
* Root class for abstract syntax tree nodes. It provides definitions
@@ -79,253 +80,289 @@
public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
/* Tree tag values, identifying kinds of trees */
+ public enum Tag{
+ /** For methods that return an invalid tag if a given condition is not met
+ */
+ NO_TAG,
- /** Toplevel nodes, of type TopLevel, representing entire source files.
- */
- public static final int TOPLEVEL = 1;
+ /** Toplevel nodes, of type TopLevel, representing entire source files.
+ */
+ TOPLEVEL,
- /** Import clauses, of type Import.
- */
- public static final int IMPORT = TOPLEVEL + 1;
+ /** Import clauses, of type Import.
+ */
+ IMPORT,
- /** Class definitions, of type ClassDef.
- */
- public static final int CLASSDEF = IMPORT + 1;
+ /** Class definitions, of type ClassDef.
+ */
+ CLASSDEF,
- /** Method definitions, of type MethodDef.
- */
- public static final int METHODDEF = CLASSDEF + 1;
+ /** Method definitions, of type MethodDef.
+ */
+ METHODDEF,
- /** Variable definitions, of type VarDef.
- */
- public static final int VARDEF = METHODDEF + 1;
+ /** Variable definitions, of type VarDef.
+ */
+ VARDEF,
- /** The no-op statement ";", of type Skip
- */
- public static final int SKIP = VARDEF + 1;
+ /** The no-op statement ";", of type Skip
+ */
+ SKIP,
+
+ /** Blocks, of type Block.
+ */
+ BLOCK,
- /** Blocks, of type Block.
- */
- public static final int BLOCK = SKIP + 1;
+ /** Do-while loops, of type DoLoop.
+ */
+ DOLOOP,
- /** Do-while loops, of type DoLoop.
- */
- public static final int DOLOOP = BLOCK + 1;
+ /** While-loops, of type WhileLoop.
+ */
+ WHILELOOP,
- /** While-loops, of type WhileLoop.
- */
- public static final int WHILELOOP = DOLOOP + 1;
+ /** For-loops, of type ForLoop.
+ */
+ FORLOOP,
- /** For-loops, of type ForLoop.
- */
- public static final int FORLOOP = WHILELOOP + 1;
+ /** Foreach-loops, of type ForeachLoop.
+ */
+ FOREACHLOOP,
- /** Foreach-loops, of type ForeachLoop.
- */
- public static final int FOREACHLOOP = FORLOOP + 1;
+ /** Labelled statements, of type Labelled.
+ */
+ LABELLED,
- /** Labelled statements, of type Labelled.
- */
- public static final int LABELLED = FOREACHLOOP + 1;
+ /** Switch statements, of type Switch.
+ */
+ SWITCH,
- /** Switch statements, of type Switch.
- */
- public static final int SWITCH = LABELLED + 1;
+ /** Case parts in switch statements, of type Case.
+ */
+ CASE,
- /** Case parts in switch statements, of type Case.
- */
- public static final int CASE = SWITCH + 1;
+ /** Synchronized statements, of type Synchonized.
+ */
+ SYNCHRONIZED,
+
+ /** Try statements, of type Try.
+ */
+ TRY,
- /** Synchronized statements, of type Synchonized.
- */
- public static final int SYNCHRONIZED = CASE + 1;
+ /** Catch clauses in try statements, of type Catch.
+ */
+ CATCH,
- /** Try statements, of type Try.
- */
- public static final int TRY = SYNCHRONIZED + 1;
+ /** Conditional expressions, of type Conditional.
+ */
+ CONDEXPR,
- /** Catch clauses in try statements, of type Catch.
- */
- public static final int CATCH = TRY + 1;
+ /** Conditional statements, of type If.
+ */
+ IF,
- /** Conditional expressions, of type Conditional.
- */
- public static final int CONDEXPR = CATCH + 1;
+ /** Expression statements, of type Exec.
+ */
+ EXEC,
- /** Conditional statements, of type If.
- */
- public static final int IF = CONDEXPR + 1;
+ /** Break statements, of type Break.
+ */
+ BREAK,
- /** Expression statements, of type Exec.
- */
- public static final int EXEC = IF + 1;
+ /** Continue statements, of type Continue.
+ */
+ CONTINUE,
- /** Break statements, of type Break.
- */
- public static final int BREAK = EXEC + 1;
+ /** Return statements, of type Return.
+ */
+ RETURN,
- /** Continue statements, of type Continue.
- */
- public static final int CONTINUE = BREAK + 1;
+ /** Throw statements, of type Throw.
+ */
+ THROW,
+
+ /** Assert statements, of type Assert.
+ */
+ ASSERT,
- /** Return statements, of type Return.
- */
- public static final int RETURN = CONTINUE + 1;
+ /** Method invocation expressions, of type Apply.
+ */
+ APPLY,
- /** Throw statements, of type Throw.
- */
- public static final int THROW = RETURN + 1;
+ /** Class instance creation expressions, of type NewClass.
+ */
+ NEWCLASS,
- /** Assert statements, of type Assert.
- */
- public static final int ASSERT = THROW + 1;
+ /** Array creation expressions, of type NewArray.
+ */
+ NEWARRAY,
- /** Method invocation expressions, of type Apply.
- */
- public static final int APPLY = ASSERT + 1;
+ /** Parenthesized subexpressions, of type Parens.
+ */
+ PARENS,
- /** Class instance creation expressions, of type NewClass.
- */
- public static final int NEWCLASS = APPLY + 1;
+ /** Assignment expressions, of type Assign.
+ */
+ ASSIGN,
- /** Array creation expressions, of type NewArray.
- */
- public static final int NEWARRAY = NEWCLASS + 1;
+ /** Type cast expressions, of type TypeCast.
+ */
+ TYPECAST,
- /** Parenthesized subexpressions, of type Parens.
- */
- public static final int PARENS = NEWARRAY + 1;
+ /** Type test expressions, of type TypeTest.
+ */
+ TYPETEST,
- /** Assignment expressions, of type Assign.
- */
- public static final int ASSIGN = PARENS + 1;
+ /** Indexed array expressions, of type Indexed.
+ */
+ INDEXED,
+
+ /** Selections, of type Select.
+ */
+ SELECT,
- /** Type cast expressions, of type TypeCast.
- */
- public static final int TYPECAST = ASSIGN + 1;
+ /** Simple identifiers, of type Ident.
+ */
+ IDENT,
+
+ /** Literals, of type Literal.
+ */
+ LITERAL,
- /** Type test expressions, of type TypeTest.
- */
- public static final int TYPETEST = TYPECAST + 1;
+ /** Basic type identifiers, of type TypeIdent.
+ */
+ TYPEIDENT,
- /** Indexed array expressions, of type Indexed.
- */
- public static final int INDEXED = TYPETEST + 1;
+ /** Array types, of type TypeArray.
+ */
+ TYPEARRAY,
- /** Selections, of type Select.
- */
- public static final int SELECT = INDEXED + 1;
+ /** Parameterized types, of type TypeApply.
+ */
+ TYPEAPPLY,
- /** Simple identifiers, of type Ident.
- */
- public static final int IDENT = SELECT + 1;
+ /** Union types, of type TypeUnion
+ */
+ TYPEUNION,
- /** Literals, of type Literal.
- */
- public static final int LITERAL = IDENT + 1;
+ /** Formal type parameters, of type TypeParameter.
+ */
+ TYPEPARAMETER,
- /** Basic type identifiers, of type TypeIdent.
- */
- public static final int TYPEIDENT = LITERAL + 1;
+ /** Type argument.
+ */
+ WILDCARD,
- /** Array types, of type TypeArray.
- */
- public static final int TYPEARRAY = TYPEIDENT + 1;
-
- /** Parameterized types, of type TypeApply.
- */
- public static final int TYPEAPPLY = TYPEARRAY + 1;
+ /** Bound kind: extends, super, exact, or unbound
+ */
+ TYPEBOUNDKIND,
- /** Union types, of type TypeUnion
- */
- public static final int TYPEUNION = TYPEAPPLY + 1;
+ /** metadata: Annotation.
+ */
+ ANNOTATION,
- /** Formal type parameters, of type TypeParameter.
- */
- public static final int TYPEPARAMETER = TYPEUNION + 1;
+ /** metadata: Modifiers
+ */
+ MODIFIERS,
+
+ ANNOTATED_TYPE,
- /** Type argument.
- */
- public static final int WILDCARD = TYPEPARAMETER + 1;
-
- /** Bound kind: extends, super, exact, or unbound
- */
- public static final int TYPEBOUNDKIND = WILDCARD + 1;
+ /** Error trees, of type Erroneous.
+ */
+ ERRONEOUS,
- /** metadata: Annotation.
- */
- public static final int ANNOTATION = TYPEBOUNDKIND + 1;
+ /** Unary operators, of type Unary.
+ */
+ POS, // +
+ NEG, // -
+ NOT, // !
+ COMPL, // ~
+ PREINC, // ++ _
+ PREDEC, // -- _
+ POSTINC, // _ ++
+ POSTDEC, // _ --
- /** metadata: Modifiers
- */
- public static final int MODIFIERS = ANNOTATION + 1;
-
- public static final int ANNOTATED_TYPE = MODIFIERS + 1;
+ /** unary operator for null reference checks, only used internally.
+ */
+ NULLCHK,
- /** Error trees, of type Erroneous.
- */
- public static final int ERRONEOUS = ANNOTATED_TYPE + 1;
+ /** Binary operators, of type Binary.
+ */
+ OR, // ||
+ AND, // &&
+ BITOR, // |
+ BITXOR, // ^
+ BITAND, // &
+ EQ, // ==
+ NE, // !=
+ LT, // <
+ GT, // >
+ LE, // <=
+ GE, // >=
+ SL, // <<
+ SR, // >>
+ USR, // >>>
+ PLUS, // +
+ MINUS, // -
+ MUL, // *
+ DIV, // /
+ MOD, // %
- /** Unary operators, of type Unary.
- */
- public static final int POS = ERRONEOUS + 1; // +
- public static final int NEG = POS + 1; // -
- public static final int NOT = NEG + 1; // !
- public static final int COMPL = NOT + 1; // ~
- public static final int PREINC = COMPL + 1; // ++ _
- public static final int PREDEC = PREINC + 1; // -- _
- public static final int POSTINC = PREDEC + 1; // _ ++
- public static final int POSTDEC = POSTINC + 1; // _ --
+ /** Assignment operators, of type Assignop.
+ */
+ BITOR_ASG(BITOR), // |=
+ BITXOR_ASG(BITXOR), // ^=
+ BITAND_ASG(BITAND), // &=
- /** unary operator for null reference checks, only used internally.
- */
- public static final int NULLCHK = POSTDEC + 1;
+ SL_ASG(SL), // <<=
+ SR_ASG(SR), // >>=
+ USR_ASG(USR), // >>>=
+ PLUS_ASG(PLUS), // +=
+ MINUS_ASG(MINUS), // -=
+ MUL_ASG(MUL), // *=
+ DIV_ASG(DIV), // /=
+ MOD_ASG(MOD), // %=
- /** Binary operators, of type Binary.
- */
- public static final int OR = NULLCHK + 1; // ||
- public static final int AND = OR + 1; // &&
- public static final int BITOR = AND + 1; // |
- public static final int BITXOR = BITOR + 1; // ^
- public static final int BITAND = BITXOR + 1; // &
- public static final int EQ = BITAND + 1; // ==
- public static final int NE = EQ + 1; // !=
- public static final int LT = NE + 1; // <
- public static final int GT = LT + 1; // >
- public static final int LE = GT + 1; // <=
- public static final int GE = LE + 1; // >=
- public static final int SL = GE + 1; // <<
- public static final int SR = SL + 1; // >>
- public static final int USR = SR + 1; // >>>
- public static final int PLUS = USR + 1; // +
- public static final int MINUS = PLUS + 1; // -
- public static final int MUL = MINUS + 1; // *
- public static final int DIV = MUL + 1; // /
- public static final int MOD = DIV + 1; // %
+ /** A synthetic let expression, of type LetExpr.
+ */
+ LETEXPR; // ala scheme
+
+ private Tag noAssignTag;
+
+ private static int numberOfOperators = MOD.ordinal() - POS.ordinal() + 1;
+
+ private Tag(Tag noAssignTag) {
+ this.noAssignTag = noAssignTag;
+ }
+
+ private Tag() { }
+
+ public static int getNumberOfOperators() {
+ return numberOfOperators;
+ }
- /** Assignment operators, of type Assignop.
- */
- public static final int BITOR_ASG = MOD + 1; // |=
- public static final int BITXOR_ASG = BITOR_ASG + 1; // ^=
- public static final int BITAND_ASG = BITXOR_ASG + 1; // &=
+ public Tag noAssignOp() {
+ if (noAssignTag != null)
+ return noAssignTag;
+ throw new AssertionError("noAssignOp() method is not available for non assignment tags");
+ }
+
+ public boolean isPostUnaryOp() {
+ return (this == POSTINC || this == POSTDEC);
+ }
- public static final int SL_ASG = SL + BITOR_ASG - BITOR; // <<=
- public static final int SR_ASG = SL_ASG + 1; // >>=
- public static final int USR_ASG = SR_ASG + 1; // >>>=
- public static final int PLUS_ASG = USR_ASG + 1; // +=
- public static final int MINUS_ASG = PLUS_ASG + 1; // -=
- public static final int MUL_ASG = MINUS_ASG + 1; // *=
- public static final int DIV_ASG = MUL_ASG + 1; // /=
- public static final int MOD_ASG = DIV_ASG + 1; // %=
+ public boolean isIncOrDecUnaryOp() {
+ return (this == PREINC || this == PREDEC || this == POSTINC || this == POSTDEC);
+ }
- /** A synthetic let expression, of type LetExpr.
- */
- public static final int LETEXPR = MOD_ASG + 1; // ala scheme
+ public boolean isAssignop() {
+ return noAssignTag != null;
+ }
-
- /** The offset between assignment operators and normal operators.
- */
- public static final int ASGOffset = BITOR_ASG - BITOR;
+ public int operatorIndex() {
+ return (this.ordinal() - POS.ordinal());
+ }
+ }
/* The (encoded) position in the source file. @see util.Position.
*/
@@ -337,7 +374,13 @@
/* The tag of this node -- one of the constants declared above.
*/
- public abstract int getTag();
+ public abstract Tag getTag();
+
+ /* Returns true if the tag of this node is equals to tag.
+ */
+ public boolean hasTag(Tag tag) {
+ return tag == getTag();
+ }
/** Convert a tree to a pretty-printed string. */
@Override
@@ -464,10 +507,9 @@
public List<JCImport> getImports() {
ListBuffer<JCImport> imports = new ListBuffer<JCImport>();
for (JCTree tree : defs) {
- int tag = tree.getTag();
- if (tag == IMPORT)
+ if (tree.hasTag(IMPORT))
imports.append((JCImport)tree);
- else if (tag != SKIP)
+ else if (!tree.hasTag(SKIP))
break;
}
return imports.toList();
@@ -482,7 +524,7 @@
public List<JCTree> getTypeDecls() {
List<JCTree> typeDefs;
for (typeDefs = defs; !typeDefs.isEmpty(); typeDefs = typeDefs.tail)
- if (typeDefs.head.getTag() != IMPORT)
+ if (!typeDefs.head.hasTag(IMPORT))
break;
return typeDefs;
}
@@ -492,7 +534,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TOPLEVEL;
}
}
@@ -521,7 +563,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return IMPORT;
}
}
@@ -618,7 +660,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CLASSDEF;
}
}
@@ -690,7 +732,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return METHODDEF;
}
}
@@ -736,7 +778,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return VARDEF;
}
}
@@ -757,7 +799,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SKIP;
}
}
@@ -790,7 +832,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return BLOCK;
}
}
@@ -817,7 +859,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return DOLOOP;
}
}
@@ -844,7 +886,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return WHILELOOP;
}
}
@@ -885,7 +927,7 @@
}
@Override
- public int getTag() {
+ public Tag getTag() {
return FORLOOP;
}
}
@@ -914,7 +956,7 @@
return v.visitEnhancedForLoop(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return FOREACHLOOP;
}
}
@@ -939,7 +981,7 @@
return v.visitLabeledStatement(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LABELLED;
}
}
@@ -965,7 +1007,7 @@
return v.visitSwitch(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SWITCH;
}
}
@@ -991,7 +1033,7 @@
return v.visitCase(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CASE;
}
}
@@ -1017,7 +1059,7 @@
return v.visitSynchronized(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return SYNCHRONIZED;
}
}
@@ -1057,7 +1099,7 @@
return resources;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TRY;
}
}
@@ -1083,7 +1125,7 @@
return v.visitCatch(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CATCH;
}
}
@@ -1115,7 +1157,7 @@
return v.visitConditionalExpression(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CONDEXPR;
}
}
@@ -1147,7 +1189,7 @@
return v.visitIf(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return IF;
}
}
@@ -1172,7 +1214,7 @@
return v.visitExpressionStatement(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return EXEC;
}
@@ -1212,7 +1254,7 @@
return v.visitBreak(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return BREAK;
}
}
@@ -1237,7 +1279,7 @@
return v.visitContinue(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return CONTINUE;
}
}
@@ -1260,7 +1302,7 @@
return v.visitReturn(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return RETURN;
}
}
@@ -1283,7 +1325,7 @@
return v.visitThrow(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return THROW;
}
}
@@ -1309,7 +1351,7 @@
return v.visitAssert(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ASSERT;
}
}
@@ -1352,7 +1394,7 @@
return this;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return(APPLY);
}
}
@@ -1402,7 +1444,7 @@
return v.visitNewClass(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return NEWCLASS;
}
}
@@ -1438,7 +1480,7 @@
return v.visitNewArray(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return NEWARRAY;
}
}
@@ -1461,7 +1503,7 @@
return v.visitParenthesized(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return PARENS;
}
}
@@ -1487,7 +1529,7 @@
return v.visitAssignment(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ASSIGN;
}
}
@@ -1496,11 +1538,11 @@
* An assignment with "+=", "|=" ...
*/
public static class JCAssignOp extends JCExpression implements CompoundAssignmentTree {
- private int opcode;
+ private Tag opcode;
public JCExpression lhs;
public JCExpression rhs;
public Symbol operator;
- protected JCAssignOp(int opcode, JCTree lhs, JCTree rhs, Symbol operator) {
+ protected JCAssignOp(Tag opcode, JCTree lhs, JCTree rhs, Symbol operator) {
this.opcode = opcode;
this.lhs = (JCExpression)lhs;
this.rhs = (JCExpression)rhs;
@@ -1520,7 +1562,7 @@
return v.visitCompoundAssignment(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
}
@@ -1529,10 +1571,10 @@
* A unary operation.
*/
public static class JCUnary extends JCExpression implements UnaryTree {
- private int opcode;
+ private Tag opcode;
public JCExpression arg;
public Symbol operator;
- protected JCUnary(int opcode, JCExpression arg) {
+ protected JCUnary(Tag opcode, JCExpression arg) {
this.opcode = opcode;
this.arg = arg;
}
@@ -1549,11 +1591,11 @@
return v.visitUnary(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
- public void setTag(int tag) {
+ public void setTag(Tag tag) {
opcode = tag;
}
}
@@ -1562,11 +1604,11 @@
* A binary operation.
*/
public static class JCBinary extends JCExpression implements BinaryTree {
- private int opcode;
+ private Tag opcode;
public JCExpression lhs;
public JCExpression rhs;
public Symbol operator;
- protected JCBinary(int opcode,
+ protected JCBinary(Tag opcode,
JCExpression lhs,
JCExpression rhs,
Symbol operator) {
@@ -1589,7 +1631,7 @@
return v.visitBinary(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return opcode;
}
}
@@ -1615,7 +1657,7 @@
return v.visitTypeCast(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPECAST;
}
}
@@ -1641,7 +1683,7 @@
return v.visitInstanceOf(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPETEST;
}
}
@@ -1667,7 +1709,7 @@
return v.visitArrayAccess(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return INDEXED;
}
}
@@ -1698,7 +1740,7 @@
}
public Name getIdentifier() { return name; }
@Override
- public int getTag() {
+ public Tag getTag() {
return SELECT;
}
}
@@ -1724,7 +1766,8 @@
public <R,D> R accept(TreeVisitor<R,D> v, D d) {
return v.visitIdentifier(this, d);
}
- public int getTag() {
+ @Override
+ public Tag getTag() {
return IDENT;
}
}
@@ -1790,7 +1833,7 @@
return this;
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LITERAL;
}
}
@@ -1838,7 +1881,7 @@
return v.visitPrimitiveType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEIDENT;
}
}
@@ -1861,7 +1904,7 @@
return v.visitArrayType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEARRAY;
}
}
@@ -1889,7 +1932,7 @@
return v.visitParameterizedType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEAPPLY;
}
}
@@ -1917,7 +1960,7 @@
return v.visitUnionType(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEUNION;
}
}
@@ -1947,7 +1990,7 @@
return v.visitTypeParameter(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEPARAMETER;
}
}
@@ -1981,7 +2024,7 @@
return v.visitWildcard(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return WILDCARD;
}
}
@@ -2002,7 +2045,7 @@
throw new AssertionError("TypeBoundKind is not part of a public API");
}
@Override
- public int getTag() {
+ public Tag getTag() {
return TYPEBOUNDKIND;
}
}
@@ -2027,7 +2070,7 @@
return v.visitAnnotation(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ANNOTATION;
}
}
@@ -2054,7 +2097,7 @@
return v.visitModifiers(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return MODIFIERS;
}
}
@@ -2079,7 +2122,7 @@
return v.visitErroneous(this, d);
}
@Override
- public int getTag() {
+ public Tag getTag() {
return ERRONEOUS;
}
}
@@ -2103,7 +2146,7 @@
throw new AssertionError("LetExpr is not part of a public API");
}
@Override
- public int getTag() {
+ public Tag getTag() {
return LETEXPR;
}
}
@@ -2175,9 +2218,9 @@
List<JCExpression> elems);
JCParens Parens(JCExpression expr);
JCAssign Assign(JCExpression lhs, JCExpression rhs);
- JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs);
- JCUnary Unary(int opcode, JCExpression arg);
- JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs);
+ JCAssignOp Assignop(Tag opcode, JCTree lhs, JCTree rhs);
+ JCUnary Unary(Tag opcode, JCExpression arg);
+ JCBinary Binary(Tag opcode, JCExpression lhs, JCExpression rhs);
JCTypeCast TypeCast(JCTree expr, JCExpression type);
JCInstanceOf TypeTest(JCExpression expr, JCTree clazz);
JCArrayAccess Indexed(JCExpression indexed, JCExpression index);
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Tue Nov 08 11:51:05 2011 -0800
@@ -36,6 +36,8 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.Flags.ANNOTATION;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/** Prints out a tree as an indented Java source program.
*
@@ -310,7 +312,7 @@
/** Is the given tree an enumerator definition? */
boolean isEnumerator(JCTree t) {
- return t.getTag() == JCTree.VARDEF && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
+ return t.hasTag(VARDEF) && (((JCVariableDecl) t).mods.flags & ENUM) != 0;
}
/** Print unit consisting of package clause and import statements in toplevel,
@@ -331,9 +333,9 @@
}
boolean firstImport = true;
for (List<JCTree> l = tree.defs;
- l.nonEmpty() && (cdef == null || l.head.getTag() == JCTree.IMPORT);
+ l.nonEmpty() && (cdef == null || l.head.hasTag(IMPORT));
l = l.tail) {
- if (l.head.getTag() == JCTree.IMPORT) {
+ if (l.head.hasTag(IMPORT)) {
JCImport imp = (JCImport)l.head;
Name name = TreeInfo.name(imp.qualid);
if (name == name.table.names.asterisk ||
@@ -484,7 +486,7 @@
print("/*public static final*/ ");
print(tree.name);
if (tree.init != null) {
- if (sourceOutput && tree.init.getTag() == JCTree.NEWCLASS) {
+ if (sourceOutput && tree.init.hasTag(NEWCLASS)) {
print(" /*enum*/ ");
JCNewClass init = (JCNewClass) tree.init;
if (init.args != null && init.args.nonEmpty()) {
@@ -545,7 +547,7 @@
printStat(tree.body);
align();
print(" while ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -561,7 +563,7 @@
public void visitWhileLoop(JCWhileLoop tree) {
try {
print("while ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -579,7 +581,7 @@
try {
print("for (");
if (tree.init.nonEmpty()) {
- if (tree.init.head.getTag() == JCTree.VARDEF) {
+ if (tree.init.head.hasTag(VARDEF)) {
printExpr(tree.init.head);
for (List<JCStatement> l = tree.init.tail; l.nonEmpty(); l = l.tail) {
JCVariableDecl vdef = (JCVariableDecl)l.head;
@@ -626,7 +628,7 @@
public void visitSwitch(JCSwitch tree) {
try {
print("switch ");
- if (tree.selector.getTag() == JCTree.PARENS) {
+ if (tree.selector.hasTag(PARENS)) {
printExpr(tree.selector);
} else {
print("(");
@@ -665,7 +667,7 @@
public void visitSynchronized(JCSynchronized tree) {
try {
print("synchronized ");
- if (tree.lock.getTag() == JCTree.PARENS) {
+ if (tree.lock.hasTag(PARENS)) {
printExpr(tree.lock);
} else {
print("(");
@@ -736,7 +738,7 @@
public void visitIf(JCIf tree) {
try {
print("if ");
- if (tree.cond.getTag() == JCTree.PARENS) {
+ if (tree.cond.hasTag(PARENS)) {
printExpr(tree.cond);
} else {
print("(");
@@ -823,7 +825,7 @@
public void visitApply(JCMethodInvocation tree) {
try {
if (!tree.typeargs.isEmpty()) {
- if (tree.meth.getTag() == JCTree.SELECT) {
+ if (tree.meth.hasTag(SELECT)) {
JCFieldAccess left = (JCFieldAccess)tree.meth;
printExpr(left.selected);
print(".<");
@@ -882,7 +884,7 @@
if (tree.elemtype != null) {
print("new ");
JCTree elem = tree.elemtype;
- if (elem.getTag() == JCTree.TYPEARRAY)
+ if (elem.hasTag(TYPEARRAY))
printBaseElementType((JCArrayTypeTree) elem);
else
printExpr(elem);
@@ -927,36 +929,36 @@
}
}
- public String operatorName(int tag) {
+ public String operatorName(JCTree.Tag tag) {
switch(tag) {
- case JCTree.POS: return "+";
- case JCTree.NEG: return "-";
- case JCTree.NOT: return "!";
- case JCTree.COMPL: return "~";
- case JCTree.PREINC: return "++";
- case JCTree.PREDEC: return "--";
- case JCTree.POSTINC: return "++";
- case JCTree.POSTDEC: return "--";
- case JCTree.NULLCHK: return "<*nullchk*>";
- case JCTree.OR: return "||";
- case JCTree.AND: return "&&";
- case JCTree.EQ: return "==";
- case JCTree.NE: return "!=";
- case JCTree.LT: return "<";
- case JCTree.GT: return ">";
- case JCTree.LE: return "<=";
- case JCTree.GE: return ">=";
- case JCTree.BITOR: return "|";
- case JCTree.BITXOR: return "^";
- case JCTree.BITAND: return "&";
- case JCTree.SL: return "<<";
- case JCTree.SR: return ">>";
- case JCTree.USR: return ">>>";
- case JCTree.PLUS: return "+";
- case JCTree.MINUS: return "-";
- case JCTree.MUL: return "*";
- case JCTree.DIV: return "/";
- case JCTree.MOD: return "%";
+ case POS: return "+";
+ case NEG: return "-";
+ case NOT: return "!";
+ case COMPL: return "~";
+ case PREINC: return "++";
+ case PREDEC: return "--";
+ case POSTINC: return "++";
+ case POSTDEC: return "--";
+ case NULLCHK: return "<*nullchk*>";
+ case OR: return "||";
+ case AND: return "&&";
+ case EQ: return "==";
+ case NE: return "!=";
+ case LT: return "<";
+ case GT: return ">";
+ case LE: return "<=";
+ case GE: return ">=";
+ case BITOR: return "|";
+ case BITXOR: return "^";
+ case BITAND: return "&";
+ case SL: return "<<";
+ case SR: return ">>";
+ case USR: return ">>>";
+ case PLUS: return "+";
+ case MINUS: return "-";
+ case MUL: return "*";
+ case DIV: return "/";
+ case MOD: return "%";
default: throw new Error();
}
}
@@ -965,7 +967,7 @@
try {
open(prec, TreeInfo.assignopPrec);
printExpr(tree.lhs, TreeInfo.assignopPrec + 1);
- print(" " + operatorName(tree.getTag() - JCTree.ASGOffset) + "= ");
+ print(" " + operatorName(tree.getTag().noAssignOp()) + "= ");
printExpr(tree.rhs, TreeInfo.assignopPrec);
close(prec, TreeInfo.assignopPrec);
} catch (IOException e) {
@@ -978,7 +980,7 @@
int ownprec = TreeInfo.opPrec(tree.getTag());
String opname = operatorName(tree.getTag());
open(prec, ownprec);
- if (tree.getTag() <= JCTree.PREDEC) {
+ if (!tree.getTag().isPostUnaryOp()) {
print(opname);
printExpr(tree.arg, ownprec);
} else {
@@ -1153,7 +1155,7 @@
while (true) {
elem = tree.elemtype;
print("[]");
- if (elem.getTag() != JCTree.TYPEARRAY) break;
+ if (!elem.hasTag(TYPEARRAY)) break;
tree = (JCArrayTypeTree) elem;
}
}
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Tue Nov 08 11:51:05 2011 -0800
@@ -406,7 +406,7 @@
public JCTree visitOther(Tree node, P p) {
JCTree tree = (JCTree) node;
switch (tree.getTag()) {
- case JCTree.LETEXPR: {
+ case LETEXPR: {
LetExpr t = (LetExpr) node;
List<JCVariableDecl> defs = copy(t.defs, p);
JCTree expr = copy(t.expr, p);
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Nov 08 11:51:05 2011 -0800
@@ -35,6 +35,9 @@
import com.sun.tools.javac.tree.JCTree.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
+import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED;
/** Utility class containing inspector methods for trees.
*
@@ -56,53 +59,60 @@
/** The names of all operators.
*/
- private Name[] opname = new Name[JCTree.MOD - JCTree.POS + 1];
+ private Name[] opname = new Name[Tag.getNumberOfOperators()];
+
+ private void setOpname(Tag tag, String name, Names names) {
+ setOpname(tag, names.fromString(name));
+ }
+ private void setOpname(Tag tag, Name name) {
+ opname[tag.operatorIndex()] = name;
+ }
private TreeInfo(Context context) {
context.put(treeInfoKey, this);
Names names = Names.instance(context);
- opname[JCTree.POS - JCTree.POS] = names.fromString("+");
- opname[JCTree.NEG - JCTree.POS] = names.hyphen;
- opname[JCTree.NOT - JCTree.POS] = names.fromString("!");
- opname[JCTree.COMPL - JCTree.POS] = names.fromString("~");
- opname[JCTree.PREINC - JCTree.POS] = names.fromString("++");
- opname[JCTree.PREDEC - JCTree.POS] = names.fromString("--");
- opname[JCTree.POSTINC - JCTree.POS] = names.fromString("++");
- opname[JCTree.POSTDEC - JCTree.POS] = names.fromString("--");
- opname[JCTree.NULLCHK - JCTree.POS] = names.fromString("<*nullchk*>");
- opname[JCTree.OR - JCTree.POS] = names.fromString("||");
- opname[JCTree.AND - JCTree.POS] = names.fromString("&&");
- opname[JCTree.EQ - JCTree.POS] = names.fromString("==");
- opname[JCTree.NE - JCTree.POS] = names.fromString("!=");
- opname[JCTree.LT - JCTree.POS] = names.fromString("<");
- opname[JCTree.GT - JCTree.POS] = names.fromString(">");
- opname[JCTree.LE - JCTree.POS] = names.fromString("<=");
- opname[JCTree.GE - JCTree.POS] = names.fromString(">=");
- opname[JCTree.BITOR - JCTree.POS] = names.fromString("|");
- opname[JCTree.BITXOR - JCTree.POS] = names.fromString("^");
- opname[JCTree.BITAND - JCTree.POS] = names.fromString("&");
- opname[JCTree.SL - JCTree.POS] = names.fromString("<<");
- opname[JCTree.SR - JCTree.POS] = names.fromString(">>");
- opname[JCTree.USR - JCTree.POS] = names.fromString(">>>");
- opname[JCTree.PLUS - JCTree.POS] = names.fromString("+");
- opname[JCTree.MINUS - JCTree.POS] = names.hyphen;
- opname[JCTree.MUL - JCTree.POS] = names.asterisk;
- opname[JCTree.DIV - JCTree.POS] = names.slash;
- opname[JCTree.MOD - JCTree.POS] = names.fromString("%");
+ setOpname(POS, "+", names);
+ setOpname(NEG, names.hyphen);
+ setOpname(NOT, "!", names);
+ setOpname(COMPL, "~", names);
+ setOpname(PREINC, "++", names);
+ setOpname(PREDEC, "--", names);
+ setOpname(POSTINC, "++", names);
+ setOpname(POSTDEC, "--", names);
+ setOpname(NULLCHK, "<*nullchk*>", names);
+ setOpname(OR, "||", names);
+ setOpname(AND, "&&", names);
+ setOpname(EQ, "==", names);
+ setOpname(NE, "!=", names);
+ setOpname(LT, "<", names);
+ setOpname(GT, ">", names);
+ setOpname(LE, "<=", names);
+ setOpname(GE, ">=", names);
+ setOpname(BITOR, "|", names);
+ setOpname(BITXOR, "^", names);
+ setOpname(BITAND, "&", names);
+ setOpname(SL, "<<", names);
+ setOpname(SR, ">>", names);
+ setOpname(USR, ">>>", names);
+ setOpname(PLUS, "+", names);
+ setOpname(MINUS, names.hyphen);
+ setOpname(MUL, names.asterisk);
+ setOpname(DIV, names.slash);
+ setOpname(MOD, "%", names);
}
/** Return name of operator with given tree tag.
*/
- public Name operatorName(int tag) {
- return opname[tag - JCTree.POS];
+ public Name operatorName(JCTree.Tag tag) {
+ return opname[tag.operatorIndex()];
}
/** Is tree a constructor declaration?
*/
public static boolean isConstructor(JCTree tree) {
- if (tree.getTag() == JCTree.METHODDEF) {
+ if (tree.hasTag(METHODDEF)) {
Name name = ((JCMethodDecl) tree).name;
return name == name.table.names.init;
} else {
@@ -119,17 +129,17 @@
}
public static boolean isMultiCatch(JCCatch catchClause) {
- return catchClause.param.vartype.getTag() == JCTree.TYPEUNION;
+ return catchClause.param.vartype.hasTag(TYPEUNION);
}
/** Is statement an initializer for a synthetic field?
*/
public static boolean isSyntheticInit(JCTree stat) {
- if (stat.getTag() == JCTree.EXEC) {
+ if (stat.hasTag(EXEC)) {
JCExpressionStatement exec = (JCExpressionStatement)stat;
- if (exec.expr.getTag() == JCTree.ASSIGN) {
+ if (exec.expr.hasTag(ASSIGN)) {
JCAssign assign = (JCAssign)exec.expr;
- if (assign.lhs.getTag() == JCTree.SELECT) {
+ if (assign.lhs.hasTag(SELECT)) {
JCFieldAccess select = (JCFieldAccess)assign.lhs;
if (select.sym != null &&
(select.sym.flags() & SYNTHETIC) != 0) {
@@ -146,9 +156,9 @@
/** If the expression is a method call, return the method name, null
* otherwise. */
public static Name calledMethodName(JCTree tree) {
- if (tree.getTag() == JCTree.EXEC) {
+ if (tree.hasTag(EXEC)) {
JCExpressionStatement exec = (JCExpressionStatement)tree;
- if (exec.expr.getTag() == JCTree.APPLY) {
+ if (exec.expr.hasTag(APPLY)) {
Name mname = TreeInfo.name(((JCMethodInvocation) exec.expr).meth);
return mname;
}
@@ -192,7 +202,7 @@
/** Return the first call in a constructor definition. */
public static JCMethodInvocation firstConstructorCall(JCTree tree) {
- if (tree.getTag() != JCTree.METHODDEF) return null;
+ if (!tree.hasTag(METHODDEF)) return null;
JCMethodDecl md = (JCMethodDecl) tree;
Names names = md.name.table.names;
if (md.name != names.init) return null;
@@ -202,24 +212,24 @@
while (stats.nonEmpty() && isSyntheticInit(stats.head))
stats = stats.tail;
if (stats.isEmpty()) return null;
- if (stats.head.getTag() != JCTree.EXEC) return null;
+ if (!stats.head.hasTag(EXEC)) return null;
JCExpressionStatement exec = (JCExpressionStatement) stats.head;
- if (exec.expr.getTag() != JCTree.APPLY) return null;
+ if (!exec.expr.hasTag(APPLY)) return null;
return (JCMethodInvocation)exec.expr;
}
/** Return true if a tree represents a diamond new expr. */
public static boolean isDiamond(JCTree tree) {
switch(tree.getTag()) {
- case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
- case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
+ case TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
+ case NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
default: return false;
}
}
/** Return true if a tree represents the null literal. */
public static boolean isNull(JCTree tree) {
- if (tree.getTag() != JCTree.LITERAL)
+ if (!tree.hasTag(LITERAL))
return false;
JCLiteral lit = (JCLiteral) tree;
return (lit.typetag == TypeTags.BOT);
@@ -229,7 +239,7 @@
* the block itself if it is empty.
*/
public static int firstStatPos(JCTree tree) {
- if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).stats.nonEmpty())
+ if (tree.hasTag(BLOCK) && ((JCBlock) tree).stats.nonEmpty())
return ((JCBlock) tree).stats.head.pos;
else
return tree.pos;
@@ -239,11 +249,11 @@
* defined endpos.
*/
public static int endPos(JCTree tree) {
- if (tree.getTag() == JCTree.BLOCK && ((JCBlock) tree).endpos != Position.NOPOS)
+ if (tree.hasTag(BLOCK) && ((JCBlock) tree).endpos != Position.NOPOS)
return ((JCBlock) tree).endpos;
- else if (tree.getTag() == JCTree.SYNCHRONIZED)
+ else if (tree.hasTag(SYNCHRONIZED))
return endPos(((JCSynchronized) tree).body);
- else if (tree.getTag() == JCTree.TRY) {
+ else if (tree.hasTag(TRY)) {
JCTry t = (JCTry) tree;
return endPos((t.finalizer != null)
? t.finalizer
@@ -263,73 +273,73 @@
return Position.NOPOS;
switch(tree.getTag()) {
- case(JCTree.APPLY):
- return getStartPos(((JCMethodInvocation) tree).meth);
- case(JCTree.ASSIGN):
- return getStartPos(((JCAssign) tree).lhs);
- case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
- case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
- case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
- case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
- return getStartPos(((JCAssignOp) tree).lhs);
- case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
- case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
- case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
- case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
- case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
- case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
- case(JCTree.MOD):
- return getStartPos(((JCBinary) tree).lhs);
- case(JCTree.CLASSDEF): {
- JCClassDecl node = (JCClassDecl)tree;
- if (node.mods.pos != Position.NOPOS)
- return node.mods.pos;
- break;
- }
- case(JCTree.CONDEXPR):
- return getStartPos(((JCConditional) tree).cond);
- case(JCTree.EXEC):
- return getStartPos(((JCExpressionStatement) tree).expr);
- case(JCTree.INDEXED):
- return getStartPos(((JCArrayAccess) tree).indexed);
- case(JCTree.METHODDEF): {
- JCMethodDecl node = (JCMethodDecl)tree;
- if (node.mods.pos != Position.NOPOS)
- return node.mods.pos;
- if (node.typarams.nonEmpty()) // List.nil() used for no typarams
- return getStartPos(node.typarams.head);
- return node.restype == null ? node.pos : getStartPos(node.restype);
- }
- case(JCTree.SELECT):
- return getStartPos(((JCFieldAccess) tree).selected);
- case(JCTree.TYPEAPPLY):
- return getStartPos(((JCTypeApply) tree).clazz);
- case(JCTree.TYPEARRAY):
- return getStartPos(((JCArrayTypeTree) tree).elemtype);
- case(JCTree.TYPETEST):
- return getStartPos(((JCInstanceOf) tree).expr);
- case(JCTree.POSTINC):
- case(JCTree.POSTDEC):
- return getStartPos(((JCUnary) tree).arg);
- case(JCTree.NEWCLASS): {
- JCNewClass node = (JCNewClass)tree;
- if (node.encl != null)
- return getStartPos(node.encl);
- break;
- }
- case(JCTree.VARDEF): {
- JCVariableDecl node = (JCVariableDecl)tree;
- if (node.mods.pos != Position.NOPOS) {
- return node.mods.pos;
- } else {
- return getStartPos(node.vartype);
+ case APPLY:
+ return getStartPos(((JCMethodInvocation) tree).meth);
+ case ASSIGN:
+ return getStartPos(((JCAssign) tree).lhs);
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+ case DIV_ASG: case MOD_ASG:
+ return getStartPos(((JCAssignOp) tree).lhs);
+ case OR: case AND: case BITOR:
+ case BITXOR: case BITAND: case EQ:
+ case NE: case LT: case GT:
+ case LE: case GE: case SL:
+ case SR: case USR: case PLUS:
+ case MINUS: case MUL: case DIV:
+ case MOD:
+ return getStartPos(((JCBinary) tree).lhs);
+ case CLASSDEF: {
+ JCClassDecl node = (JCClassDecl)tree;
+ if (node.mods.pos != Position.NOPOS)
+ return node.mods.pos;
+ break;
}
- }
- case(JCTree.ERRONEOUS): {
- JCErroneous node = (JCErroneous)tree;
- if (node.errs != null && node.errs.nonEmpty())
- return getStartPos(node.errs.head);
- }
+ case CONDEXPR:
+ return getStartPos(((JCConditional) tree).cond);
+ case EXEC:
+ return getStartPos(((JCExpressionStatement) tree).expr);
+ case INDEXED:
+ return getStartPos(((JCArrayAccess) tree).indexed);
+ case METHODDEF: {
+ JCMethodDecl node = (JCMethodDecl)tree;
+ if (node.mods.pos != Position.NOPOS)
+ return node.mods.pos;
+ if (node.typarams.nonEmpty()) // List.nil() used for no typarams
+ return getStartPos(node.typarams.head);
+ return node.restype == null ? node.pos : getStartPos(node.restype);
+ }
+ case SELECT:
+ return getStartPos(((JCFieldAccess) tree).selected);
+ case TYPEAPPLY:
+ return getStartPos(((JCTypeApply) tree).clazz);
+ case TYPEARRAY:
+ return getStartPos(((JCArrayTypeTree) tree).elemtype);
+ case TYPETEST:
+ return getStartPos(((JCInstanceOf) tree).expr);
+ case POSTINC:
+ case POSTDEC:
+ return getStartPos(((JCUnary) tree).arg);
+ case NEWCLASS: {
+ JCNewClass node = (JCNewClass)tree;
+ if (node.encl != null)
+ return getStartPos(node.encl);
+ break;
+ }
+ case VARDEF: {
+ JCVariableDecl node = (JCVariableDecl)tree;
+ if (node.mods.pos != Position.NOPOS) {
+ return node.mods.pos;
+ } else {
+ return getStartPos(node.vartype);
+ }
+ }
+ case ERRONEOUS: {
+ JCErroneous node = (JCErroneous)tree;
+ if (node.errs != null && node.errs.nonEmpty())
+ return getStartPos(node.errs.head);
+ }
}
return tree.pos;
}
@@ -350,75 +360,75 @@
return mapPos;
switch(tree.getTag()) {
- case(JCTree.BITOR_ASG): case(JCTree.BITXOR_ASG): case(JCTree.BITAND_ASG):
- case(JCTree.SL_ASG): case(JCTree.SR_ASG): case(JCTree.USR_ASG):
- case(JCTree.PLUS_ASG): case(JCTree.MINUS_ASG): case(JCTree.MUL_ASG):
- case(JCTree.DIV_ASG): case(JCTree.MOD_ASG):
- return getEndPos(((JCAssignOp) tree).rhs, endPositions);
- case(JCTree.OR): case(JCTree.AND): case(JCTree.BITOR):
- case(JCTree.BITXOR): case(JCTree.BITAND): case(JCTree.EQ):
- case(JCTree.NE): case(JCTree.LT): case(JCTree.GT):
- case(JCTree.LE): case(JCTree.GE): case(JCTree.SL):
- case(JCTree.SR): case(JCTree.USR): case(JCTree.PLUS):
- case(JCTree.MINUS): case(JCTree.MUL): case(JCTree.DIV):
- case(JCTree.MOD):
- return getEndPos(((JCBinary) tree).rhs, endPositions);
- case(JCTree.CASE):
- return getEndPos(((JCCase) tree).stats.last(), endPositions);
- case(JCTree.CATCH):
- return getEndPos(((JCCatch) tree).body, endPositions);
- case(JCTree.CONDEXPR):
- return getEndPos(((JCConditional) tree).falsepart, endPositions);
- case(JCTree.FORLOOP):
- return getEndPos(((JCForLoop) tree).body, endPositions);
- case(JCTree.FOREACHLOOP):
- return getEndPos(((JCEnhancedForLoop) tree).body, endPositions);
- case(JCTree.IF): {
- JCIf node = (JCIf)tree;
- if (node.elsepart == null) {
- return getEndPos(node.thenpart, endPositions);
- } else {
- return getEndPos(node.elsepart, endPositions);
+ case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
+ case SL_ASG: case SR_ASG: case USR_ASG:
+ case PLUS_ASG: case MINUS_ASG: case MUL_ASG:
+ case DIV_ASG: case MOD_ASG:
+ return getEndPos(((JCAssignOp) tree).rhs, endPositions);
+ case OR: case AND: case BITOR:
+ case BITXOR: case BITAND: case EQ:
+ case NE: case LT: case GT:
+ case LE: case GE: case SL:
+ case SR: case USR: case PLUS:
+ case MINUS: case MUL: case DIV:
+ case MOD:
+ return getEndPos(((JCBinary) tree).rhs, endPositions);
+ case CASE:
+ return getEndPos(((JCCase) tree).stats.last(), endPositions);
+ case CATCH:
+ return getEndPos(((JCCatch) tree).body, endPositions);
+ case CONDEXPR:
+ return getEndPos(((JCConditional) tree).falsepart, endPositions);
+ case FORLOOP:
+ return getEndPos(((JCForLoop) tree).body, endPositions);
+ case FOREACHLOOP:
+ return getEndPos(((JCEnhancedForLoop) tree).body, endPositions);
+ case IF: {
+ JCIf node = (JCIf)tree;
+ if (node.elsepart == null) {
+ return getEndPos(node.thenpart, endPositions);
+ } else {
+ return getEndPos(node.elsepart, endPositions);
+ }
}
- }
- case(JCTree.LABELLED):
- return getEndPos(((JCLabeledStatement) tree).body, endPositions);
- case(JCTree.MODIFIERS):
- return getEndPos(((JCModifiers) tree).annotations.last(), endPositions);
- case(JCTree.SYNCHRONIZED):
- return getEndPos(((JCSynchronized) tree).body, endPositions);
- case(JCTree.TOPLEVEL):
- return getEndPos(((JCCompilationUnit) tree).defs.last(), endPositions);
- case(JCTree.TRY): {
- JCTry node = (JCTry)tree;
- if (node.finalizer != null) {
- return getEndPos(node.finalizer, endPositions);
- } else if (!node.catchers.isEmpty()) {
- return getEndPos(node.catchers.last(), endPositions);
- } else {
- return getEndPos(node.body, endPositions);
+ case LABELLED:
+ return getEndPos(((JCLabeledStatement) tree).body, endPositions);
+ case MODIFIERS:
+ return getEndPos(((JCModifiers) tree).annotations.last(), endPositions);
+ case SYNCHRONIZED:
+ return getEndPos(((JCSynchronized) tree).body, endPositions);
+ case TOPLEVEL:
+ return getEndPos(((JCCompilationUnit) tree).defs.last(), endPositions);
+ case TRY: {
+ JCTry node = (JCTry)tree;
+ if (node.finalizer != null) {
+ return getEndPos(node.finalizer, endPositions);
+ } else if (!node.catchers.isEmpty()) {
+ return getEndPos(node.catchers.last(), endPositions);
+ } else {
+ return getEndPos(node.body, endPositions);
+ }
}
- }
- case(JCTree.WILDCARD):
- return getEndPos(((JCWildcard) tree).inner, endPositions);
- case(JCTree.TYPECAST):
- return getEndPos(((JCTypeCast) tree).expr, endPositions);
- case(JCTree.TYPETEST):
- return getEndPos(((JCInstanceOf) tree).clazz, endPositions);
- case(JCTree.POS):
- case(JCTree.NEG):
- case(JCTree.NOT):
- case(JCTree.COMPL):
- case(JCTree.PREINC):
- case(JCTree.PREDEC):
- return getEndPos(((JCUnary) tree).arg, endPositions);
- case(JCTree.WHILELOOP):
- return getEndPos(((JCWhileLoop) tree).body, endPositions);
- case(JCTree.ERRONEOUS): {
- JCErroneous node = (JCErroneous)tree;
- if (node.errs != null && node.errs.nonEmpty())
- return getEndPos(node.errs.last(), endPositions);
- }
+ case WILDCARD:
+ return getEndPos(((JCWildcard) tree).inner, endPositions);
+ case TYPECAST:
+ return getEndPos(((JCTypeCast) tree).expr, endPositions);
+ case TYPETEST:
+ return getEndPos(((JCInstanceOf) tree).clazz, endPositions);
+ case POS:
+ case NEG:
+ case NOT:
+ case COMPL:
+ case PREINC:
+ case PREDEC:
+ return getEndPos(((JCUnary) tree).arg, endPositions);
+ case WHILELOOP:
+ return getEndPos(((JCWhileLoop) tree).body, endPositions);
+ case ERRONEOUS: {
+ JCErroneous node = (JCErroneous)tree;
+ if (node.errs != null && node.errs.nonEmpty())
+ return getEndPos(node.errs.last(), endPositions);
+ }
}
return Position.NOPOS;
}
@@ -443,11 +453,11 @@
/** The position of the finalizer of given try/synchronized statement.
*/
public static int finalizerPos(JCTree tree) {
- if (tree.getTag() == JCTree.TRY) {
+ if (tree.hasTag(TRY)) {
JCTry t = (JCTry) tree;
Assert.checkNonNull(t.finalizer);
return firstStatPos(t.finalizer);
- } else if (tree.getTag() == JCTree.SYNCHRONIZED) {
+ } else if (tree.hasTag(SYNCHRONIZED)) {
return endPos(((JCSynchronized) tree).body);
} else {
throw new AssertionError();
@@ -547,9 +557,9 @@
public static JCTree referencedStatement(JCLabeledStatement tree) {
JCTree t = tree;
do t = ((JCLabeledStatement) t).body;
- while (t.getTag() == JCTree.LABELLED);
+ while (t.hasTag(LABELLED));
switch (t.getTag()) {
- case JCTree.DOLOOP: case JCTree.WHILELOOP: case JCTree.FORLOOP: case JCTree.FOREACHLOOP: case JCTree.SWITCH:
+ case DOLOOP: case WHILELOOP: case FORLOOP: case FOREACHLOOP: case SWITCH:
return t;
default:
return tree;
@@ -559,7 +569,7 @@
/** Skip parens and return the enclosed expression
*/
public static JCExpression skipParens(JCExpression tree) {
- while (tree.getTag() == JCTree.PARENS) {
+ while (tree.hasTag(PARENS)) {
tree = ((JCParens) tree).expr;
}
return tree;
@@ -568,7 +578,7 @@
/** Skip parens and return the enclosed expression
*/
public static JCTree skipParens(JCTree tree) {
- if (tree.getTag() == JCTree.PARENS)
+ if (tree.hasTag(PARENS))
return skipParens((JCParens)tree);
else
return tree;
@@ -588,11 +598,11 @@
*/
public static Name name(JCTree tree) {
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).name;
- case JCTree.SELECT:
+ case SELECT:
return ((JCFieldAccess) tree).name;
- case JCTree.TYPEAPPLY:
+ case TYPEAPPLY:
return name(((JCTypeApply) tree).clazz);
default:
return null;
@@ -605,9 +615,9 @@
public static Name fullName(JCTree tree) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).name;
- case JCTree.SELECT:
+ case SELECT:
Name sname = fullName(((JCFieldAccess) tree).selected);
return sname == null ? null : sname.append('.', name(tree));
default:
@@ -618,11 +628,11 @@
public static Symbol symbolFor(JCTree node) {
node = skipParens(node);
switch (node.getTag()) {
- case JCTree.CLASSDEF:
+ case CLASSDEF:
return ((JCClassDecl) node).sym;
- case JCTree.METHODDEF:
+ case METHODDEF:
return ((JCMethodDecl) node).sym;
- case JCTree.VARDEF:
+ case VARDEF:
return ((JCVariableDecl) node).sym;
default:
return null;
@@ -632,9 +642,9 @@
public static boolean isDeclaration(JCTree node) {
node = skipParens(node);
switch (node.getTag()) {
- case JCTree.CLASSDEF:
- case JCTree.METHODDEF:
- case JCTree.VARDEF:
+ case CLASSDEF:
+ case METHODDEF:
+ case VARDEF:
return true;
default:
return false;
@@ -647,11 +657,11 @@
public static Symbol symbol(JCTree tree) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
return ((JCIdent) tree).sym;
- case JCTree.SELECT:
+ case SELECT:
return ((JCFieldAccess) tree).sym;
- case JCTree.TYPEAPPLY:
+ case TYPEAPPLY:
return symbol(((JCTypeApply) tree).clazz);
default:
return null;
@@ -661,7 +671,7 @@
/** Return true if this is a nonstatic selection. */
public static boolean nonstaticSelect(JCTree tree) {
tree = skipParens(tree);
- if (tree.getTag() != JCTree.SELECT) return false;
+ if (!tree.hasTag(SELECT)) return false;
JCFieldAccess s = (JCFieldAccess) tree;
Symbol e = symbol(s.selected);
return e == null || (e.kind != Kinds.PCK && e.kind != Kinds.TYP);
@@ -672,9 +682,9 @@
public static void setSymbol(JCTree tree, Symbol sym) {
tree = skipParens(tree);
switch (tree.getTag()) {
- case JCTree.IDENT:
+ case IDENT:
((JCIdent) tree).sym = sym; break;
- case JCTree.SELECT:
+ case SELECT:
((JCFieldAccess) tree).sym = sym; break;
default:
}
@@ -685,13 +695,13 @@
*/
public static long flags(JCTree tree) {
switch (tree.getTag()) {
- case JCTree.VARDEF:
+ case VARDEF:
return ((JCVariableDecl) tree).mods.flags;
- case JCTree.METHODDEF:
+ case METHODDEF:
return ((JCMethodDecl) tree).mods.flags;
- case JCTree.CLASSDEF:
+ case CLASSDEF:
return ((JCClassDecl) tree).mods.flags;
- case JCTree.BLOCK:
+ case BLOCK:
return ((JCBlock) tree).flags;
default:
return 0;
@@ -739,155 +749,155 @@
/** Map operators to their precedence levels.
*/
- public static int opPrec(int op) {
+ public static int opPrec(JCTree.Tag op) {
switch(op) {
- case JCTree.POS:
- case JCTree.NEG:
- case JCTree.NOT:
- case JCTree.COMPL:
- case JCTree.PREINC:
- case JCTree.PREDEC: return prefixPrec;
- case JCTree.POSTINC:
- case JCTree.POSTDEC:
- case JCTree.NULLCHK: return postfixPrec;
- case JCTree.ASSIGN: return assignPrec;
- case JCTree.BITOR_ASG:
- case JCTree.BITXOR_ASG:
- case JCTree.BITAND_ASG:
- case JCTree.SL_ASG:
- case JCTree.SR_ASG:
- case JCTree.USR_ASG:
- case JCTree.PLUS_ASG:
- case JCTree.MINUS_ASG:
- case JCTree.MUL_ASG:
- case JCTree.DIV_ASG:
- case JCTree.MOD_ASG: return assignopPrec;
- case JCTree.OR: return orPrec;
- case JCTree.AND: return andPrec;
- case JCTree.EQ:
- case JCTree.NE: return eqPrec;
- case JCTree.LT:
- case JCTree.GT:
- case JCTree.LE:
- case JCTree.GE: return ordPrec;
- case JCTree.BITOR: return bitorPrec;
- case JCTree.BITXOR: return bitxorPrec;
- case JCTree.BITAND: return bitandPrec;
- case JCTree.SL:
- case JCTree.SR:
- case JCTree.USR: return shiftPrec;
- case JCTree.PLUS:
- case JCTree.MINUS: return addPrec;
- case JCTree.MUL:
- case JCTree.DIV:
- case JCTree.MOD: return mulPrec;
- case JCTree.TYPETEST: return ordPrec;
+ case POS:
+ case NEG:
+ case NOT:
+ case COMPL:
+ case PREINC:
+ case PREDEC: return prefixPrec;
+ case POSTINC:
+ case POSTDEC:
+ case NULLCHK: return postfixPrec;
+ case ASSIGN: return assignPrec;
+ case BITOR_ASG:
+ case BITXOR_ASG:
+ case BITAND_ASG:
+ case SL_ASG:
+ case SR_ASG:
+ case USR_ASG:
+ case PLUS_ASG:
+ case MINUS_ASG:
+ case MUL_ASG:
+ case DIV_ASG:
+ case MOD_ASG: return assignopPrec;
+ case OR: return orPrec;
+ case AND: return andPrec;
+ case EQ:
+ case NE: return eqPrec;
+ case LT:
+ case GT:
+ case LE:
+ case GE: return ordPrec;
+ case BITOR: return bitorPrec;
+ case BITXOR: return bitxorPrec;
+ case BITAND: return bitandPrec;
+ case SL:
+ case SR:
+ case USR: return shiftPrec;
+ case PLUS:
+ case MINUS: return addPrec;
+ case MUL:
+ case DIV:
+ case MOD: return mulPrec;
+ case TYPETEST: return ordPrec;
default: throw new AssertionError();
}
}
- static Tree.Kind tagToKind(int tag) {
+ static Tree.Kind tagToKind(JCTree.Tag tag) {
switch (tag) {
// Postfix expressions
- case JCTree.POSTINC: // _ ++
+ case POSTINC: // _ ++
return Tree.Kind.POSTFIX_INCREMENT;
- case JCTree.POSTDEC: // _ --
+ case POSTDEC: // _ --
return Tree.Kind.POSTFIX_DECREMENT;
// Unary operators
- case JCTree.PREINC: // ++ _
+ case PREINC: // ++ _
return Tree.Kind.PREFIX_INCREMENT;
- case JCTree.PREDEC: // -- _
+ case PREDEC: // -- _
return Tree.Kind.PREFIX_DECREMENT;
- case JCTree.POS: // +
+ case POS: // +
return Tree.Kind.UNARY_PLUS;
- case JCTree.NEG: // -
+ case NEG: // -
return Tree.Kind.UNARY_MINUS;
- case JCTree.COMPL: // ~
+ case COMPL: // ~
return Tree.Kind.BITWISE_COMPLEMENT;
- case JCTree.NOT: // !
+ case NOT: // !
return Tree.Kind.LOGICAL_COMPLEMENT;
// Binary operators
// Multiplicative operators
- case JCTree.MUL: // *
+ case MUL: // *
return Tree.Kind.MULTIPLY;
- case JCTree.DIV: // /
+ case DIV: // /
return Tree.Kind.DIVIDE;
- case JCTree.MOD: // %
+ case MOD: // %
return Tree.Kind.REMAINDER;
// Additive operators
- case JCTree.PLUS: // +
+ case PLUS: // +
return Tree.Kind.PLUS;
- case JCTree.MINUS: // -
+ case MINUS: // -
return Tree.Kind.MINUS;
// Shift operators
- case JCTree.SL: // <<
+ case SL: // <<
return Tree.Kind.LEFT_SHIFT;
- case JCTree.SR: // >>
+ case SR: // >>
return Tree.Kind.RIGHT_SHIFT;
- case JCTree.USR: // >>>
+ case USR: // >>>
return Tree.Kind.UNSIGNED_RIGHT_SHIFT;
// Relational operators
- case JCTree.LT: // <
+ case LT: // <
return Tree.Kind.LESS_THAN;
- case JCTree.GT: // >
+ case GT: // >
return Tree.Kind.GREATER_THAN;
- case JCTree.LE: // <=
+ case LE: // <=
return Tree.Kind.LESS_THAN_EQUAL;
- case JCTree.GE: // >=
+ case GE: // >=
return Tree.Kind.GREATER_THAN_EQUAL;
// Equality operators
- case JCTree.EQ: // ==
+ case EQ: // ==
return Tree.Kind.EQUAL_TO;
- case JCTree.NE: // !=
+ case NE: // !=
return Tree.Kind.NOT_EQUAL_TO;
// Bitwise and logical operators
- case JCTree.BITAND: // &
+ case BITAND: // &
return Tree.Kind.AND;
- case JCTree.BITXOR: // ^
+ case BITXOR: // ^
return Tree.Kind.XOR;
- case JCTree.BITOR: // |
+ case BITOR: // |
return Tree.Kind.OR;
// Conditional operators
- case JCTree.AND: // &&
+ case AND: // &&
return Tree.Kind.CONDITIONAL_AND;
- case JCTree.OR: // ||
+ case OR: // ||
return Tree.Kind.CONDITIONAL_OR;
// Assignment operators
- case JCTree.MUL_ASG: // *=
+ case MUL_ASG: // *=
return Tree.Kind.MULTIPLY_ASSIGNMENT;
- case JCTree.DIV_ASG: // /=
+ case DIV_ASG: // /=
return Tree.Kind.DIVIDE_ASSIGNMENT;
- case JCTree.MOD_ASG: // %=
+ case MOD_ASG: // %=
return Tree.Kind.REMAINDER_ASSIGNMENT;
- case JCTree.PLUS_ASG: // +=
+ case PLUS_ASG: // +=
return Tree.Kind.PLUS_ASSIGNMENT;
- case JCTree.MINUS_ASG: // -=
+ case MINUS_ASG: // -=
return Tree.Kind.MINUS_ASSIGNMENT;
- case JCTree.SL_ASG: // <<=
+ case SL_ASG: // <<=
return Tree.Kind.LEFT_SHIFT_ASSIGNMENT;
- case JCTree.SR_ASG: // >>=
+ case SR_ASG: // >>=
return Tree.Kind.RIGHT_SHIFT_ASSIGNMENT;
- case JCTree.USR_ASG: // >>>=
+ case USR_ASG: // >>>=
return Tree.Kind.UNSIGNED_RIGHT_SHIFT_ASSIGNMENT;
- case JCTree.BITAND_ASG: // &=
+ case BITAND_ASG: // &=
return Tree.Kind.AND_ASSIGNMENT;
- case JCTree.BITXOR_ASG: // ^=
+ case BITXOR_ASG: // ^=
return Tree.Kind.XOR_ASSIGNMENT;
- case JCTree.BITOR_ASG: // |=
+ case BITOR_ASG: // |=
return Tree.Kind.OR_ASSIGNMENT;
// Null check (implementation detail), for example, __.getClass()
- case JCTree.NULLCHK:
+ case NULLCHK:
return Tree.Kind.OTHER;
default:
@@ -901,13 +911,13 @@
*/
public static JCExpression typeIn(JCExpression tree) {
switch (tree.getTag()) {
- case JCTree.IDENT: /* simple names */
- case JCTree.TYPEIDENT: /* primitive name */
- case JCTree.SELECT: /* qualified name */
- case JCTree.TYPEARRAY: /* array types */
- case JCTree.WILDCARD: /* wild cards */
- case JCTree.TYPEPARAMETER: /* type parameters */
- case JCTree.TYPEAPPLY: /* parameterized types */
+ case IDENT: /* simple names */
+ case TYPEIDENT: /* primitive name */
+ case SELECT: /* qualified name */
+ case TYPEARRAY: /* array types */
+ case WILDCARD: /* wild cards */
+ case TYPEPARAMETER: /* type parameters */
+ case TYPEAPPLY: /* parameterized types */
return tree;
default:
throw new AssertionError("Unexpected type tree: " + tree);
@@ -916,9 +926,9 @@
public static JCTree innermostType(JCTree type) {
switch (type.getTag()) {
- case JCTree.TYPEARRAY:
+ case TYPEARRAY:
return innermostType(((JCArrayTypeTree)type).elemtype);
- case JCTree.WILDCARD:
+ case WILDCARD:
return innermostType(((JCWildcard)type).inner);
default:
return type;
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Tue Nov 08 11:51:05 2011 -0800
@@ -363,19 +363,19 @@
return tree;
}
- public JCAssignOp Assignop(int opcode, JCTree lhs, JCTree rhs) {
+ public JCAssignOp Assignop(JCTree.Tag opcode, JCTree lhs, JCTree rhs) {
JCAssignOp tree = new JCAssignOp(opcode, lhs, rhs, null);
tree.pos = pos;
return tree;
}
- public JCUnary Unary(int opcode, JCExpression arg) {
+ public JCUnary Unary(JCTree.Tag opcode, JCExpression arg) {
JCUnary tree = new JCUnary(opcode, arg);
tree.pos = pos;
return tree;
}
- public JCBinary Binary(int opcode, JCExpression lhs, JCExpression rhs) {
+ public JCBinary Binary(JCTree.Tag opcode, JCExpression lhs, JCExpression rhs) {
JCBinary tree = new JCBinary(opcode, lhs, rhs, null);
tree.pos = pos;
return tree;
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Nov 08 11:51:05 2011 -0800
@@ -65,6 +65,7 @@
import com.sun.tools.javac.util.Position;
import static com.sun.tools.javac.code.Kinds.*;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
/**
* Represents a java class and provides access to information
@@ -1083,7 +1084,7 @@
Name asterisk = tsym.name.table.names.asterisk;
for (JCTree t : compenv.toplevel.defs) {
- if (t.getTag() == JCTree.IMPORT) {
+ if (t.hasTag(IMPORT)) {
JCTree imp = ((JCImport) t).qualid;
if ((TreeInfo.name(imp) != asterisk) &&
(imp.type.tsym.kind & Kinds.TYP) != 0) {
@@ -1124,7 +1125,7 @@
if (compenv == null) return new PackageDocImpl[0];
for (JCTree t : compenv.toplevel.defs) {
- if (t.getTag() == JCTree.IMPORT) {
+ if (t.hasTag(IMPORT)) {
JCTree imp = ((JCImport) t).qualid;
if (TreeInfo.name(imp) == names.asterisk) {
JCFieldAccess sel = (JCFieldAccess)imp;
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Tue Nov 08 11:51:05 2011 -0800
@@ -419,7 +419,7 @@
ListBuffer<JCClassDecl> result = new ListBuffer<JCClassDecl>();
for (JCCompilationUnit t : trees) {
for (JCTree def : t.defs) {
- if (def.getTag() == JCTree.CLASSDEF)
+ if (def.hasTag(JCTree.Tag.CLASSDEF))
result.append((JCClassDecl)def);
}
}
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,6 +85,8 @@
import java.util.Set;
import javax.lang.model.element.Element;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
+
/**
* Utility and test program to check validity of tree positions for tree nodes.
* The program can be run standalone, or as a jtreg test. In standalone mode,
@@ -289,7 +291,7 @@
for (CompilationUnitTree t : trees) {
JCCompilationUnit cu = (JCCompilationUnit)t;
for (JCTree def : cu.defs) {
- if (def.getTag() == JCTree.CLASSDEF &&
+ if (def.hasTag(CLASSDEF) &&
analyzedElems.contains(((JCTree.JCClassDecl)def).sym)) {
//System.out.println("Adding pair...");
res.add(new Pair<>(cu, def));
@@ -373,9 +375,9 @@
private boolean mandatoryType(JCTree that) {
return that instanceof JCTree.JCExpression ||
- that.getTag() == JCTree.VARDEF ||
- that.getTag() == JCTree.METHODDEF ||
- that.getTag() == JCTree.CLASSDEF;
+ that.hasTag(VARDEF) ||
+ that.hasTag(METHODDEF) ||
+ that.hasTag(CLASSDEF);
}
private final List<String> excludedFields = Arrays.asList("varargsElement");
@@ -429,7 +431,7 @@
private class Info {
Info() {
tree = null;
- tag = JCTree.ERRONEOUS;
+ tag = ERRONEOUS;
start = 0;
pos = 0;
end = Integer.MAX_VALUE;
@@ -449,7 +451,7 @@
}
final JCTree tree;
- final int tag;
+ final JCTree.Tag tag;
final int start;
final int pos;
final int end;
@@ -457,27 +459,10 @@
/**
* Names for tree tags.
- * javac does not provide an API to convert tag values to strings, so this class uses
- * reflection to determine names of public static final int values in JCTree.
*/
private static class TreeUtil {
- String nameFromTag(int tag) {
- if (names == null) {
- names = new HashMap<Integer, String>();
- Class c = JCTree.class;
- for (Field f : c.getDeclaredFields()) {
- if (f.getType().equals(int.class)) {
- int mods = f.getModifiers();
- if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
- try {
- names.put(f.getInt(null), f.getName());
- } catch (IllegalAccessException e) {
- }
- }
- }
- }
- }
- String name = names.get(tag);
+ String nameFromTag(JCTree.Tag tag) {
+ String name = tag.name();
return (name == null) ? "??" : name;
}
@@ -496,8 +481,6 @@
}
return buf;
}
-
- private Map<Integer, String> names;
}
/**
--- a/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/test/tools/javac/tree/AbstractTreeScannerTest.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -274,7 +274,7 @@
return fields;
}
// where
- Map<Integer, Set<Field>> map = new HashMap<Integer,Set<Field>>();
+ Map<JCTree.Tag, Set<Field>> map = new HashMap<JCTree.Tag,Set<Field>>();
/** Get the line number for the primary position for a tree.
* The code is intended to be simple, although not necessarily efficient.
--- a/langtools/test/tools/javac/tree/TreePosTest.java Sat Nov 05 00:02:33 2011 -0700
+++ b/langtools/test/tools/javac/tree/TreePosTest.java Tue Nov 08 11:51:05 2011 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -80,6 +80,7 @@
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeScanner;
+import static com.sun.tools.javac.tree.JCTree.Tag.*;
import static com.sun.tools.javac.util.Position.NOPOS;
/**
@@ -291,6 +292,14 @@
errors++;
}
+ /**
+ * Names for tree tags.
+ */
+ private static String getTagName(JCTree.Tag tag) {
+ String name = tag.name();
+ return (name == null) ? "??" : name;
+ }
+
/** Number of files that have been analyzed. */
int fileCount;
/** Number of errors reported. */
@@ -312,8 +321,6 @@
Set<File> excludeFiles = new HashSet<File>();
/** Set of tag names to be excluded from analysis. */
Set<String> excludeTags = new HashSet<String>();
- /** Table of printable names for tree tag values. */
- TagNames tagNames = new TagNames();
/**
* Main class for testing assertions concerning tree positions for tree nodes.
@@ -337,7 +344,7 @@
// there is no corresponding source text.
// Redundant semicolons in a class definition can cause empty
// initializer blocks with no positions.
- if ((self.tag == JCTree.MODIFIERS || self.tag == JCTree.BLOCK)
+ if ((self.tag == MODIFIERS || self.tag == BLOCK)
&& self.pos == NOPOS) {
// If pos is NOPOS, so should be the start and end positions
check("start == NOPOS", encl, self, self.start == NOPOS);
@@ -359,15 +366,15 @@
// e.g. int[][] a = new int[2][];
check("encl.start <= start", encl, self, encl.start <= self.start);
check("start <= pos", encl, self, self.start <= self.pos);
- if (!(self.tag == JCTree.TYPEARRAY
- && (encl.tag == JCTree.VARDEF ||
- encl.tag == JCTree.METHODDEF ||
- encl.tag == JCTree.TYPEARRAY))) {
+ if (!(self.tag == TYPEARRAY
+ && (encl.tag == VARDEF ||
+ encl.tag == METHODDEF ||
+ encl.tag == TYPEARRAY))) {
check("encl.pos <= start || end <= encl.pos",
encl, self, encl.pos <= self.start || self.end <= encl.pos);
}
check("pos <= end", encl, self, self.pos <= self.end);
- if (!(self.tag == JCTree.TYPEARRAY && encl.tag == JCTree.TYPEARRAY)) {
+ if (!(self.tag == TYPEARRAY && encl.tag == TYPEARRAY)) {
check("end <= encl.end", encl, self, self.end <= encl.end);
}
}
@@ -388,7 +395,7 @@
if ((tree.mods.flags & Flags.ENUM) != 0) {
scan(tree.mods);
if (tree.init != null) {
- if (tree.init.getTag() == JCTree.NEWCLASS) {
+ if (tree.init.hasTag(NEWCLASS)) {
JCNewClass init = (JCNewClass) tree.init;
if (init.args != null && init.args.nonEmpty()) {
scan(init.args);
@@ -404,11 +411,11 @@
boolean check(Info encl, Info self) {
if (excludeTags.size() > 0) {
- if (encl != null && excludeTags.contains(tagNames.get(encl.tag))
- || excludeTags.contains(tagNames.get(self.tag)))
+ if (encl != null && excludeTags.contains(getTagName(encl.tag))
+ || excludeTags.contains(getTagName(self.tag)))
return false;
}
- return tags.size() == 0 || tags.contains(tagNames.get(self.tag));
+ return tags.size() == 0 || tags.contains(getTagName(self.tag));
}
void check(String label, Info encl, Info self, boolean ok) {
@@ -439,7 +446,7 @@
private class Info {
Info() {
tree = null;
- tag = JCTree.ERRONEOUS;
+ tag = ERRONEOUS;
start = 0;
pos = 0;
end = Integer.MAX_VALUE;
@@ -455,46 +462,17 @@
@Override
public String toString() {
- return tagNames.get(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
+ return getTagName(tree.getTag()) + "[start:" + start + ",pos:" + pos + ",end:" + end + "]";
}
final JCTree tree;
- final int tag;
+ final JCTree.Tag tag;
final int start;
final int pos;
final int end;
}
/**
- * Names for tree tags.
- * javac does not provide an API to convert tag values to strings, so this class uses
- * reflection to determine names of public static final int values in JCTree.
- */
- private static class TagNames {
- String get(int tag) {
- if (map == null) {
- map = new HashMap<Integer, String>();
- Class c = JCTree.class;
- for (Field f : c.getDeclaredFields()) {
- if (f.getType().equals(int.class)) {
- int mods = f.getModifiers();
- if (Modifier.isPublic(mods) && Modifier.isStatic(mods) && Modifier.isFinal(mods)) {
- try {
- map.put(f.getInt(null), f.getName());
- } catch (IllegalAccessException e) {
- }
- }
- }
- }
- }
- String name = map.get(tag);
- return (name == null) ? "??" : name;
- }
-
- private Map<Integer, String> map;
- }
-
- /**
* Thrown when errors are found parsing a java file.
*/
private static class ParseException extends Exception {
@@ -719,7 +697,7 @@
void setInfo(Info info) {
this.info = info;
- tagName.setText(tagNames.get(info.tag));
+ tagName.setText(getTagName(info.tag));
start.setText(String.valueOf(info.start));
pos.setText(String.valueOf(info.pos));
end.setText(String.valueOf(info.end));