a9b7887

com-lihaoyi · Jul 21, 2016 · 26bf30a · 26bf30a
1 parent ca4e8ea
commit 26bf30a
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 120 deletions.
diff --git a/master/amm b/master/amm
diff --git a/master/api/amm/ammonite/Main.html b/master/api/amm/ammonite/Main.html
@@ -47,7 +47,7 @@ <h4 id="signature" class="signature">
         <span class="kind">case class</span>
       </span>
       <span class="symbol">
-        <span class="name">Main</span><span class="params">(<span name="predef">predef: <span class="extype" name="scala.Predef.String">String</span> = <span class="symbol">&quot;&quot;</span></span>, <span name="defaultPredef">defaultPredef: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Boolean" class="extype" target="_top">Boolean</a> = <span class="symbol">true</span></span>, <span name="storageBackend">storageBackend: <a href="interp/Storage.html" class="extype" name="ammonite.interp.Storage">Storage</a> = <span class="defval" name='<span class="name"><a href="interp/Storage$.html">new Storage.Folder(Defaults.ammoniteHome)</a></span>'>...</span></span>, <span name="wd">wd: <span class="extype" name="ammonite.ops.Path">Path</span> = <span class="symbol"><span class="name"><a href="package.html">ammonite.ops.cwd</a></span></span></span>, <span name="welcomeBanner">welcomeBanner: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Option" class="extype" target="_top">Option</a>[<span class="extype" name="scala.Predef.String">String</span>] = <span class="symbol"><span class="name"><a href="package.html">Some(Defaults.welcomeBanner)</a></span></span></span>, <span name="inputStream">inputStream: <span class="extype" name="java.io.InputStream">InputStream</span> = <span class="symbol">System.in</span></span>, <span name="outputStream">outputStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.out</span></span>, <span name="errorStream">errorStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.err</span></span>, <span name="timer">timer: <a href="util/Timer.html" class="extype" name="ammonite.util.Timer">Timer</a> = <span class="symbol"><span class="name"><a href="package.html">Timer.none</a></span></span></span>)</span><span class="result"> extends <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Product" class="extype" target="_top">Product</a> with <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Serializable" class="extype" target="_top">Serializable</a></span>
+        <span class="name">Main</span><span class="params">(<span name="predef">predef: <span class="extype" name="scala.Predef.String">String</span> = <span class="symbol">&quot;&quot;</span></span>, <span name="defaultPredef">defaultPredef: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Boolean" class="extype" target="_top">Boolean</a> = <span class="symbol">true</span></span>, <span name="storageBackend">storageBackend: <a href="interp/Storage.html" class="extype" name="ammonite.interp.Storage">Storage</a> = <span class="defval" name='<span class="name"><a href="package.html">new Storage.Folder(Defaults.ammoniteHome)</a></span>'>...</span></span>, <span name="wd">wd: <span class="extype" name="ammonite.ops.Path">Path</span> = <span class="symbol"><span class="name"><a href="package.html">ammonite.ops.cwd</a></span></span></span>, <span name="welcomeBanner">welcomeBanner: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Option" class="extype" target="_top">Option</a>[<span class="extype" name="scala.Predef.String">String</span>] = <span class="symbol"><span class="name"><a href="package.html">Some(Defaults.welcomeBanner)</a></span></span></span>, <span name="inputStream">inputStream: <span class="extype" name="java.io.InputStream">InputStream</span> = <span class="symbol">System.in</span></span>, <span name="outputStream">outputStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.out</span></span>, <span name="errorStream">errorStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.err</span></span>)</span><span class="result"> extends <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Product" class="extype" target="_top">Product</a> with <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Serializable" class="extype" target="_top">Serializable</a></span>
       </span>
       </h4>
 
@@ -109,18 +109,18 @@ <h4 id="signature" class="signature">
         <div id="constructors" class="members">
               <h3>Instance Constructors</h3>
               <ol><li name="ammonite.Main#&lt;init&gt;" visbl="pub" data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="&lt;init&gt;(predef:String,defaultPredef:Boolean,storageBackend:ammonite.interp.Storage,wd:ammonite.ops.Path,welcomeBanner:Option[String],inputStream:java.io.InputStream,outputStream:java.io.OutputStream,errorStream:java.io.OutputStream,timer:ammonite.util.Timer):ammonite.Main"></a>
