8001717: TypeTags cleanup breaks GenStubs

Fri, 26 Oct 2012 18:40:13 -0700

author
jjg
date
Fri, 26 Oct 2012 18:40:13 -0700
changeset 1379
384f7a4beae7
parent 1378
64fce9f95b1d
child 1380
a65971893c50

8001717: TypeTags cleanup breaks GenStubs
Reviewed-by: jjh

make/tools/genstubs/GenStubs.java file | annotate | diff | comparison | revisions
     1.1 --- a/make/tools/genstubs/GenStubs.java	Fri Oct 26 17:17:33 2012 -0700
     1.2 +++ b/make/tools/genstubs/GenStubs.java	Fri Oct 26 18:40:13 2012 -0700
     1.3 @@ -35,7 +35,7 @@
     1.4  import com.sun.source.util.JavacTask;
     1.5  import com.sun.tools.javac.api.JavacTool;
     1.6  import com.sun.tools.javac.code.Flags;
     1.7 -import com.sun.tools.javac.code.TypeTags;
     1.8 +import com.sun.tools.javac.code.TypeTag;
     1.9  import com.sun.tools.javac.tree.JCTree;
    1.10  import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
    1.11  import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
    1.12 @@ -244,23 +244,23 @@
    1.13                  else {
    1.14                      String t = tree.vartype.toString();
    1.15                      if (t.equals("boolean"))
    1.16 -                        tree.init = new JCLiteral(TypeTags.BOOLEAN, 0) { };
    1.17 +                        tree.init = new JCLiteral(TypeTag.BOOLEAN, 0) { };
    1.18                      else if (t.equals("byte"))
    1.19 -                        tree.init = new JCLiteral(TypeTags.BYTE, 0) { };
    1.20 +                        tree.init = new JCLiteral(TypeTag.BYTE, 0) { };
    1.21                      else if (t.equals("char"))
    1.22 -                        tree.init = new JCLiteral(TypeTags.CHAR, 0) { };
    1.23 +                        tree.init = new JCLiteral(TypeTag.CHAR, 0) { };
    1.24                      else if (t.equals("double"))
    1.25 -                        tree.init = new JCLiteral(TypeTags.DOUBLE, 0.d) { };
    1.26 +                        tree.init = new JCLiteral(TypeTag.DOUBLE, 0.d) { };
    1.27                      else if (t.equals("float"))
    1.28 -                        tree.init = new JCLiteral(TypeTags.FLOAT, 0.f) { };
    1.29 +                        tree.init = new JCLiteral(TypeTag.FLOAT, 0.f) { };
    1.30                      else if (t.equals("int"))
    1.31 -                        tree.init = new JCLiteral(TypeTags.INT, 0) { };
    1.32 +                        tree.init = new JCLiteral(TypeTag.INT, 0) { };
    1.33                      else if (t.equals("long"))
    1.34 -                        tree.init = new JCLiteral(TypeTags.LONG, 0) { };
    1.35 +                        tree.init = new JCLiteral(TypeTag.LONG, 0) { };
    1.36                      else if (t.equals("short"))
    1.37 -                        tree.init = new JCLiteral(TypeTags.SHORT, 0) { };
    1.38 +                        tree.init = new JCLiteral(TypeTag.SHORT, 0) { };
    1.39                      else
    1.40 -                        tree.init = new JCLiteral(TypeTags.BOT, null) { };
    1.41 +                        tree.init = new JCLiteral(TypeTag.BOT, null) { };
    1.42                  }
    1.43              }
    1.44              result = tree;

mercurial