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

8210742: compound var declaration type is not uniform for all variables

Browse Source 
Make implicit type for all variables in compound declaration as null for which type inference happens at later phase

Reviewed-by: mcimadamore
This commit is contained in:
Srinivas Dama 2018-11-20 21:59:07 +05:30 committed by Srinivas Dama
parent 73ad9c4a00
commit e4f60a8489
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
View File

@ -3180,13 +3180,13 @@ public class JavacParser implements Parser {
if (elemType.hasTag(IDENT)) {
Name typeName = ((JCIdent)elemType).name;
if (isRestrictedLocalVarTypeName(typeName, pos, !compound && localDecl)) {
if (compound) {
//error - 'var' in compound local var decl
reportSyntaxError(pos, Errors.VarNotAllowedCompound);
} else if (type.hasTag(TYPEARRAY)) {
if (type.hasTag(TYPEARRAY) && !compound) {
//error - 'var' and arrays
reportSyntaxError(pos, Errors.VarNotAllowedArray);
} else {
if(compound)
//error - 'var' in compound local var decl
reportSyntaxError(pos, Errors.VarNotAllowedCompound);
startPos = TreeInfo.getStartPos(mods);
if (startPos == Position.NOPOS)
startPos = TreeInfo.getStartPos(type);

22
test/langtools/tools/javac/parser/JavacParserTest.java
View File

@ -1041,6 +1041,28 @@ public class JavacParserTest extends TestCase {
assertEquals("the error message is not correct, actual: " + actualErrors, expectedErrors, actualErrors);
}
@Test //JDK-821742
void testCompDeclVarType() throws IOException {
String code = "package test; public class Test {"
+ "private void test() {"
+ "var v1 = 10,v2 = 12;"
+ "} private Test() {}}";
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null,
null, null, Arrays.asList(new MyFileObject(code)));
CompilationUnitTree cut = ct.parse().iterator().next();
ct.enter();
ct.analyze();
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
MethodTree method = (MethodTree) clazz.getMembers().get(0);
VariableTree stmt1 = (VariableTree) method.getBody().getStatements().get(0);
VariableTree stmt2 = (VariableTree) method.getBody().getStatements().get(1);
Tree v1Type = stmt1.getType();
Tree v2Type = stmt2.getType();
assertEquals("Implicit type for v1 is not correct: ", Kind.PRIMITIVE_TYPE, v1Type.getKind());
assertEquals("Implicit type for v2 is not correct: ", Kind.PRIMITIVE_TYPE, v2Type.getKind());
}
@Test
void testCaseBodyStatements() throws IOException {
String code = "class C {" +