equal
deleted
inserted
replaced
50 |
50 |
51 import com.sun.source.util.TaskEvent; |
51 import com.sun.source.util.TaskEvent; |
52 import com.sun.tools.javac.api.MultiTaskListener; |
52 import com.sun.tools.javac.api.MultiTaskListener; |
53 import com.sun.tools.javac.code.*; |
53 import com.sun.tools.javac.code.*; |
54 import com.sun.tools.javac.code.Lint.LintCategory; |
54 import com.sun.tools.javac.code.Lint.LintCategory; |
|
55 import com.sun.tools.javac.code.Source.Feature; |
55 import com.sun.tools.javac.code.Symbol.ClassSymbol; |
56 import com.sun.tools.javac.code.Symbol.ClassSymbol; |
56 import com.sun.tools.javac.code.Symbol.CompletionFailure; |
57 import com.sun.tools.javac.code.Symbol.CompletionFailure; |
57 import com.sun.tools.javac.code.Symbol.PackageSymbol; |
58 import com.sun.tools.javac.code.Symbol.PackageSymbol; |
58 import com.sun.tools.javac.comp.*; |
59 import com.sun.tools.javac.comp.*; |
59 import com.sun.tools.javac.comp.CompileStates.CompileState; |
60 import com.sun.tools.javac.comp.CompileStates.CompileState; |
682 String typeName; |
683 String typeName; |
683 int sep = name.indexOf('/'); |
684 int sep = name.indexOf('/'); |
684 if (sep == -1) { |
685 if (sep == -1) { |
685 msym = modules.getDefaultModule(); |
686 msym = modules.getDefaultModule(); |
686 typeName = name; |
687 typeName = name; |
687 } else if (source.allowModules()) { |
688 } else if (Feature.MODULES.allowedInSource(source)) { |
688 Name modName = names.fromString(name.substring(0, sep)); |
689 Name modName = names.fromString(name.substring(0, sep)); |
689 |
690 |
690 msym = moduleFinder.findModule(modName); |
691 msym = moduleFinder.findModule(modName); |
691 typeName = name.substring(sep + 1); |
692 typeName = name.substring(sep + 1); |
692 } else { |
693 } else { |
1542 return; |
1543 return; |
1543 |
1544 |
1544 env.tree = transTypes.translateTopLevelClass(env.tree, localMake); |
1545 env.tree = transTypes.translateTopLevelClass(env.tree, localMake); |
1545 compileStates.put(env, CompileState.TRANSTYPES); |
1546 compileStates.put(env, CompileState.TRANSTYPES); |
1546 |
1547 |
1547 if (source.allowLambda() && scanner.hasLambdas) { |
1548 if (Feature.LAMBDA.allowedInSource(source) && scanner.hasLambdas) { |
1548 if (shouldStop(CompileState.UNLAMBDA)) |
1549 if (shouldStop(CompileState.UNLAMBDA)) |
1549 return; |
1550 return; |
1550 |
1551 |
1551 env.tree = LambdaToMethod.instance(context).translateTopLevelClass(env, env.tree, localMake); |
1552 env.tree = LambdaToMethod.instance(context).translateTopLevelClass(env, env.tree, localMake); |
1552 compileStates.put(env, CompileState.UNLAMBDA); |
1553 compileStates.put(env, CompileState.UNLAMBDA); |