infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2012-01-09 19:13:08 -08:00
commit 09e2e03986
10 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
View File

@ -535,13 +535,14 @@ public class JavaTokenizer {
reader.putChar('.');
scanFractionAndSuffix(pos);
} else if (reader.ch == '.') {
int savePos = reader.bp;
reader.putChar('.'); reader.putChar('.', true);
if (reader.ch == '.') {
reader.scanChar();
reader.putChar('.');
tk = TokenKind.ELLIPSIS;
} else {
lexError(pos, "malformed.fp.lit");
lexError(savePos, "illegal.dot");
}
} else {
tk = TokenKind.DOT;

3
langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
View File

@ -384,6 +384,9 @@ compiler.err.illegal.nonascii.digit=\
compiler.err.illegal.underscore=\
illegal underscore
compiler.err.illegal.dot=\
illegal ''.''
# 0: symbol
compiler.err.illegal.qual.not.icls=\
illegal qualifier; {0} is not an inner class

14
langtools/test/tools/javac/api/T6397104.java
View File

@ -26,10 +26,10 @@
* @bug 6397104
* @summary JSR 199: JavaFileManager.getFileForOutput should have sibling argument
* @author Peter von der Ah\u00e9
* @ignore this test should be rewritten when fixing 6473901
*/
import java.io.File;
import java.net.URI;
import java.util.Arrays;
import javax.tools.*;
import javax.tools.JavaFileManager.Location;
@ -52,10 +52,14 @@ public class T6397104 {
: fm.getJavaFileObjectsFromFiles(Arrays.asList(siblingFile)).iterator().next();
FileObject fileObject =
fm.getFileForOutput(location, "java.lang", relName, sibling);
if (!fileObject.toUri().getPath().equals(expectedPath))
throw new AssertionError("Expected " + expectedPath +
", got " + fileObject.toUri().getPath());
System.out.format("OK: (%s, %s) => %s%n", siblingFile, relName, fileObject.toUri());
File expectedFile = new File(expectedPath).getCanonicalFile();
File fileObjectFile = new File(fileObject.toUri()).getCanonicalFile();
if (!fileObjectFile.equals(expectedFile))
throw new AssertionError("Expected " + expectedFile +
", got " + fileObjectFile);
System.out.format("OK: (%s, %s) => %s%n", siblingFile, relName, fileObjectFile);
}
void test(boolean hasLocation, File siblingFile, String relName, String expectedPath)

30
langtools/test/tools/javac/diags/examples/IllegalDot.java Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
// key: compiler.err.illegal.dot
// key: compiler.err.expected
// key: compiler.err.illegal.start.of.type
class X {
void m(Object.. args) { }
}

2
langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
View File

@ -284,7 +284,7 @@ public class DiamondAndInnerClassTest {
try {
ct.analyze();
} catch (Throwable ex) {
throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
}
check();
}

2
langtools/test/tools/javac/generics/inference/7086601/T7086601b.java
View File

@ -146,7 +146,7 @@ public class T7086601b {
try {
ct.analyze();
} catch (Throwable ex) {
throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
}
check();
}

2
langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
View File

@ -210,7 +210,7 @@ public class GenericOverrideTest {
try {
ct.analyze();
} catch (Throwable ex) {
throw new AssertionError("Error thron when compiling the following code:\n" + source.getCharContent(true));
throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
}
check();
}

2
langtools/test/tools/javac/lambda/LambdaParserTest.java
View File

@ -238,7 +238,7 @@ public class LambdaParserTest {
try {
ct.parse();
} catch (Throwable ex) {
throw new AssertionError("Error thron when parsing the following source:\n" + source.getCharContent(true));
throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true));
}
check();
}

35
langtools/test/tools/javac/parser/T4881269.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 4881269
* @summary improve diagnostic for ill-formed tokens
* @compile/fail/ref=T4881269.out -XDrawDiagnostics T4881269.java
*/
public class T4881269 {
java.io..PrintStream s;
void m() { System.err..println(); }
void m(Object.. o) { }
}

9
langtools/test/tools/javac/parser/T4881269.out Normal file
View File

@ -0,0 +1,9 @@
T4881269.java:32:13: compiler.err.illegal.dot
T4881269.java:33:27: compiler.err.illegal.dot
T4881269.java:33:22: compiler.err.not.stmt
T4881269.java:34:19: compiler.err.illegal.dot
T4881269.java:34:20: compiler.err.expected: ';'
T4881269.java:34:22: compiler.err.illegal.start.of.type
T4881269.java:34:23: compiler.err.expected: token.identifier
T4881269.java:34:25: compiler.err.expected: ';'
8 errors