diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-23 11:59:09 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-23 11:59:09 -0700 |
commit | c8cd187b8ea5cef1fad6f42f4f276e19c99b317e (patch) | |
tree | fc315993579ef022fbc56f3e8af11a86cb7418c6 | |
parent | 3468b2a2b00f4c5e6912174cf35fa024ef9a8520 (diff) | |
parent | 6c48941f0961a17647a6c95022d13fef3ab1f956 (diff) | |
download | scala-c8cd187b8ea5cef1fad6f42f4f276e19c99b317e.tar.gz scala-c8cd187b8ea5cef1fad6f42f4f276e19c99b317e.tar.bz2 scala-c8cd187b8ea5cef1fad6f42f4f276e19c99b317e.zip |
Merge pull request #2265 from rjolly/scripting9
script engine : better binding mechanism + reflexive access through bound variable "engine"
-rw-r--r-- | build.xml | 7 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/util/AbstractFileClassLoader.scala | 10 | ||||
-rw-r--r-- | src/reflect/scala/reflect/io/ZipArchive.scala | 6 | ||||
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IBindings.java | 45 | ||||
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 20 |
5 files changed, 79 insertions, 9 deletions
@@ -1103,6 +1103,13 @@ QUICK BUILD (QUICK) <target name="quick.repl" depends="quick.pre-repl" unless="quick.repl.available"> <mkdir dir="${build-quick.dir}/classes/repl"/> + <javac + srcdir="${src.dir}/repl" + destdir="${build-quick.dir}/classes/repl" + includes="**/*.java" + target="1.6" source="1.5"> + <compilerarg line="${javac.args} -XDignore.symbol.file"/> + </javac> <scalacfork destdir="${build-quick.dir}/classes/repl" compilerpathref="quick.classpath" diff --git a/src/compiler/scala/tools/nsc/util/AbstractFileClassLoader.scala b/src/compiler/scala/tools/nsc/util/AbstractFileClassLoader.scala index e4f879560c..b204c39e9c 100644 --- a/src/compiler/scala/tools/nsc/util/AbstractFileClassLoader.scala +++ b/src/compiler/scala/tools/nsc/util/AbstractFileClassLoader.scala @@ -8,7 +8,6 @@ package util import scala.tools.nsc.io.AbstractFile import java.security.cert.Certificate import java.security.{ ProtectionDomain, CodeSource } -import util.ScalaClassLoader import java.net.{ URL, URLConnection, URLStreamHandler } import scala.collection.{ mutable, immutable } @@ -91,10 +90,13 @@ class AbstractFileClassLoader(val root: AbstractFile, parent: ClassLoader) lazy val protectionDomain = { val cl = Thread.currentThread().getContextClassLoader() val resource = cl.getResource("scala/runtime/package.class") - if (resource == null) null else { + if (resource == null || resource.getProtocol != "jar") null else { val s = resource.getPath - val path = s.substring(0, s.lastIndexOf('!')) - new ProtectionDomain(new CodeSource(new URL(path), null.asInstanceOf[Array[Certificate]]), null, this, null) + val n = s.lastIndexOf('!') + if (n < 0) null else { + val path = s.substring(0, n) + new ProtectionDomain(new CodeSource(new URL(path), null.asInstanceOf[Array[Certificate]]), null, this, null) + } } } diff --git a/src/reflect/scala/reflect/io/ZipArchive.scala b/src/reflect/scala/reflect/io/ZipArchive.scala index 1342fde3c5..11d04538e9 100644 --- a/src/reflect/scala/reflect/io/ZipArchive.scala +++ b/src/reflect/scala/reflect/io/ZipArchive.scala @@ -259,7 +259,11 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) { } def name = path - def path: String = url.getPath() match { case s => s.substring(0, s.lastIndexOf('!')) } + def path: String = { + val s = url.getPath + val n = s.lastIndexOf('!') + s.substring(0, n) + } def input = url.openStream() def lastModified = try url.openConnection().getLastModified() diff --git a/src/repl/scala/tools/nsc/interpreter/IBindings.java b/src/repl/scala/tools/nsc/interpreter/IBindings.java new file mode 100644 index 0000000000..b4cee4b957 --- /dev/null +++ b/src/repl/scala/tools/nsc/interpreter/IBindings.java @@ -0,0 +1,45 @@ +/* NSC -- new Scala compiler + * Copyright 2005-2013 LAMP/EPFL + * @author Raphael Jolly + */ + +package scala.tools.nsc.interpreter; + +import java.util.Map; +import java.util.AbstractMap; +import java.util.Set; +import java.util.AbstractSet; +import java.util.Iterator; +import java.util.NoSuchElementException; +import javax.script.Bindings; + +abstract class IBindings extends AbstractMap<String, Object> implements Bindings { + public Set<Map.Entry<String, Object>> entrySet() { + return new AbstractSet<Map.Entry<String, Object>>() { + public int size() { + return 0; + } + + public Iterator<Map.Entry<String, Object>> iterator() { + return new Iterator<Map.Entry<String, Object>>() { + public boolean hasNext() { + return false; + } + + public Map.Entry<String, Object> next() { + throw new NoSuchElementException(); + } + + public void remove() { + throw new UnsupportedOperationException(); + } + }; + } + + public boolean add(Map.Entry<String, Object> e) { + IBindings.this.put(e.getKey(), e.getValue()); + return true; + } + }; + } +} diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index c92777c13e..d2b6cdd7f0 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -21,7 +21,7 @@ import scala.tools.nsc.util.Exceptional.unwrap import scala.collection.{ mutable, immutable } import scala.reflect.BeanProperty import scala.util.Properties.versionString -import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine, ScriptEngineFactory, ScriptException, SimpleBindings, CompiledScript, Compilable} +import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine, ScriptEngineFactory, ScriptException, CompiledScript, Compilable} import java.io.{ StringWriter, Reader } import java.util.Arrays import IMain._ @@ -62,9 +62,10 @@ import StdReplTags._ * @author Moez A. Abdel-Gawad * @author Lex Spoon */ -class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Settings, protected val out: JPrintWriter) extends AbstractScriptEngine(new SimpleBindings) with Compilable with Imports { +class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Settings, protected val out: JPrintWriter) extends AbstractScriptEngine with Compilable with Imports { imain => + setBindings(createBindings, ScriptContext.ENGINE_SCOPE) object replOutput extends ReplOutput(settings.Yreploutdir) { } @deprecated("Use replOutput.dir instead", "2.11.0") @@ -554,7 +555,7 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set @throws(classOf[ScriptException]) def compile(script: String): CompiledScript = { if (!bound) { - quietBind("bindings", getBindings(ScriptContext.ENGINE_SCOPE)) + quietBind("engine", this.asInstanceOf[ScriptEngine]) bound = true } val cat = code + script @@ -969,7 +970,18 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set override def toString = "Request(line=%s, %s trees)".format(line, trees.size) } - def createBindings: Bindings = new SimpleBindings + def createBindings: Bindings = new IBindings { + override def put(name: String, value: Object): Object = { + val n = name.indexOf(":") + val p: NamedParam = if (n < 0) (name, value) else { + val nme = name.substring(0, n).trim + val tpe = name.substring(n + 1).trim + NamedParamClass(nme, tpe, value) + } + if (!p.name.startsWith("javax.script")) bind(p) + null + } + } @throws(classOf[ScriptException]) def eval(script: String, context: ScriptContext): Object = compile(script).eval(context) |