jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java

equal deleted inserted replaced

-:22c8c025a651
+:47ca49eee534
 * questions.
 */
 package jdk.internal.jshell.tool;
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.AccessDeniedException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 static final EditorSetting BUILT_IN_EDITOR = new EditorSetting(null, false);
 private boolean debug = false;
 public boolean testPrompt = false;
 private String cmdlineClasspath = null;
+private String defaultStartup = null;
 private String startup = null;
 private String executionControlSpec = null;
 private EditorSetting editor = BUILT_IN_EDITOR;
 private static final String[] EDITOR_ENV_VARS = new String[] {
 static final String EDITOR_KEY   = "EDITOR";
 static final String FEEDBACK_KEY = "FEEDBACK";
 static final String MODE_KEY     = "MODE";
 static final String REPLAY_RESTORE_KEY = "REPLAY_RESTORE";
-static final String DEFAULT_STARTUP =
+static final String DEFAULT_STARTUP_NAME = "DEFAULT";
-"\n" +
+static final Pattern BUILTIN_FILE_PATTERN = Pattern.compile("\\w+");
-"import java.util.*;\n" +
+static final String BUILTIN_FILE_PATH_FORMAT = "jrt:/jdk.jshell/jdk/jshell/tool/resources/%s.jsh";
-"import java.io.*;\n" +
-"import java.math.*;\n" +
-"import java.net.*;\n" +
-"import java.util.concurrent.*;\n" +
-"import java.util.prefs.*;\n" +
-"import java.util.regex.*;\n" +
-"void printf(String format, Object... args) { System.out.printf(format, args); }\n";
 // Tool id (tid) mapping: the three name spaces
 NameSpace mainNamespace;
 NameSpace startNamespace;
 NameSpace errorNamespace;
 private void start(IOContext in, List<String> loadList) {
 // If startup hasn't been set by command line, set from retained/default
 if (startup == null) {
 startup = prefs.get(STARTUP_KEY);
 if (startup == null) {
-startup = DEFAULT_STARTUP;
+startup = defaultStartup();
 }
 }
 configEditor();
 }
 cmdlineClasspath = cps.get(0);
 }
 if (options.has(st)) {
 List<String> sts = options.valuesOf(st);
-if (sts.size() != 1 || options.has("no-startup")) {
+if (options.has("no-startup")) {
-startmsg("jshell.err.opt.startup.one");
+startmsg("jshell.err.opt.startup.conflict");
 return null;
 }
-startup = readFile(sts.get(0), "--startup");
+StringBuilder sb = new StringBuilder();
-if (startup == null) {
+for (String fn : sts) {
-return null;
+String s = readFile(fn, "--startup");
-}
+if (s == null) {
+return null;
+}
+sb.append(s);
+}
+startup = sb.toString();
 } else if (options.has("no-startup")) {
 startup = "";
 }
 if ((options.valuesOf(fb).size() +
 (options.has("q") ? 1 : 0) +
 }
 }
 //where
 private void startUpRun(String start) {
-try (IOContext suin = new FileScannerIOContext(new StringReader(start))) {
+try (IOContext suin = new ScannerIOContext(new StringReader(start))) {
 run(suin);
 } catch (Exception ex) {
 hardmsg("jshell.err.startup.unexpected.exception", ex);
 ex.printStackTrace(cmdout);
 }
 }
 // The sub-command:  /set start <start-file>
 boolean setStart(ArgTokenizer at) {
 at.allowedOptions("-default", "-none", "-retain");
-String fn = at.next();
+List<String> fns = new ArrayList<>();
+while (at.next() != null) {
+fns.add(at.val());
+}
 if (!checkOptionsAndRemainingInput(at)) {
 return false;
 }
 boolean defaultOption = at.hasOption("-default");
 boolean noneOption = at.hasOption("-none");
 boolean retainOption = at.hasOption("-retain");
-boolean hasFile = fn != null;
+boolean hasFile = !fns.isEmpty();
 int argCount = (defaultOption ? 1 : 0) + (noneOption ? 1 : 0) + (hasFile ? 1 : 0);
 if (argCount > 1) {
 errormsg("jshell.err.option.or.filename", at.whole());
 return false;
 // no options or filename, show current setting
 showSetStart();
 return true;
 }
 if (hasFile) {
-String init = readFile(fn, "/set start");
+StringBuilder sb = new StringBuilder();
-if (init == null) {
+for (String fn : fns) {
-return false;
+String s = readFile(fn, "/set start");
-}
+if (s == null) {
-startup = init;
+return false;
+}
+sb.append(s);
+}
+startup = sb.toString();
 } else if (defaultOption) {
-startup = DEFAULT_STARTUP;
+startup = defaultStartup();
 } else if (noneOption) {
 startup = "";
 }
 if (retainOption) {
 // retain startup setting
 }
 void showSetStart(boolean isRetained, String start) {
 String cmd = "/set start" + (isRetained ? " -retain " : " ");
 String stset;
-if (start.equals(DEFAULT_STARTUP)) {
+if (start.equals(defaultStartup())) {
 stset = cmd + "-default";
 } else if (start.isEmpty()) {
 stset = cmd + "-none";
 } else {
 stset = "startup.jsh:\n" + start + "\n" + cmd + "startup.jsh";
 }
 private boolean runFile(String filename, String context) {
 if (!filename.isEmpty()) {
 try {
-run(new FileScannerIOContext(toPathResolvingUserHome(filename).toString()));
+Path path = toPathResolvingUserHome(filename);
+Reader reader;
+String resource;
+if (!Files.exists(path) && (resource = getResource(filename)) != null) {
+// Not found as file, but found as resource
+reader = new StringReader(resource);
+} else {
+reader = new FileReader(path.toString());
+}
+run(new ScannerIOContext(reader));
 return true;
 } catch (FileNotFoundException e) {
 errormsg("jshell.err.file.not.found", context, filename, e.getMessage());
 } catch (Exception e) {
 errormsg("jshell.err.file.exception", context, filename, e);
 * @return contents of file as string
 */
 String readFile(String filename, String context) {
 if (filename != null) {
 try {
-byte[] encoded = Files.readAllBytes(Paths.get(filename));
+byte[] encoded = Files.readAllBytes(toPathResolvingUserHome(filename));
 return new String(encoded);
 } catch (AccessDeniedException e) {
 errormsg("jshell.err.file.not.accessible", context, filename, e.getMessage());
 } catch (NoSuchFileException e) {
+String resource = getResource(filename);
+if (resource != null) {
+// Not found as file, but found as resource
+return resource;
+}
 errormsg("jshell.err.file.not.found", context, filename);
 } catch (Exception e) {
 errormsg("jshell.err.file.exception", context, filename, e);
 }
 } else {
 errormsg("jshell.err.file.filename", context);
 }
 return null;
+}
+// Read a built-in file from resources or null
+String getResource(String name) {
+if (BUILTIN_FILE_PATTERN.matcher(name).matches()) {
+try {
+return readResource(name);
+} catch (Throwable t) {
+// Fall-through to null
+}
+}
+return null;
+}
+// Read a built-in file from resources
+String readResource(String name) throws IOException {
+// Attempt to find the file as a resource
+String spec = String.format(BUILTIN_FILE_PATH_FORMAT, name);
+URL url = new URL(spec);
+BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
+return reader.lines().collect(Collectors.joining("\n"));
+}
+// retrieve the default startup string
+String defaultStartup() {
+if (defaultStartup == null) {
+defaultStartup = ""; // failure case
+try {
+defaultStartup = readResource(DEFAULT_STARTUP_NAME);
+} catch (AccessDeniedException e) {
+errormsg("jshell.err.file.not.accessible", "jshell", DEFAULT_STARTUP_NAME, e.getMessage());
+} catch (NoSuchFileException e) {
+errormsg("jshell.err.file.not.found", "jshell", DEFAULT_STARTUP_NAME);
+} catch (Exception e) {
+errormsg("jshell.err.file.exception", "jshell", DEFAULT_STARTUP_NAME, e);
+}
+}
+return defaultStartup;
 }
 private boolean cmdReset() {
 live = false;
 fluffmsg("jshell.msg.resetting.state");
 ScannerIOContext(Scanner scannerIn) {
 this.scannerIn = scannerIn;
 }
+ScannerIOContext(Reader rdr) throws FileNotFoundException {
+this(new Scanner(rdr));
+}
 @Override
 public String readLine(String prompt, String prefix) {
 if (scannerIn.hasNextLine()) {
 return scannerIn.nextLine();
 } else {
 }
 @Override
 public int readUserInput() {
 return -1;
-}
-}
-class FileScannerIOContext extends ScannerIOContext {
-FileScannerIOContext(String fn) throws FileNotFoundException {
-this(new FileReader(fn));
-}
-FileScannerIOContext(Reader rdr) throws FileNotFoundException {
-super(new Scanner(rdr));
 }
 }
 class ReloadIOContext extends NonInteractiveIOContext {
 private final Iterator<String> it;

changeset 42972	47ca49eee534
parent 42969	a48d4f74d322
child 43038	7b8b8750a78e