aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-03-01 14:46:42 +0100
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-18 11:14:12 +0100
commita543ed10445f2d4d61a61cd333fa9273c3a32ea0 (patch)
treeb089c96d2f5d3a5a7cdc0a59f995d52db54b672d /src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala
parentdd5be327395cb4a6380467e5e7c85cc0d7a5e70d (diff)
downloaddotty-a543ed10445f2d4d61a61cd333fa9273c3a32ea0.tar.gz
dotty-a543ed10445f2d4d61a61cd333fa9273c3a32ea0.tar.bz2
dotty-a543ed10445f2d4d61a61cd333fa9273c3a32ea0.zip
Bugfixes in unpickling
- better diagnostics, avoid try-finally-assert, because that masks errors. - handle paths as terms correctly. - need to set flags wholesale from pickling, not just add to them. - fix pickling of refined types and skolem types. - dealias type aliases representing parameter instantiations before pickling, so that we do not refer to as-yet-undefined symbols.
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala')
-rw-r--r--src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala b/src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala
index 596b7542d..b67244e3b 100644
--- a/src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala
+++ b/src/dotty/tools/dotc/core/pickling/TastyUnpickler.scala
@@ -41,7 +41,7 @@ class TastyUnpickler(reader: TastyReader) {
val end = start + length
val result = tag match {
case UTF8 =>
- skipTo(end)
+ goto(end)
Simple(termName(bytes, start.index, length))
case QUALIFIED =>
Qualified(readNameRef(), readNameRef())
@@ -83,7 +83,7 @@ class TastyUnpickler(reader: TastyReader) {
val secName = readString()
val secEnd = readEnd()
sectionReader(secName) = new TastyReader(bytes, currentAddr.index, secEnd.index, currentAddr.index)
- skipTo(secEnd)
+ goto(secEnd)
}
}