summaryrefslogtreecommitdiff
path: root/src/scalap/scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-04-06 01:26:31 +0000
committerPaul Phillips <paulp@improving.org>2010-04-06 01:26:31 +0000
commitf578ff88d2514bf94c46cfb8c0e33236c2b2fcf1 (patch)
tree79de21d09f14420748c6426f50e7fc636ae7b33f /src/scalap/scala
parent3b8ee6d4a95eb417b9e4eb944afb8d36bc913e18 (diff)
downloadscala-f578ff88d2514bf94c46cfb8c0e33236c2b2fcf1.tar.gz
scala-f578ff88d2514bf94c46cfb8c0e33236c2b2fcf1.tar.bz2
scala-f578ff88d2514bf94c46cfb8c0e33236c2b2fcf1.zip
As a brief diversion from real work, implemente...
As a brief diversion from real work, implemented Damerau–Levenshtein and ran it on trunk to elicit obvious misspellings. Unfortunately they're mostly in places like compiler comments which real people never see, but I fixed them anyway. All those English Lit majors who peruse our sources are sure to be pleased. No review.
Diffstat (limited to 'src/scalap/scala')
-rw-r--r--src/scalap/scala/tools/scalap/scalax/rules/Functors.scala4
-rw-r--r--src/scalap/scala/tools/scalap/scalax/rules/Rules.scala2
-rw-r--r--src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala
index aa95b48d44..aa852c1e63 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/Functors.scala
@@ -60,7 +60,7 @@ trait Functors {
}
}
-/** One of the 'unit' definitions must be overriden in concrete subclasses */
+/** One of the 'unit' definitions must be overridden in concrete subclasses */
trait UnitFunctors extends Units with Functors {
def unit : M[Unit] = unit(())
def unit[A](a : => A) : M[A] = unit map { Unit => a }
@@ -73,7 +73,7 @@ trait Monoidals extends UnitFunctors {
implicit def app[A, B](fab : M[A => B]) = (fa : M[A]) => fa applyTo fab
implicit def appUnit[A, B](a2b : A => B) = app(unit(a2b))
- /** One of 'and' and 'applyTo' definitions must be overriden in concrete subclasses */
+ /** One of 'and' and 'applyTo' definitions must be overridden in concrete subclasses */
trait Monoidal[+A] extends Functor[A] { self : M[A] =>
def and[B](fb : => M[B]) : M[(A, B)] = ((a : A) => (b : B) => (a, b))(this)(fb)
def applyTo[B](fab : M[A => B]) : M[B] = fab and this map { case (f, a) => f(a) }
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala
index 4e8ddc8dbe..43f9c20b1d 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/Rules.scala
@@ -98,7 +98,7 @@ trait StateRules {
def nil = unit(Nil)
def none = unit(None)
- /** Create a rule that suceeds if f(in) is true. */
+ /** Create a rule that identities if f(in) is true. */
def cond(f : S => Boolean) = get filter f
/** Create a rule that succeeds if all of the given rules succeed.
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
index 31bbfa16af..26b01634f5 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala
@@ -205,7 +205,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) {
case _ => "^___^"
})
- // Printe parameter clauses
+ // Print parameter clauses
print(paramEntries.mkString(
"(" + (mt match {case _: ImplicitMethodType => "implicit "; case _ => ""})
, ", ", ")"))
@@ -261,7 +261,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) {
val nn = processName(name)
print(nn)
printMethodType(m.infoType, true)(
- {if (!m.isDeferred) print(" = { /* compiled code */ }" /* Print body only for non-abstract metods */ )}
+ {if (!m.isDeferred) print(" = { /* compiled code */ }" /* Print body only for non-abstract methods */ )}
)
}
print("\n")