65 private final Enter enter; |
65 private final Enter enter; |
66 private final Log log; |
66 private final Log log; |
67 private final Check chk; |
67 private final Check chk; |
68 private final Attr attr; |
68 private final Attr attr; |
69 private final Symtab syms; |
69 private final Symtab syms; |
70 private final Scope.ScopeCounter scopeCounter; |
|
71 private final TreeMaker make; |
70 private final TreeMaker make; |
72 private final ClassReader reader; |
71 private final ClassReader reader; |
73 private final Todo todo; |
72 private final Todo todo; |
74 private final Annotate annotate; |
73 private final Annotate annotate; |
75 private final Types types; |
74 private final Types types; |
92 enter = Enter.instance(context); |
91 enter = Enter.instance(context); |
93 log = Log.instance(context); |
92 log = Log.instance(context); |
94 chk = Check.instance(context); |
93 chk = Check.instance(context); |
95 attr = Attr.instance(context); |
94 attr = Attr.instance(context); |
96 syms = Symtab.instance(context); |
95 syms = Symtab.instance(context); |
97 scopeCounter = Scope.ScopeCounter.instance(context); |
|
98 make = TreeMaker.instance(context); |
96 make = TreeMaker.instance(context); |
99 reader = ClassReader.instance(context); |
97 reader = ClassReader.instance(context); |
100 todo = Todo.instance(context); |
98 todo = Todo.instance(context); |
101 annotate = Annotate.instance(context); |
99 annotate = Annotate.instance(context); |
102 types = Types.instance(context); |
100 types = Types.instance(context); |
1021 annotate.flush(); |
1019 annotate.flush(); |
1022 } |
1020 } |
1023 } |
1021 } |
1024 |
1022 |
1025 private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) { |
1023 private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) { |
1026 Scope baseScope = new Scope.ClassScope(tree.sym, scopeCounter); |
1024 Scope baseScope = new Scope(tree.sym); |
1027 //import already entered local classes into base scope |
1025 //import already entered local classes into base scope |
1028 for (Scope.Entry e = env.outer.info.scope.elems ; e != null ; e = e.sibling) { |
1026 for (Scope.Entry e = env.outer.info.scope.elems ; e != null ; e = e.sibling) { |
1029 if (e.sym.isLocal()) { |
1027 if (e.sym.isLocal()) { |
1030 baseScope.enter(e.sym); |
1028 baseScope.enter(e.sym); |
1031 } |
1029 } |