+      <a id="&lt;init&gt;(predef:String,defaultPredef:Boolean,storageBackend:ammonite.interp.Storage,wd:ammonite.ops.Path,welcomeBanner:Option[String],inputStream:java.io.InputStream,outputStream:java.io.OutputStream,errorStream:java.io.OutputStream):ammonite.Main"></a>
       <a id="&lt;init&gt;:Main"></a>
       <h4 class="signature">
       <span class="modifier_kind">
         <span class="modifier"></span>
         <span class="kind">new</span>
       </span>
       <span class="symbol">
-        <span class="name">Main</span><span class="params">(<span name="predef">predef: <span class="extype" name="scala.Predef.String">String</span> = <span class="symbol">&quot;&quot;</span></span>, <span name="defaultPredef">defaultPredef: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Boolean" class="extype" target="_top">Boolean</a> = <span class="symbol">true</span></span>, <span name="storageBackend">storageBackend: <a href="interp/Storage.html" class="extype" name="ammonite.interp.Storage">Storage</a> = <span class="defval" name='<span class="name"><a href="interp/Storage$.html">new Storage.Folder(Defaults.ammoniteHome)</a></span>'>...</span></span>, <span name="wd">wd: <span class="extype" name="ammonite.ops.Path">Path</span> = <span class="symbol"><span class="name"><a href="package.html">ammonite.ops.cwd</a></span></span></span>, <span name="welcomeBanner">welcomeBanner: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Option" class="extype" target="_top">Option</a>[<span class="extype" name="scala.Predef.String">String</span>] = <span class="symbol"><span class="name"><a href="package.html">Some(Defaults.welcomeBanner)</a></span></span></span>, <span name="inputStream">inputStream: <span class="extype" name="java.io.InputStream">InputStream</span> = <span class="symbol">System.in</span></span>, <span name="outputStream">outputStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.out</span></span>, <span name="errorStream">errorStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.err</span></span>, <span name="timer">timer: <a href="util/Timer.html" class="extype" name="ammonite.util.Timer">Timer</a> = <span class="symbol"><span class="name"><a href="package.html">Timer.none</a></span></span></span>)</span>
+        <span class="name">Main</span><span class="params">(<span name="predef">predef: <span class="extype" name="scala.Predef.String">String</span> = <span class="symbol">&quot;&quot;</span></span>, <span name="defaultPredef">defaultPredef: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Boolean" class="extype" target="_top">Boolean</a> = <span class="symbol">true</span></span>, <span name="storageBackend">storageBackend: <a href="interp/Storage.html" class="extype" name="ammonite.interp.Storage">Storage</a> = <span class="defval" name='<span class="name"><a href="package.html">new Storage.Folder(Defaults.ammoniteHome)</a></span>'>...</span></span>, <span name="wd">wd: <span class="extype" name="ammonite.ops.Path">Path</span> = <span class="symbol"><span class="name"><a href="package.html">ammonite.ops.cwd</a></span></span></span>, <span name="welcomeBanner">welcomeBanner: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Option" class="extype" target="_top">Option</a>[<span class="extype" name="scala.Predef.String">String</span>] = <span class="symbol"><span class="name"><a href="package.html">Some(Defaults.welcomeBanner)</a></span></span></span>, <span name="inputStream">inputStream: <span class="extype" name="java.io.InputStream">InputStream</span> = <span class="symbol">System.in</span></span>, <span name="outputStream">outputStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.out</span></span>, <span name="errorStream">errorStream: <span class="extype" name="java.io.OutputStream">OutputStream</span> = <span class="symbol">System.err</span></span>)</span>
       </span>
       </h4><span class="permalink">
-      <a href="../index.html#ammonite.Main@&lt;init&gt;(predef:String,defaultPredef:Boolean,storageBackend:ammonite.interp.Storage,wd:ammonite.ops.Path,welcomeBanner:Option[String],inputStream:java.io.InputStream,outputStream:java.io.OutputStream,errorStream:java.io.OutputStream,timer:ammonite.util.Timer):ammonite.Main" title="Permalink" target="_top">
+      <a href="../index.html#ammonite.Main@&lt;init&gt;(predef:String,defaultPredef:Boolean,storageBackend:ammonite.interp.Storage,wd:ammonite.ops.Path,welcomeBanner:Option[String],inputStream:java.io.InputStream,outputStream:java.io.OutputStream,errorStream:java.io.OutputStream):ammonite.Main" title="Permalink" target="_top">
         <img src="../lib/permalink.png" alt="Permalink" />
       </a>
     </span>
