Fixed issue #398

6 files changed, 15 insertions, 24 deletions

diff --git a/.classpath b/.classpath
index 73b2108718..bc0e3f7cda 100644
--- a/.classpath
+++ b/.classpath
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/compiler"/>
-	<classpathentry exported="true" kind="lib" path="build/quick/lib/compiler/"/>
-	<classpathentry exported="true" kind="lib" path="lib/fjbg.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/msil.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jline.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant-contrib.jar"/>
+	<classpathentry kind="lib" path="build/quick/lib/compiler/"/>
+	<classpathentry kind="lib" path="lib/fjbg.jar"/>
+	<classpathentry kind="lib" path="lib/msil.jar"/>
+	<classpathentry kind="lib" path="lib/ant-contrib.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="build/quick/lib/library" sourcepath="src/library"/>
-	<classpathentry exported="true" kind="lib" path="build/quick/lib/actors" sourcepath="src/actors"/>
-	<classpathentry exported="true" kind="lib" path="build/quick/lib/dbc" sourcepath="src/dbc"/>
+	<classpathentry kind="lib" path="build/quick/lib/library" sourcepath="src/library"/>
+	<classpathentry kind="lib" path="lib/jline.jar"/>
 	<classpathentry kind="output" path="build/quick/lib/compiler"/>
 </classpath>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index e0625c8cb1..93e4c359db 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -11,21 +11,10 @@ Bundle-ClassPath: lib/fjbg.jar,
  build/quick/lib/compiler/
 Export-Package: ch.epfl.lamp.fjbg,
  scala,
- scala.actors,
- scala.actors.remote,
  scala.collection,
  scala.collection.jcl,
  scala.collection.immutable,
  scala.collection.mutable,
- scala.dbc,
- scala.dbc.datatype,
- scala.dbc.exception,
- scala.dbc.result,
- scala.dbc.statement,
- scala.dbc.statement.expression,
- scala.dbc.syntax,
- scala.dbc.value,
- scala.dbc.vendor,
  scala.compat,
  scala.concurrent,
  scala.io,
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
index afefd879ad..4a971f0c0a 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -119,9 +119,9 @@ abstract class GenICode extends SubComponent  {
             case Return(_) => ()
             case EmptyTree =>
               error("Concrete method has no definition: " + tree)
-            case _ => /*if (ctx1.bb.isEmpty)
+            case _ => if (ctx1.bb.isEmpty)
               ctx1.bb.emit(RETURN(m.returnType), rhs.pos)
-            else*/
+            else
               ctx1.bb.emit(RETURN(m.returnType))
           }
           ctx1.bb.close
diff --git a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala
index 9ce0dae534..5f9d67dfae 100644
--- a/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala
+++ b/src/compiler/scala/tools/nsc/symtab/AnnotationInfos.scala
@@ -31,6 +31,7 @@ trait AnnotationInfos {
       if (definitions.ArrayModule_apply.alternatives contains meth.symbol) =>
  	trees2consArray(members, tree.tpe)
 
+      case Typed(t, _) => tree2cons(t)
 
       case tree =>
         //println("could not convert: " + tree);
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index f6a2904a45..f1377b4808 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -146,11 +146,14 @@ trait StdNames {
 
     def superName(name: Name) = newTermName("super$" + name)
 
+    val PROTECTED_PREFIX = "protected$"
+    def isProtectedAccessor(name: Name) = name.startsWith(PROTECTED_PREFIX)
+
     /** The name of an accessor for protected symbols. */
-    def protName(name: Name): Name = newTermName("protected$" + name)
+    def protName(name: Name): Name = newTermName(PROTECTED_PREFIX.toString() + name)
 
     /** The name of a setter for protected symbols. Used for inherited Java fields. */
-    def protSetterName(name: Name): Name = newTermName("protected$set" + name)
+    def protSetterName(name: Name): Name = newTermName(PROTECTED_PREFIX.toString() + "set" + name)
 
     /** The name of bitmaps for initialized lazy vals. */
     def bitmapName(n: Int): Name = newTermName("bitmap$" + n)
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 39c16827c8..80279b0c4c 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -139,7 +139,7 @@ abstract class SymbolLoaders {
     def refresh = {
       /** Is the given name a valid input file base name? */
       def isValid(name: String): Boolean =
-        name.length() > 0 && !name.endsWith("$class") && (settings.XO.value ||
+        name.length() > 0 && !name.endsWith("$class") && (/*settings.XO.value*/true ||
           (name.indexOf("$anon") == -1));
 
       val classes  = new HashMap[String, global.classPath0.Context]