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

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-06-09 19:07:12 +00:00
commit 607cd7698d
5 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
View File

@ -59,7 +59,8 @@ class Console implements AutoCloseable {
in.setHandleUserInterrupt(true);
in.setBellEnabled(true);
in.setCopyPasteDetection(true);
in.setHistory(new EditingHistory(in, Files.readAllLines(historyFile.toPath())) {
final Iterable<String> existingHistory = historyFile.exists() ? Files.readAllLines(historyFile.toPath()) : null;
in.setHistory(new EditingHistory(in, existingHistory) {
@Override protected boolean isComplete(CharSequence input) {
return completer.isComplete(input.toString());
}

2
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
View File

@ -117,7 +117,7 @@ public final class Main extends Shell {
final PrintWriter err = context.getErr();
final Global oldGlobal = Context.getGlobal();
final boolean globalChanged = (oldGlobal != global);
final PropertiesHelper propsHelper = new PropertiesHelper(env._classpath);
final PropertiesHelper propsHelper = new PropertiesHelper(context);
final NashornCompleter completer = new NashornCompleter(context, global, this, propsHelper);
try (final Console in = new Console(System.in, System.out, HIST_FILE, completer,

41
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PackagesHelper.java
View File

@ -25,6 +25,7 @@
package jdk.nashorn.tools.jjs;
import java.lang.reflect.Modifier;
import java.io.IOException;
import java.io.File;
import java.net.URI;
@ -49,6 +50,7 @@ import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
import jdk.nashorn.internal.runtime.Context;
/**
* A helper class to compute properties of a Java package object. Properties of
@ -72,6 +74,7 @@ final class PackagesHelper {
return compiler != null;
}
private final Context context;
private final StandardJavaFileManager fm;
private final Set<JavaFileObject.Kind> fileKinds;
private final FileSystem jrtfs;
@ -79,9 +82,11 @@ final class PackagesHelper {
/**
* Construct a new PackagesHelper.
*
* @param classPath Class path to compute properties of java package objects
* @param context the current Nashorn Context
*/
PackagesHelper(final String classPath) throws IOException {
PackagesHelper(final Context context) throws IOException {
this.context = context;
final String classPath = context.getEnv()._classpath;
if (isJavacAvailable()) {
fm = compiler.getStandardFileManager(null, null, null);
fileKinds = EnumSet.of(JavaFileObject.Kind.CLASS);
@ -166,8 +171,11 @@ final class PackagesHelper {
String str = p.getFileName().toString();
// get rid of ".class", if any
if (str.endsWith(".class")) {
props.add(str.substring(0, str.length() - ".class".length()));
} else {
final String clsName = str.substring(0, str.length() - ".class".length());
if (clsName.indexOf('$') == -1 && isClassAccessible(pkg + "." + clsName)) {
props.add(str);
}
} else if (isPackageAccessible(pkg + "." + str)) {
props.add(str);
}
}
@ -193,7 +201,10 @@ final class PackagesHelper {
if (nextDot != -1) {
// subpackage - eg. "regex" for "java.util"
props.add(binaryName.substring(start, nextDot));
final String pkgName = binaryName.substring(start, nextDot);
if (isPackageAccessible(binaryName.substring(0, nextDot))) {
props.add(binaryName.substring(start, nextDot));
}
} else {
// class - filter out nested, inner, anonymous, local classes.
// Dynalink supported public nested classes as properties of
@ -201,7 +212,7 @@ final class PackagesHelper {
// "$" internal names as properties of package object.
final String clsName = binaryName.substring(start);
if (clsName.indexOf('$') == -1) {
if (clsName.indexOf('$') == -1 && isClassAccessible(binaryName)) {
props.add(clsName);
}
}
@ -214,4 +225,22 @@ final class PackagesHelper {
.map(File::new)
.collect(Collectors.toList());
}
private boolean isClassAccessible(final String className) {
try {
final Class<?> clz = context.findClass(className);
return Modifier.isPublic(clz.getModifiers());
} catch (final ClassNotFoundException cnfe) {
}
return false;
}
private boolean isPackageAccessible(final String pkgName) {
try {
Context.checkPackageAccess(pkgName);
return true;
} catch (final SecurityException se) {
return false;
}
}
}

7
nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/PropertiesHelper.java
View File

@ -33,6 +33,7 @@ import java.util.List;
import java.util.WeakHashMap;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.JSType;
import jdk.nashorn.internal.runtime.NativeJavaPackage;
import jdk.nashorn.internal.runtime.PropertyMap;
@ -52,11 +53,11 @@ final class PropertiesHelper {
/**
* Construct a new PropertiesHelper.
*
* @param classPath Class path to compute properties of java package objects
* @param context the current nashorn Context
*/
PropertiesHelper(final String classPath) {
PropertiesHelper(final Context context) {
try {
this.pkgsHelper = new PackagesHelper(classPath);
this.pkgsHelper = new PackagesHelper(context);
} catch (final IOException exp) {
if (Main.DEBUG) {
exp.printStackTrace();

6
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
View File

@ -286,7 +286,7 @@ final class JavaAdapterBytecodeGenerator {
superClassName = Type.getInternalName(superClass);
generatedClassName = getGeneratedClassName(superClass, interfaces);
cw.visit(Opcodes.V1_7, ACC_PUBLIC | ACC_SUPER, generatedClassName, null, superClassName, getInternalTypeNames(interfaces));
cw.visit(Opcodes.V1_8, ACC_PUBLIC | ACC_SUPER, generatedClassName, null, superClassName, getInternalTypeNames(interfaces));
generateField(GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
generateField(DELEGATE_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
@ -1031,7 +1031,9 @@ final class JavaAdapterBytecodeGenerator {
if (!constructor && Modifier.isInterface(owner.getModifiers())) {
// we should call default method on the immediate "super" type - not on (possibly)
// the indirectly inherited interface class!
mv.invokespecial(Type.getInternalName(findInvokespecialOwnerFor(owner)), name, methodDesc, false);
final Class<?> superType = findInvokespecialOwnerFor(owner);
mv.visitMethodInsn(INVOKESPECIAL, Type.getInternalName(superType), name, methodDesc,
Modifier.isInterface(superType.getModifiers()));
} else {
mv.invokespecial(superClassName, name, methodDesc, false);
}