@@ -566,23 +566,6 @@ <h4 class="signature">
       </a>
     </span>
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd>AnyRef</dd></dl></div>
-    </li><li name="ammonite.Main#timer" visbl="pub" data-isabs="false" fullComment="no" group="Ungrouped">
-      <a id="timer:ammonite.util.Timer"></a>
-      <a id="timer:Timer"></a>
-      <h4 class="signature">
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">val</span>
-      </span>
-      <span class="symbol">
-        <span class="name">timer</span><span class="result">: <a href="util/Timer.html" class="extype" name="ammonite.util.Timer">Timer</a></span>
-      </span>
-      </h4><span class="permalink">
-      <a href="../index.html#ammonite.Main@timer:ammonite.util.Timer" title="Permalink" target="_top">
-        <img src="../lib/permalink.png" alt="Permalink" />
-      </a>
-    </span>
-
     </li><li name="scala.AnyRef#wait" visbl="pub" data-isabs="false" fullComment="yes" group="Ungrouped">
       <a id="wait():Unit"></a>
       <a id="wait():Unit"></a>

diff --git a/master/api/amm/ammonite/interp/Compiler$.html b/master/api/amm/ammonite/interp/Compiler$.html
@@ -188,18 +188,18 @@ <h4 class="signature">
       <p class="shortcomment cmt">Writes files to dynamicClasspath.</p><div class="fullcomment"><div class="comment cmt"><p>Writes files to dynamicClasspath. Needed for loading cached classes.
 </p></div></div>
     </li><li name="ammonite.interp.Compiler#apply" visbl="pub" data-isabs="false" fullComment="no" group="Ungrouped">
-      <a id="apply(classpath:Seq[java.io.File],dynamicClasspath:scala.reflect.io.VirtualDirectory,evalClassloader:=&gt;ClassLoader,pluginClassloader:=&gt;ClassLoader,shutdownPressy:()=&gt;Unit,settings:scala.tools.nsc.Settings,timer:ammonite.util.Timer):ammonite.interp.Compiler"></a>
-      <a id="apply(Seq[File],VirtualDirectory,⇒ClassLoader,⇒ClassLoader,()⇒Unit,Settings,Timer):Compiler"></a>
+      <a id="apply(classpath:Seq[java.io.File],dynamicClasspath:scala.reflect.io.VirtualDirectory,evalClassloader:=&gt;ClassLoader,pluginClassloader:=&gt;ClassLoader,shutdownPressy:()=&gt;Unit,settings:scala.tools.nsc.Settings):ammonite.interp.Compiler"></a>
+      <a id="apply(Seq[File],VirtualDirectory,⇒ClassLoader,⇒ClassLoader,()⇒Unit,Settings):Compiler"></a>
       <h4 class="signature">
       <span class="modifier_kind">
         <span class="modifier"></span>
         <span class="kind">def</span>
       </span>
       <span class="symbol">
-        <span class="name">apply</span><span class="params">(<span name="classpath">classpath: <a href="../../scala/package.html#Seq[+A]=Seq[A]" class="extmbr" name="scala.Seq">Seq</a>[<span class="extype" name="java.io.File">File</span>]</span>, <span name="dynamicClasspath">dynamicClasspath: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.reflect.io.VirtualDirectory" class="extype" target="_top">VirtualDirectory</a></span>, <span name="evalClassloader">evalClassloader: ⇒ <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="pluginClassloader">pluginClassloader: ⇒ <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="shutdownPressy">shutdownPressy: () ⇒ <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Unit" class="extype" target="_top">Unit</a></span>, <span name="settings">settings: <a href="https://oss.sonatype.org/service/local/repositories/releases/archive/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8-javadoc.jar/!/index.html#scala.tools.nsc.Settings" class="extype" target="_top">Settings</a></span>, <span name="timer">timer: <a href="../util/Timer.html" class="extype" name="ammonite.util.Timer">Timer</a></span>)</span><span class="result">: <a href="Compiler.html" class="extype" name="ammonite.interp.Compiler">Compiler</a></span>
+        <span class="name">apply</span><span class="params">(<span name="classpath">classpath: <a href="../../scala/package.html#Seq[+A]=Seq[A]" class="extmbr" name="scala.Seq">Seq</a>[<span class="extype" name="java.io.File">File</span>]</span>, <span name="dynamicClasspath">dynamicClasspath: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.reflect.io.VirtualDirectory" class="extype" target="_top">VirtualDirectory</a></span>, <span name="evalClassloader">evalClassloader: ⇒ <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="pluginClassloader">pluginClassloader: ⇒ <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="shutdownPressy">shutdownPressy: () ⇒ <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Unit" class="extype" target="_top">Unit</a></span>, <span name="settings">settings: <a href="https://oss.sonatype.org/service/local/repositories/releases/archive/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8-javadoc.jar/!/index.html#scala.tools.nsc.Settings" class="extype" target="_top">Settings</a></span>)</span><span class="result">: <a href="Compiler.html" class="extype" name="ammonite.interp.Compiler">Compiler</a></span>
       </span>
       </h4><span class="permalink">
