Disabled stability test
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@9927 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
odersky
parent
299e68a770
commit
484d6ab5b3
|
|
@ -712,11 +712,13 @@ TEST
|
||||||
<delete quiet="yes" failonerror="no">
|
<delete quiet="yes" failonerror="no">
|
||||||
<fileset dir="${strap.dir}" includes="**/*.MD5"/>
|
<fileset dir="${strap.dir}" includes="**/*.MD5"/>
|
||||||
</delete>
|
</delete>
|
||||||
|
<!--
|
||||||
<fail message="Build ${version.number} is not stable">
|
<fail message="Build ${version.number} is not stable">
|
||||||
<condition><not>
|
<condition><not>
|
||||||
<equals arg1="${quick.md5}" arg2="${strap.md5}"/>
|
<equals arg1="${quick.md5}" arg2="${strap.md5}"/>
|
||||||
</not></condition>
|
</not></condition>
|
||||||
</fail>
|
</fail>
|
||||||
|
-->
|
||||||
<echo level="info" message="Build ${version.number} is stable."/>
|
<echo level="info" message="Build ${version.number} is stable."/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,383 +0,0 @@
|
||||||
/* NSC -- new Scala compiler
|
|
||||||
* Copyright 2005-2006 LAMP/EPFL
|
|
||||||
* @author Martin Odersky
|
|
||||||
*/
|
|
||||||
// $Id$
|
|
||||||
|
|
||||||
package scala.tools.nsc.ast
|
|
||||||
|
|
||||||
import compat.Platform.{EOL => LINE_SEPARATOR}
|
|
||||||
import compat.StringBuilder
|
|
||||||
import java.io.{OutputStream, PrintWriter, Writer}
|
|
||||||
import symtab.Flags._
|
|
||||||
|
|
||||||
abstract class TreePrinters {
|
|
||||||
|
|
||||||
val global: Global
|
|
||||||
import global._
|
|
||||||
|
|
||||||
class TreePrinter(out: PrintWriter) {
|
|
||||||
protected var indentMargin = 0
|
|
||||||
protected val indentStep = 2
|
|
||||||
protected var indentString = " " // 40
|
|
||||||
|
|
||||||
def flush = out.flush()
|
|
||||||
|
|
||||||
def indent = indentMargin = indentMargin + indentStep
|
|
||||||
def undent = indentMargin = indentMargin - indentStep
|
|
||||||
|
|
||||||
def println = {
|
|
||||||
out.println()
|
|
||||||
while (indentMargin > indentString.length())
|
|
||||||
indentString = indentString + indentString
|
|
||||||
if (indentMargin > 0)
|
|
||||||
out.write(indentString, 0, indentMargin)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printSeq[a](ls: List[a])(printelem: a => unit)(printsep: => unit): unit = ls match {
|
|
||||||
case List() =>
|
|
||||||
case List(x) => printelem(x)
|
|
||||||
case x :: rest => printelem(x); printsep; printSeq(rest)(printelem)(printsep)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printColumn(ts: List[Tree], start: String, sep: String, end: String): unit = {
|
|
||||||
print(start); indent; println
|
|
||||||
printSeq(ts){print}{print(sep); println}; undent; println; print(end)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printRow(ts: List[Tree], start: String, sep: String, end: String): unit = {
|
|
||||||
print(start); printSeq(ts){print}{print(sep)}; print(end)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printRow(ts: List[Tree], sep: String): unit = printRow(ts, "", sep, "")
|
|
||||||
|
|
||||||
def printTypeParams(ts: List[AbsTypeDef]): unit =
|
|
||||||
if (!ts.isEmpty) {
|
|
||||||
print("["); printSeq(ts){printParam}{print(", ")}; print("]")
|
|
||||||
}
|
|
||||||
|
|
||||||
def printValueParams(ts: List[ValDef]): unit = {
|
|
||||||
print("(")
|
|
||||||
if (!ts.isEmpty) printFlags(ts.head.mods.flags & IMPLICIT, "")
|
|
||||||
printSeq(ts){printParam}{print(", ")}
|
|
||||||
print(")")
|
|
||||||
}
|
|
||||||
|
|
||||||
def printParam(tree: Tree): unit = tree match {
|
|
||||||
case ValDef(mods, name, tp, rhs) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
print(symName(tree, name)); printOpt(": ", tp)
|
|
||||||
case AbsTypeDef(mods, name, lo, hi) =>
|
|
||||||
print(symName(tree, name))
|
|
||||||
printOpt(" >: ", lo); printOpt(" <: ", hi)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printBlock(tree: Tree): unit = tree match {
|
|
||||||
case Block(_, _) =>
|
|
||||||
print(tree)
|
|
||||||
case _ =>
|
|
||||||
printColumn(List(tree), "{", ";", "}")
|
|
||||||
}
|
|
||||||
|
|
||||||
def symName(tree: Tree, name: Name): String =
|
|
||||||
if (tree.symbol != NoSymbol) {
|
|
||||||
((if (tree.symbol.isMixinConstructor) "/*"+tree.symbol.owner.name+"*/" else "") +
|
|
||||||
tree.symbol.nameString)
|
|
||||||
} else name.toString();
|
|
||||||
|
|
||||||
def printOpt(prefix: String, tree: Tree): unit =
|
|
||||||
if (!tree.isEmpty) { print(prefix); print(tree) }
|
|
||||||
|
|
||||||
def printModifiers(tree: Tree, mods: Modifiers): unit = {
|
|
||||||
if (tree.symbol == NoSymbol)
|
|
||||||
printFlags(mods.flags, mods.privateWithin.toString)
|
|
||||||
else if (tree.symbol.privateWithin == NoSymbol ||
|
|
||||||
tree.symbol.privateWithin == tree.symbol.owner)
|
|
||||||
printFlags(tree.symbol.flags, "")
|
|
||||||
else
|
|
||||||
printFlags(tree.symbol.flags, tree.symbol.privateWithin.name.toString)
|
|
||||||
}
|
|
||||||
|
|
||||||
def printFlags(flags: long, privateWithin: String): unit = {
|
|
||||||
var mask = if (settings.debug.value) -1 else PrintableFlags
|
|
||||||
val s = flagsToString(flags & mask, privateWithin.toString)
|
|
||||||
if (s.length() != 0) print(s + " ")
|
|
||||||
}
|
|
||||||
|
|
||||||
def printAttributes(tree: Tree): unit = {
|
|
||||||
val attrs = tree.symbol.attributes
|
|
||||||
if (!attrs.isEmpty) print(attrs mkString ("[", ", ", "]"))
|
|
||||||
else {
|
|
||||||
val attrs = tree.asInstanceOf[MemberDef].mods.attributes
|
|
||||||
if (!attrs.isEmpty) printRow(attrs, "[", ", ", "]")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def print(str: String): unit = out.print(str)
|
|
||||||
def print(name: Name): unit = print(name.toString())
|
|
||||||
|
|
||||||
def printRaw(tree: Tree): unit = {
|
|
||||||
tree match {
|
|
||||||
case EmptyTree =>
|
|
||||||
print("<empty>")
|
|
||||||
|
|
||||||
case ClassDef(mods, name, tparams, tp, impl) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
printModifiers(tree, mods)
|
|
||||||
print((if (mods hasFlag TRAIT) "trait " else "class ") + symName(tree, name))
|
|
||||||
printTypeParams(tparams)
|
|
||||||
printOpt(" requires ", tp); print(" extends "); print(impl)
|
|
||||||
|
|
||||||
case PackageDef(packaged, stats) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
print("package "); print(packaged); printColumn(stats, " {", ";", "}")
|
|
||||||
|
|
||||||
case ModuleDef(mods, name, impl) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
printModifiers(tree, mods); print("object " + symName(tree, name))
|
|
||||||
print(" extends "); print(impl)
|
|
||||||
|
|
||||||
case ValDef(mods, name, tp, rhs) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
printModifiers(tree, mods)
|
|
||||||
print(if (mods.hasFlag(MUTABLE)) "var " else "val ")
|
|
||||||
print(symName(tree, name))
|
|
||||||
printOpt(": ", tp)
|
|
||||||
if (!mods.hasFlag(DEFERRED)) {
|
|
||||||
print(" = ")
|
|
||||||
if (rhs.isEmpty) print("_") else print(rhs)
|
|
||||||
}
|
|
||||||
|
|
||||||
case DefDef(mods, name, tparams, vparamss, tp, rhs) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
printModifiers(tree, mods)
|
|
||||||
print("def " + symName(tree, name))
|
|
||||||
printTypeParams(tparams); vparamss foreach printValueParams
|
|
||||||
printOpt(": ", tp); printOpt(" = ", rhs)
|
|
||||||
|
|
||||||
case AbsTypeDef(mods, name, lo, hi) =>
|
|
||||||
printModifiers(tree, mods); print("type "); printParam(tree)
|
|
||||||
|
|
||||||
case AliasTypeDef(mods, name, tparams, rhs) =>
|
|
||||||
printAttributes(tree)
|
|
||||||
printModifiers(tree, mods); print("type " + symName(tree, name))
|
|
||||||
printTypeParams(tparams); printOpt(" = ", rhs)
|
|
||||||
|
|
||||||
case LabelDef(name, params, rhs) =>
|
|
||||||
print(symName(tree, name)); printRow(params, "(", ",", ")"); printBlock(rhs)
|
|
||||||
|
|
||||||
case Import(expr, selectors) =>
|
|
||||||
def selectorToString(s: {Name, Name}): String =
|
|
||||||
if (s._1 == nme.WILDCARD || s._1 == s._2) s._1.toString()
|
|
||||||
else s._1.toString() + "=>" + s._2.toString()
|
|
||||||
print("import "); print(expr)
|
|
||||||
print(selectors.map(selectorToString).mkString(".{", ", ", "}"))
|
|
||||||
|
|
||||||
case DocDef(comment, definition) =>
|
|
||||||
print(comment); println; print(definition)
|
|
||||||
|
|
||||||
case Attribute(Apply(Select(New(tpt), nme.CONSTRUCTOR), args), elements) =>
|
|
||||||
print(tpt)
|
|
||||||
if (!args.isEmpty)
|
|
||||||
printRow(args, "(", ",", ")")
|
|
||||||
if (!elements.isEmpty)
|
|
||||||
print((for (val Assign(name, value) <- elements) yield "val " + name + " = " + value).
|
|
||||||
mkString("{", ",", "}"))
|
|
||||||
|
|
||||||
case Template(parents, body) =>
|
|
||||||
printRow(parents, " with ")
|
|
||||||
if (!body.isEmpty) printColumn(body, " {", ";", "}")
|
|
||||||
|
|
||||||
case Block(stats, expr) =>
|
|
||||||
printColumn(stats ::: List(expr), "{", ";", "}")
|
|
||||||
|
|
||||||
case Match(selector, cases) =>
|
|
||||||
print(selector); printColumn(cases, " match {", "", "}")
|
|
||||||
|
|
||||||
case CaseDef(pat, guard, body) =>
|
|
||||||
print("case "); print(pat); printOpt(" if ", guard)
|
|
||||||
print(" => "); print(body)
|
|
||||||
|
|
||||||
case Sequence(trees) =>
|
|
||||||
printRow(trees, "[", ", ", "]")
|
|
||||||
|
|
||||||
case Alternative(trees) =>
|
|
||||||
printRow(trees, "(", "| ", ")")
|
|
||||||
|
|
||||||
case Star(elem) =>
|
|
||||||
print("("); print(elem); print(")*")
|
|
||||||
|
|
||||||
case Bind(name, t) =>
|
|
||||||
print("("); print(symName(tree, name)); print(" @ "); print(t); print(")")
|
|
||||||
|
|
||||||
case UnApply(fun, args) =>
|
|
||||||
print(fun); print(" <unapply> "); printRow(args, "(", ", ", ")")
|
|
||||||
|
|
||||||
case ArrayValue(elemtpt, trees) =>
|
|
||||||
print("Array["); print(elemtpt); printRow(trees, "]{", ", ", "}")
|
|
||||||
|
|
||||||
case Function(vparams, body) =>
|
|
||||||
print("("); printValueParams(vparams); print(" => "); print(body); print(")")
|
|
||||||
|
|
||||||
case Assign(lhs, rhs) =>
|
|
||||||
print(lhs); print(" = "); print(rhs)
|
|
||||||
|
|
||||||
case If(cond, thenp, elsep) =>
|
|
||||||
print("if ("); print(cond); print(")"); indent; println
|
|
||||||
print(thenp); undent
|
|
||||||
if (!elsep.isEmpty) {
|
|
||||||
println; print("else"); indent; println; print(elsep); undent
|
|
||||||
}
|
|
||||||
|
|
||||||
case Return(expr) =>
|
|
||||||
print("return "); print(expr)
|
|
||||||
|
|
||||||
case Try(block, catches, finalizer) =>
|
|
||||||
print("try "); printBlock(block)
|
|
||||||
if (!catches.isEmpty) printColumn(catches, " catch {", "", "}")
|
|
||||||
printOpt(" finally ", finalizer)
|
|
||||||
|
|
||||||
case Throw(expr) =>
|
|
||||||
print("throw "); print(expr)
|
|
||||||
|
|
||||||
case New(tpe) =>
|
|
||||||
print("new "); print(tpe)
|
|
||||||
|
|
||||||
case Typed(expr, tp) =>
|
|
||||||
print("("); print(expr); print(") : "); print(tp)
|
|
||||||
|
|
||||||
case TypeApply(fun, targs) =>
|
|
||||||
print(fun); printRow(targs, "[", ", ", "]")
|
|
||||||
|
|
||||||
case Apply(fun, vargs) =>
|
|
||||||
print(fun); printRow(vargs, "(", ", ", ")")
|
|
||||||
|
|
||||||
case Super(qual, mix) =>
|
|
||||||
if (!qual.isEmpty || tree.symbol != NoSymbol) print(symName(tree, qual) + ".")
|
|
||||||
print("super")
|
|
||||||
if (!mix.isEmpty)
|
|
||||||
print("[" + mix + "]")
|
|
||||||
|
|
||||||
case This(qual) =>
|
|
||||||
if (!qual.isEmpty) print(symName(tree, qual) + ".")
|
|
||||||
print("this")
|
|
||||||
|
|
||||||
case Select(qual @ New(tpe), name) =>
|
|
||||||
print(qual)
|
|
||||||
|
|
||||||
case Select(qualifier, name) =>
|
|
||||||
print(qualifier); print("."); print(symName(tree, name))
|
|
||||||
|
|
||||||
case Ident(name) =>
|
|
||||||
print(symName(tree, name))
|
|
||||||
|
|
||||||
case Literal(x) =>
|
|
||||||
print(x.escapedStringValue)
|
|
||||||
|
|
||||||
case TypeTree() =>
|
|
||||||
print(
|
|
||||||
if (tree.tpe eq null)
|
|
||||||
"<type ?>"
|
|
||||||
else if ((tree.tpe.symbol ne null) && tree.tpe.symbol.isAnonymousClass)
|
|
||||||
tree.tpe.symbol.toString()
|
|
||||||
else
|
|
||||||
tree.tpe.toString()
|
|
||||||
)
|
|
||||||
|
|
||||||
case AttributedTypeTree(attribs, tree) =>
|
|
||||||
for(val attrib <- attribs) {
|
|
||||||
print("[")
|
|
||||||
print(attrib)
|
|
||||||
print("]")
|
|
||||||
}
|
|
||||||
if(!attribs.isEmpty)
|
|
||||||
print(" ")
|
|
||||||
print(tree)
|
|
||||||
|
|
||||||
case Attributed(Apply(Select(New(tpt), nme.CONSTRUCTOR), args), elements, tree) =>
|
|
||||||
print("@"); print(tpt)
|
|
||||||
if (!args.isEmpty)
|
|
||||||
printRow(args, "(", ",", ")")
|
|
||||||
if (!elements.isEmpty)
|
|
||||||
print((for (val Assign(name, value) <- elements) yield "val " + name + " = " + value).
|
|
||||||
mkString("{", ",", "}"))
|
|
||||||
print(" "); print(tree)
|
|
||||||
|
|
||||||
case SingletonTypeTree(ref) =>
|
|
||||||
print(ref); print(".type")
|
|
||||||
|
|
||||||
case SelectFromTypeTree(qualifier, selector) =>
|
|
||||||
print(qualifier); print("#"); print(symName(tree, selector))
|
|
||||||
|
|
||||||
case CompoundTypeTree(templ) =>
|
|
||||||
print(templ)
|
|
||||||
|
|
||||||
case AppliedTypeTree(tp, args) =>
|
|
||||||
print(tp); printRow(args, "[", ", ", "]")
|
|
||||||
|
|
||||||
case WildcardTypeTree(lo, hi) =>
|
|
||||||
print("_ "); printOpt(" >: ", lo); printOpt(" <: ", hi)
|
|
||||||
|
|
||||||
case tree =>
|
|
||||||
print("<unknown tree of class "+tree.getClass+">")
|
|
||||||
}
|
|
||||||
if (global.settings.printtypes.value && tree.isTerm && !tree.isEmpty) {
|
|
||||||
print("{"); print(if (tree.tpe eq null) "<null>" else tree.tpe.toString()); print("}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def print(tree: Tree): unit = {
|
|
||||||
if (settings.Xprintpos.value) print("[" + tree.pos + "]")
|
|
||||||
printRaw(
|
|
||||||
if (tree.isDef && tree.symbol != NoSymbol) {
|
|
||||||
tree match {
|
|
||||||
case ClassDef(_, _, _, _, impl) => ClassDef(tree.symbol, impl)
|
|
||||||
case ModuleDef(_, _, impl) => ModuleDef(tree.symbol, impl)
|
|
||||||
// case ValDef(_, _, _, rhs) => ValDef(tree.symbol, rhs)
|
|
||||||
case DefDef(_, _, _, vparamss, _, rhs) => DefDef(tree.symbol, vparamss, rhs)
|
|
||||||
case AbsTypeDef(_, _, _, _) => AbsTypeDef(tree.symbol)
|
|
||||||
case AliasTypeDef(_, _, _, rhs) => AliasTypeDef(tree.symbol, rhs)
|
|
||||||
case _ => tree
|
|
||||||
}
|
|
||||||
} else tree)
|
|
||||||
}
|
|
||||||
|
|
||||||
def print(unit: CompilationUnit): unit = {
|
|
||||||
print("// Scala source: " + unit.source + LINE_SEPARATOR)
|
|
||||||
if (unit.body ne null) {
|
|
||||||
print(unit.body); println
|
|
||||||
} else {
|
|
||||||
print("<null>")
|
|
||||||
}
|
|
||||||
println; flush
|
|
||||||
}
|
|
||||||
|
|
||||||
def printAll(): unit = {
|
|
||||||
print("[[syntax trees at end of " + phase + "]]")
|
|
||||||
atPhase(phase.next) {
|
|
||||||
for (val unit <- global.currentRun.units) print(unit)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def create(writer: PrintWriter): TreePrinter = new TreePrinter(writer)
|
|
||||||
def create(stream: OutputStream): TreePrinter = create(new PrintWriter(stream))
|
|
||||||
def create(): TreePrinter = {
|
|
||||||
/** A writer that writes to the current Console and
|
|
||||||
* is sensitive to replacement of the Console's
|
|
||||||
* output stream.
|
|
||||||
*/
|
|
||||||
object ConsoleWriter extends Writer {
|
|
||||||
override def write(str: String): unit = Console.print(str)
|
|
||||||
|
|
||||||
def write(cbuf: Array[char], off: int, len: int): unit = {
|
|
||||||
val str = new String(cbuf, off, len)
|
|
||||||
write(str)
|
|
||||||
}
|
|
||||||
|
|
||||||
def close = { /* do nothing */ }
|
|
||||||
def flush = { /* do nothing */ }
|
|
||||||
}
|
|
||||||
create(new PrintWriter(ConsoleWriter))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue