diff options
author | Paul Phillips <paulp@improving.org> | 2010-02-25 22:09:37 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-02-25 22:09:37 +0000 |
commit | 1911d4e96a7681d86d4735a63832a04cac0fb7a4 (patch) | |
tree | 4df6d7e42decac10fc6f32be8aebf6ded0b1ab79 /src/compiler | |
parent | 52f85091e1f8dffb6018ab26ef0810065b45ad93 (diff) | |
download | scala-1911d4e96a7681d86d4735a63832a04cac0fb7a4.tar.gz scala-1911d4e96a7681d86d4735a63832a04cac0fb7a4.tar.bz2 scala-1911d4e96a7681d86d4735a63832a04cac0fb7a4.zip |
Added a --bare option to ShowPickled so I can d...
Added a --bare option to ShowPickled so I can diff signatures without
all the explicit indices blowing any points of similarity. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/util/CommandLineParser.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/util/ShowPickled.scala | 56 |
2 files changed, 36 insertions, 22 deletions
diff --git a/src/compiler/scala/tools/nsc/util/CommandLineParser.scala b/src/compiler/scala/tools/nsc/util/CommandLineParser.scala index 20ad376850..d2d46a6c8e 100644 --- a/src/compiler/scala/tools/nsc/util/CommandLineParser.scala +++ b/src/compiler/scala/tools/nsc/util/CommandLineParser.scala @@ -25,6 +25,8 @@ trait ParserUtil extends Parsers { class CommandLine(val args: List[String], val unaryArguments: List[String]) { def this(args: List[String]) = this(args, Nil) + def this(args: Array[String]) = this(args.toList) + def this(args: Array[String], unaryArguments: List[String]) = this(args.toList, unaryArguments) def this(line: String) = this(CommandLineParser tokenize line) def withUnaryArguments(xs: List[String]) = new CommandLine(args, xs) diff --git a/src/compiler/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala index 168c8cb2fc..bc33f2156b 100644 --- a/src/compiler/scala/tools/nsc/util/ShowPickled.scala +++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala @@ -70,21 +70,31 @@ object ShowPickled extends Names { case _ => "***BAD TAG***(" + tag + ")" } - def printFile(buf: PickleBuffer, out: PrintStream) { + def printFile(buf: PickleBuffer, out: PrintStream): Unit = printFile(buf, out, false) + def printFile(buf: PickleBuffer, out: PrintStream, bare: Boolean) { out.println("Version " + buf.readNat() + "." + buf.readNat()) val index = buf.createIndex + /** A print wrapper which discards everything if bare is true. + */ + def p(s: String) = if (!bare) out print s + def printNameRef() { val x = buf.readNat() val savedIndex = buf.readIndex buf.readIndex = index(x) val tag = buf.readByte() val len = buf.readNat() - out.print(" " + x + "(" + newTermName(buf.bytes, buf.readIndex, len) + ")") + val name = newTermName(buf.bytes, buf.readIndex, len) + + val toPrint = if (bare) " " + name else " %s(%s)".format(x, name) + out print toPrint + buf.readIndex = savedIndex } - def printNat() = out.print(" " + buf.readNat()) + def printNat() = p(" " + buf.readNat()) + def printSymbolRef() = printNat() def printTypeRef() = printNat() def printConstantRef() = printNat() @@ -107,12 +117,12 @@ object ShowPickled extends Names { */ def printEntry(i: Int) { buf.readIndex = index(i) - out.print(i + "," + buf.readIndex + ": ") + p(i + "," + buf.readIndex + ": ") val tag = buf.readByte() out.print(tag2string(tag)) val len = buf.readNat() val end = len + buf.readIndex - out.print(" " + len + ":") + p(" " + len + ":") tag match { case TERMname => out.print(" ") @@ -196,26 +206,28 @@ object ShowPickled extends Names { for (i <- 0 until index.length) printEntry(i) } - def fromBytes(what: String, data: => Array[Byte]): Boolean = { - try { - val pickle = new PickleBuffer(data, 0, data.length) - Console.println(what + ": ") - printFile(pickle, Console.out) - true - } - catch { - case _: Exception => false - } - } + def fromFile(path: String) = fromBytes(io.File(path).toByteArray) + def fromName(name: String) = fromBytes(scalaSigBytesForPath(name) getOrElse Array()) + def fromBytes(data: => Array[Byte]): Option[PickleBuffer] = + try Some(new PickleBuffer(data, 0, data.length)) + catch { case _: Exception => None } - def fromFile(path: String) = fromBytes(path, io.File(path).toByteArray) - def fromName(name: String) = fromBytes(name, scalaSigBytesForPath(name) getOrElse Array()) + def show(what: String, pickle: PickleBuffer, bare: Boolean) = { + Console.println(what + ": ") + printFile(pickle, Console.out, bare) + } + /** Option --bare suppresses numbers so the output can be diffed. + */ def main(args: Array[String]) { - args foreach { arg => - val res = fromFile(arg) || fromName(arg) - if (!res) - Console.println("Cannot read " + arg) + val parsed = new CommandLine(args, List("--bare")) + def isBare = parsed isSet "--bare" + + parsed.residualArgs foreach { arg => + (fromFile(arg) orElse fromName(arg)) match { + case Some(pb) => show(arg, pb, isBare) + case _ => Console.println("Cannot read " + arg) + } } } } |