-      <a href="../../index.html#ammonite.interp.Compiler$@apply(classpath:Seq[java.io.File],dynamicClasspath:scala.reflect.io.VirtualDirectory,evalClassloader:=&gt;ClassLoader,pluginClassloader:=&gt;ClassLoader,shutdownPressy:()=&gt;Unit,settings:scala.tools.nsc.Settings,timer:ammonite.util.Timer):ammonite.interp.Compiler" title="Permalink" target="_top">
+      <a href="../../index.html#ammonite.interp.Compiler$@apply(classpath:Seq[java.io.File],dynamicClasspath:scala.reflect.io.VirtualDirectory,evalClassloader:=&gt;ClassLoader,pluginClassloader:=&gt;ClassLoader,shutdownPressy:()=&gt;Unit,settings:scala.tools.nsc.Settings):ammonite.interp.Compiler" title="Permalink" target="_top">
         <img src="../../lib/permalink.png" alt="Permalink" />
       </a>
     </span>

diff --git a/master/api/amm/ammonite/interp/Evaluator$.html b/master/api/amm/ammonite/interp/Evaluator$.html
@@ -148,18 +148,18 @@ <h4 class="signature">
     </span>
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd>AnyRef → Any</dd></dl></div>
     </li><li name="ammonite.interp.Evaluator#apply" visbl="pub" data-isabs="false" fullComment="no" group="Ungrouped">
-      <a id="apply(currentClassloader:ClassLoader,startingLine:Int,timer:ammonite.util.Timer):ammonite.interp.Evaluator"></a>
-      <a id="apply(ClassLoader,Int,Timer):Evaluator"></a>
+      <a id="apply(currentClassloader:ClassLoader,startingLine:Int):ammonite.interp.Evaluator"></a>
+      <a id="apply(ClassLoader,Int):Evaluator"></a>
       <h4 class="signature">
       <span class="modifier_kind">
         <span class="modifier"></span>
         <span class="kind">def</span>
       </span>
       <span class="symbol">
-        <span class="name">apply</span><span class="params">(<span name="currentClassloader">currentClassloader: <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="startingLine">startingLine: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Int" class="extype" target="_top">Int</a></span>, <span name="timer">timer: <a href="../util/Timer.html" class="extype" name="ammonite.util.Timer">Timer</a></span>)</span><span class="result">: <a href="Evaluator.html" class="extype" name="ammonite.interp.Evaluator">Evaluator</a></span>
+        <span class="name">apply</span><span class="params">(<span name="currentClassloader">currentClassloader: <span class="extype" name="java.lang.ClassLoader">ClassLoader</span></span>, <span name="startingLine">startingLine: <a href="http://www.scala-lang.org/api/2.11.8/index.html#scala.Int" class="extype" target="_top">Int</a></span>)</span><span class="result">: <a href="Evaluator.html" class="extype" name="ammonite.interp.Evaluator">Evaluator</a></span>
       </span>
       </h4><span class="permalink">
-      <a href="../../index.html#ammonite.interp.Evaluator$@apply(currentClassloader:ClassLoader,startingLine:Int,timer:ammonite.util.Timer):ammonite.interp.Evaluator" title="Permalink" target="_top">
+      <a href="../../index.html#ammonite.interp.Evaluator$@apply(currentClassloader:ClassLoader,startingLine:Int):ammonite.interp.Evaluator" title="Permalink" target="_top">
         <img src="../../lib/permalink.png" alt="Permalink" />
       </a>
     </span>