summaryrefslogtreecommitdiff
path: root/src/interactive
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-14 15:35:25 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-14 15:35:25 +0100
commit3d76836bc81c3ec183e83ee186e447ff212507d0 (patch)
tree07809e5efdde62a5419183fd006f407191ef9dc4 /src/interactive
parent449fa4c0ff8971d5003e1d2b3d1c993908bcb95f (diff)
parent549dc880c5525e3a2f3ea6af35c7ae8a349b2bdc (diff)
downloadscala-3d76836bc81c3ec183e83ee186e447ff212507d0.tar.gz
scala-3d76836bc81c3ec183e83ee186e447ff212507d0.tar.bz2
scala-3d76836bc81c3ec183e83ee186e447ff212507d0.zip
Merge pull request #4201 from mpociecha/fix-typos-in-docs-and-comments
Fix many typos in docs and comments
Diffstat (limited to 'src/interactive')
-rw-r--r--src/interactive/scala/tools/nsc/interactive/Global.scala4
-rw-r--r--src/interactive/scala/tools/nsc/interactive/Pickler.scala6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
index 4476697cfd..9b34a39e02 100644
--- a/src/interactive/scala/tools/nsc/interactive/Global.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -526,7 +526,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
/** The current presentation compiler runner */
@volatile private[interactive] var compileRunner: Thread = newRunnerThread()
- /** Check that the currenyly executing thread is the presentation compiler thread.
+ /** Check that the currently executing thread is the presentation compiler thread.
*
* Compiler initialization may happen on a different thread (signalled by globalPhase being NoPhase)
*/
@@ -1192,7 +1192,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
}
}
- /** Parses and enters given source file, stroring parse tree in response */
+ /** Parses and enters given source file, storing parse tree in response */
private def getParsedEnteredNow(source: SourceFile, response: Response[Tree]) {
respond(response) {
onUnitOf(source) { unit =>
diff --git a/src/interactive/scala/tools/nsc/interactive/Pickler.scala b/src/interactive/scala/tools/nsc/interactive/Pickler.scala
index 83f3fab925..ddc0c8a068 100644
--- a/src/interactive/scala/tools/nsc/interactive/Pickler.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Pickler.scala
@@ -6,7 +6,7 @@ import scala.language.implicitConversions
import scala.reflect.ClassTag
/** An abstract class for writing and reading Scala objects to and
- * from a legible representation. The presesentation follows the following grammar:
+ * from a legible representation. The representation follows the following grammar:
* {{{
* Pickled = `true` | `false` | `null` | NumericLit | StringLit |
* Labelled | Pickled `,` Pickled
@@ -85,7 +85,7 @@ abstract class Pickler[T] {
object Pickler {
/** A base class representing unpickler result. It has two subclasses:
- * `UnpickleSucess` for successful unpicklings and `UnpickleFailure` for failures,
+ * `UnpickleSuccess` for successful unpicklings and `UnpickleFailure` for failures,
* where a value of the given type `T` could not be unpickled from input.
* @tparam T the type of unpickled values in case of success.
*/
@@ -154,7 +154,7 @@ object Pickler {
*/
def pkl[T: Pickler] = implicitly[Pickler[T]]
- /** A class represenenting `~`-pairs */
+ /** A class representing `~`-pairs */
case class ~[+S, +T](fst: S, snd: T)
/** A wrapper class to be able to use `~` s an infix method */