summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-06-07 21:07:38 +0000
committerMartin Odersky <odersky@gmail.com>2006-06-07 21:07:38 +0000
commit52f4d886518e4cd45438d8341b018b3397606732 (patch)
tree25a8b9dcec734baf079111186902f52924a97eee /src/compiler
parenta93415ff6555e4256fdc2e5e9e5cfda7f03179c7 (diff)
downloadscala-52f4d886518e4cd45438d8341b018b3397606732.tar.gz
scala-52f4d886518e4cd45438d8341b018b3397606732.tar.bz2
scala-52f4d886518e4cd45438d8341b018b3397606732.zip
Fixed two bugs that I noted.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala2
-rw-r--r--src/compiler/scala/tools/nsc/transform/Constructors.scala3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 1d64ad6026..de8af15695 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -59,7 +59,7 @@ abstract class SymbolLoaders {
setSource(root.linkedModule.moduleClass, sourceFile0);
setSource(root.linkedClass, sourceFile0);
*/
- } else error(source + " does not define " + root)
+ } else throw new TypeError(source + " does not define " + root)
} catch {
case ex: IOException =>
ok = false;
diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala
index 8839a3f27b..16b2a7dbb5 100644
--- a/src/compiler/scala/tools/nsc/transform/Constructors.scala
+++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala
@@ -61,6 +61,9 @@ abstract class Constructors extends Transform {
case Select(This(_), _)
if ((tree.symbol hasFlag PARAMACCESSOR) && tree.symbol.owner == clazz) =>
gen.mkAttributedIdent(parameter(tree.symbol)) setPos tree.pos
+ case Select(_, _) =>
+ thisRefSeen = true;
+ super.transform(tree)
case This(_) =>
thisRefSeen = true;
super.transform(tree)