equal
deleted
inserted
replaced
23 * questions. |
23 * questions. |
24 */ |
24 */ |
25 |
25 |
26 package com.sun.tools.javac.comp; |
26 package com.sun.tools.javac.comp; |
27 |
27 |
28 import java.util.HashMap; |
|
29 import java.util.HashSet; |
28 import java.util.HashSet; |
30 import java.util.LinkedHashMap; |
|
31 import java.util.Map; |
|
32 import java.util.Set; |
29 import java.util.Set; |
33 |
30 |
34 import javax.tools.JavaFileObject; |
31 import javax.tools.JavaFileObject; |
35 |
32 |
36 import com.sun.tools.javac.code.*; |
33 import com.sun.tools.javac.code.*; |
47 import static com.sun.tools.javac.code.Kinds.*; |
44 import static com.sun.tools.javac.code.Kinds.*; |
48 import static com.sun.tools.javac.code.TypeTag.CLASS; |
45 import static com.sun.tools.javac.code.TypeTag.CLASS; |
49 import static com.sun.tools.javac.code.TypeTag.ERROR; |
46 import static com.sun.tools.javac.code.TypeTag.ERROR; |
50 import static com.sun.tools.javac.code.TypeTag.TYPEVAR; |
47 import static com.sun.tools.javac.code.TypeTag.TYPEVAR; |
51 import static com.sun.tools.javac.tree.JCTree.Tag.*; |
48 import static com.sun.tools.javac.tree.JCTree.Tag.*; |
|
49 |
52 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; |
50 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; |
53 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
51 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
54 |
52 |
55 /** This is the second phase of Enter, in which classes are completed |
53 /** This is the second phase of Enter, in which classes are completed |
56 * by entering their members into the class scope using |
54 * by entering their members into the class scope using |
73 private final Log log; |
71 private final Log log; |
74 private final Check chk; |
72 private final Check chk; |
75 private final Attr attr; |
73 private final Attr attr; |
76 private final Symtab syms; |
74 private final Symtab syms; |
77 private final TreeMaker make; |
75 private final TreeMaker make; |
78 private final ClassReader reader; |
|
79 private final Todo todo; |
76 private final Todo todo; |
80 private final Annotate annotate; |
77 private final Annotate annotate; |
81 private final TypeAnnotations typeAnnotations; |
78 private final TypeAnnotations typeAnnotations; |
82 private final Types types; |
79 private final Types types; |
83 private final JCDiagnostic.Factory diags; |
80 private final JCDiagnostic.Factory diags; |
100 log = Log.instance(context); |
97 log = Log.instance(context); |
101 chk = Check.instance(context); |
98 chk = Check.instance(context); |
102 attr = Attr.instance(context); |
99 attr = Attr.instance(context); |
103 syms = Symtab.instance(context); |
100 syms = Symtab.instance(context); |
104 make = TreeMaker.instance(context); |
101 make = TreeMaker.instance(context); |
105 reader = ClassReader.instance(context); |
|
106 todo = Todo.instance(context); |
102 todo = Todo.instance(context); |
107 annotate = Annotate.instance(context); |
103 annotate = Annotate.instance(context); |
108 typeAnnotations = TypeAnnotations.instance(context); |
104 typeAnnotations = TypeAnnotations.instance(context); |
109 types = Types.instance(context); |
105 types = Types.instance(context); |
110 diags = JCDiagnostic.Factory.instance(context); |
106 diags = JCDiagnostic.Factory.instance(context); |