summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2005-11-15 15:39:40 +0000
committerIulian Dragos <jaguarul@gmail.com>2005-11-15 15:39:40 +0000
commit161eca252623ccba6c1cb3a6b3a88e2693a1e7fb (patch)
tree1ade1764a4dcc4dcfd846ab4341d86358eab0aee /sources
parent0beee8af0cfcc3295a7f2a66cbf615eec2fc2039 (diff)
downloadscala-161eca252623ccba6c1cb3a6b3a88e2693a1e7fb.tar.gz
scala-161eca252623ccba6c1cb3a6b3a88e2693a1e7fb.tar.bz2
scala-161eca252623ccba6c1cb3a6b3a88e2693a1e7fb.zip
Fixed deferred flag on module accessors.
Diffstat (limited to 'sources')
-rwxr-xr-xsources/scala/tools/nsc/Global.scala4
-rwxr-xr-xsources/scala/tools/nsc/transform/Mixin.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala
index 702a194ae0..9d0704b83c 100755
--- a/sources/scala/tools/nsc/Global.scala
+++ b/sources/scala/tools/nsc/Global.scala
@@ -266,10 +266,10 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
lambdaLift,
flatten,
constructors,
- mixin /*,
+ mixin,
genicode,
genJVM,
- sampleTransform */);
+ sampleTransform);
private var curRun: Run = NoRun;
override def currentRun: Run = curRun;
diff --git a/sources/scala/tools/nsc/transform/Mixin.scala b/sources/scala/tools/nsc/transform/Mixin.scala
index 8bc4100806..46b2796fad 100755
--- a/sources/scala/tools/nsc/transform/Mixin.scala
+++ b/sources/scala/tools/nsc/transform/Mixin.scala
@@ -136,7 +136,7 @@ abstract class Mixin extends InfoTransform {
val alias1 = rebindSuper(clazz, member.alias, mixin);
member1.asInstanceOf[TermSymbol] setAlias alias1;
} else if (member.isMethod && member.isModule && !(member hasFlag (LIFTED | BRIDGE))) {
- addMember(clazz, member.cloneSymbol(clazz) setFlag MIXEDIN)
+ addMember(clazz, member.cloneSymbol(clazz) setFlag MIXEDIN resetFlag (DEFERRED | lateDEFERRED))
}
}
}