stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6570730: com.sun.source.tree.ModifiersTree.getFlags() should return class type

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2010-08-27 17:21:17 -07:00
parent 99d83d8d85
commit fba51e328b
4 changed files with 139 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
langtools/src/share/classes/com/sun/source/tree/Tree.java
View File

@ -94,7 +94,7 @@ public interface Tree {
CATCH(CatchTree.class),
/**
* Used for instances of {@link ClassTree}.
* Used for instances of {@link ClassTree} representing classes.
*/
CLASS(ClassTree.class),
@ -557,6 +557,21 @@ public interface Tree {
*/
ERRONEOUS(ErroneousTree.class),
/**
* Used for instances of {@link ClassTree} representing interfaces.
*/
INTERFACE(ClassTree.class),
/**
* Used for instances of {@link ClassTree} representing enums.
*/
ENUM(ClassTree.class),
/**
* Used for instances of {@link ClassTree} representing annotation types.
*/
ANNOTATION_TYPE(ClassTree.class),
/**
* An implementation-reserved node. This is the not the node
* you are looking for.

14
langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
View File

@ -340,6 +340,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
public abstract int getTag();
/** Convert a tree to a pretty-printed string. */
@Override
public String toString() {
StringWriter s = new StringWriter();
try {
@ -375,6 +376,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
/** Return a shallow copy of this tree.
*/
@Override
public Object clone() {
try {
return super.clone();
@ -587,7 +589,17 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
@Override
public void accept(Visitor v) { v.visitClassDef(this); }
public Kind getKind() { return Kind.CLASS; }
public Kind getKind() {
if ((mods.flags & Flags.ANNOTATION) != 0)
return Kind.ANNOTATION_TYPE;
else if ((mods.flags & Flags.INTERFACE) != 0)
return Kind.INTERFACE;
else if ((mods.flags & Flags.ENUM) != 0)
return Kind.ENUM;
else
return Kind.CLASS;
}
public JCModifiers getModifiers() { return mods; }
public Name getSimpleName() { return name; }
public List<JCTypeParameter> getTypeParameters() {

102
langtools/test/tools/javac/tree/ClassTreeTest.java Normal file
View File

@ -0,0 +1,102 @@
/*
* Copyright (c) 2010, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6570730
* @summary com.sun.source.tree.ModifiersTree.getFlags() should return class type
*/
import java.io.*;
import java.util.*;
import javax.tools.*;
import com.sun.source.tree.*;
import com.sun.source.util.*;
import com.sun.tools.javac.api.*;
public class ClassTreeTest {
public static void main(String... args) throws Exception {
new ClassTreeTest().run();
}
void run() throws Exception {
JavacTool tool = JavacTool.create();
StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
List<String> opts = Collections.<String>emptyList();
File testSrc = new File(System.getProperty("test.src"));
File thisFile = new File(testSrc, ClassTreeTest.class.getSimpleName() + ".java");
Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjects(thisFile);
JavacTask task = tool.getTask(null, fm, null, opts, null, fos);
for (CompilationUnitTree cu: task.parse()) {
check(cu, "CLASS", Tree.Kind.CLASS);
check(cu, "INTERFACE", Tree.Kind.INTERFACE);
check(cu, "ENUM", Tree.Kind.ENUM);
check(cu, "ANNOTATION_TYPE", Tree.Kind.ANNOTATION_TYPE);
}
int expected = 4;
if (checks != expected)
error("Unexpected number of checks performed; expected: " + expected + ", found: " + checks);
if (errors > 0)
throw new Exception(errors + " errors found");
}
void check(CompilationUnitTree cu, String name, Tree.Kind k) {
checks++;
TreeScanner<ClassTree,String> s = new TreeScanner<ClassTree,String>() {
@Override
public ClassTree visitClass(ClassTree c, String name) {
if (c.getSimpleName().toString().equals(name))
return c;
else
return super.visitClass(c, name);
}
@Override
public ClassTree reduce(ClassTree t1, ClassTree t2) {
return (t1 != null ? t1 : t2);
}
};
ClassTree c = s.scan(cu, name);
if (c == null)
error("Can't find node named " + name);
else if (c.getKind() != k)
error("Unexpected kind for node named " + name + ": expected: " + k + ", found: " + c.getKind());
}
void error(String msg) {
System.err.println("Error: " + msg);
errors++;
}
int checks;
int errors;
class CLASS { }
interface INTERFACE { }
enum ENUM { }
@interface ANNOTATION_TYPE { }
}

9
langtools/test/tools/javac/T6341023.java → langtools/test/tools/javac/tree/TreeKindTest.java
View File

@ -29,7 +29,7 @@
import com.sun.source.tree.*;
public class T6341023 {
public class TreeKindTest{
public static void main(String... args) {
boolean ok = true;
@ -101,6 +101,13 @@ public class T6341023 {
ok = ok & verify(k, i, i == WildcardTree.class);
break;
case INTERFACE:
case ANNOTATION_TYPE:
case ENUM:
case CLASS:
ok = ok & verify(k, i, i == ClassTree.class);
break;
case OTHER:
ok = ok & verify(k, i, i == null);
break;