summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-10-16 19:02:41 +0000
committerPaul Phillips <paulp@improving.org>2010-10-16 19:02:41 +0000
commit5cdb213d7d24ae357c518823e1054cb302b250eb (patch)
tree90812d869840df297b4fa9afa0a7dae43ddc1d9a /src/compiler
parent87134363a20bc81297037d8858ee88e961f255f9 (diff)
downloadscala-5cdb213d7d24ae357c518823e1054cb302b250eb.tar.gz
scala-5cdb213d7d24ae357c518823e1054cb302b250eb.tar.bz2
scala-5cdb213d7d24ae357c518823e1054cb302b250eb.zip
Documentation being generated by genprod was pr...
Documentation being generated by genprod was pretty busted both in terms of formatting and correctness. Spruced it up. Eliminated some of the more distracting HTML entities in compiler source. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala2
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala16
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala2
-rw-r--r--src/compiler/scala/tools/nsc/transform/Erasure.scala6
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
5 files changed, 14 insertions, 14 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index 60df523d92..2f634092d6 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
@@ -186,7 +186,7 @@ trait MarkupParsers
}
/** adds entity/character to ts as side-effect
- * @precond ch == '&amp;'
+ * @precond ch == '&'
*/
def content_AMP(ts: ArrayBuffer[Tree]) {
nextch
diff --git a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
index fc2fe6f2a5..7a3321f6eb 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
@@ -204,7 +204,7 @@ abstract class TreeBuilder {
}
}
- /** Create a tree representing an assignment &lt;lhs = rhs&gt; */
+ /** Create a tree representing an assignment <lhs = rhs> */
def makeAssign(lhs: Tree, rhs: Tree): Tree = lhs match {
case Apply(fn, args) =>
Apply(atPos(fn.pos) { Select(fn, nme.update) }, args ::: List(rhs))
@@ -238,7 +238,7 @@ abstract class TreeBuilder {
else if (stats.length == 1) stats.head
else Block(stats.init, stats.last)
- /** Create tree for for-comprehension generator &lt;val pat0 &lt;- rhs0&gt; */
+ /** Create tree for for-comprehension generator <val pat0 <- rhs0> */
def makeGenerator(pos: Position, pat: Tree, valeq: Boolean, rhs: Tree): Enumerator = {
val pat1 = patvarTransformer.transform(pat);
val rhs1 =
@@ -274,8 +274,8 @@ abstract class TreeBuilder {
case class ValEq(pos: Position, pat: Tree, rhs: Tree) extends Enumerator
case class Filter(pos: Position, test: Tree) extends Enumerator
- /** Create tree for for-comprehension &lt;for (enums) do body&gt; or
- * &lt;for (enums) yield body&gt; where mapName and flatMapName are chosen
+ /** Create tree for for-comprehension <for (enums) do body> or
+ * <for (enums) yield body> where mapName and flatMapName are chosen
* corresponding to whether this is a for-do or a for-yield.
* The creation performs the following rewrite rules:
*
@@ -411,11 +411,11 @@ abstract class TreeBuilder {
// result
}
- /** Create tree for for-do comprehension &lt;for (enums) body&gt; */
+ /** Create tree for for-do comprehension <for (enums) body> */
def makeFor(enums: List[Enumerator], body: Tree): Tree =
makeFor(nme.foreach, nme.foreach, enums, body)
- /** Create tree for for-yield comprehension &lt;for (enums) yield body&gt; */
+ /** Create tree for for-yield comprehension <for (enums) yield body> */
def makeForYield(enums: List[Enumerator], body: Tree): Tree =
makeFor(nme.map, nme.flatMap, enums, body)
@@ -456,11 +456,11 @@ abstract class TreeBuilder {
Function(List(makeSyntheticParam(x)), Match(sel, cases))
}
- /** Create tree for case definition &lt;case pat if guard => rhs&gt; */
+ /** Create tree for case definition <case pat if guard => rhs> */
def makeCaseDef(pat: Tree, guard: Tree, rhs: Tree): CaseDef =
CaseDef(patvarTransformer.transform(pat), guard, rhs)
- /** Create tree for pattern definition &lt;val pat0 = rhs&gt; */
+ /** Create tree for pattern definition <val pat0 = rhs> */
def makePatDef(pat: Tree, rhs: Tree): List[Tree] =
makePatDef(Modifiers(0), pat, rhs)
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 7be9475f23..5a02de0907 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -652,7 +652,7 @@ abstract class GenJVM extends SubComponent {
// add a fake local for debugging purpuses
if (emitVars && isClosureApply(method.symbol)) {
- val outerField = clasz.symbol.info.decl(nme.getterToLocal(nme.OUTER))
+ val outerField = clasz.symbol.info.decl(nme.OUTER_LOCAL)
if (outerField != NoSymbol) {
log("Adding fake local to represent outer 'this' for closure " + clasz)
val _this = new Local(
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index 023dd9c97d..3aa723bcfd 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -351,7 +351,7 @@ abstract class Erasure extends AddInterfaces with typechecker.Analyzer with ast.
* <code>C</code> is the erased classinfo of the <code>Array</code> class
* </li>
* <li>
- * For <code>Array[T].&lt;init&gt;</code> : <code>{scala#Int)Array[T]</code>
+ * For <code>Array[T].<init></code> : <code>{scala#Int)Array[T]</code>
* </li>
* <li>
* For a type parameter : A type bounds type consisting of the erasures
@@ -540,8 +540,8 @@ abstract class Erasure extends AddInterfaces with typechecker.Analyzer with ast.
* class <code>Object</code>.
* </li>
* <li>
- * <code>new BoxedArray.&lt;init&gt;(len)</code> becomes
- * <code>new BoxedAnyArray.&lt;init&gt;(len): BoxedArray</code>
+ * <code>new BoxedArray.<init>(len)</code> becomes
+ * <code>new BoxedAnyArray.<init>(len): BoxedArray</code>
* (the widening typing is necessary so that subsequent member
* symbols stay the same)
* </li>
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 558e5107e8..fa62e24d96 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -110,7 +110,7 @@ trait Typers { self: Analyzer =>
val TAPPmode = 0x080
/** The mode <code>SUPERCONSTRmode</code> is set for the <code>super</code>
- * in a superclass constructor call <code>super.&lt;init&gt;</code>.
+ * in a superclass constructor call <code>super.<init></code>.
*/
val SUPERCONSTRmode = 0x100