From b0c36c7a7c646caf95c7cda4a91681d243a0508d Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Tue, 24 Jun 2008 12:45:25 +0000
Subject: lazy vals cannot override strict vals and vice ...

lazy vals cannot override strict vals and vice versa; fixed
initialization bugs that caused scala and fsc to fail.
---
 src/compiler/scala/tools/nsc/CompileClient.scala         | 6 ++----
 src/compiler/scala/tools/nsc/GenericRunnerCommand.scala  | 2 ++
 src/compiler/scala/tools/nsc/Global.scala                | 6 +++---
 src/compiler/scala/tools/nsc/IdeSupport.scala            | 5 +++--
 src/compiler/scala/tools/nsc/InterpreterCommand.scala    | 2 +-
 src/compiler/scala/tools/nsc/typechecker/Namers.scala    | 2 ++
 src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 9 ++++++---
 src/compiler/scala/tools/nsc/typechecker/Typers.scala    | 3 ++-
 8 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'src/compiler')

diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index 0a3e47f8e9..6bac62aefd 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -8,8 +8,6 @@ package scala.tools.nsc
 
 import java.io.{BufferedReader, File, InputStreamReader, PrintWriter}
 
-import scala.tools.util.StringOps
-
 /** The client part of the fsc offline compiler.  Instead of compiling
  *  things itself, it send requests to a CompileServer.
  */
@@ -39,12 +37,12 @@ class StandardCompileClient {
   val fileEnding = Properties.fileEndingString
 
   protected def normalize(args: Array[String]): (String, String) = {
-    var i = 0
+     var i = 0
     val vmArgs = new StringBuilder
     var serverAdr = ""
     while (i < args.length) {
       val arg = args(i)
-      if (arg endsWith fileEnding) {
+      if (fileEnding split ("\\|") exists (arg endsWith _)) {
         args(i) = absFileName(arg)
       } else if (arg startsWith "-J") {
         //see http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/javac.html#J
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
index 520d1b6055..094b2b4d1f 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
@@ -50,6 +50,8 @@ extends CompilerCommand(allargs, settings, error, false)
     }
   }
 
+  processArguments()
+
   override def usageMsg = {
     cmdName + " [ <option> ]... [<torun> <arguments>]\n" +
     "\n" +
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 62836bc91c..fb346899cb 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -225,9 +225,9 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
     getSourceFile(ret.sourceFile)
   }
 
-  val loaders : SymbolLoaders { val global : Global.this.type } = new SymbolLoaders {//change?
-    lazy val global: Global.this.type = Global.this
-  }
+  lazy val loaders : SymbolLoaders { val global : Global.this.type } = new {
+    val global: Global.this.type = Global.this
+  } with SymbolLoaders
 
   def rootLoader: LazyType =
     if (forMSIL) new loaders.NamespaceLoader(classPath.root)
diff --git a/src/compiler/scala/tools/nsc/IdeSupport.scala b/src/compiler/scala/tools/nsc/IdeSupport.scala
index ac80997f18..2f68ee5d01 100644
--- a/src/compiler/scala/tools/nsc/IdeSupport.scala
+++ b/src/compiler/scala/tools/nsc/IdeSupport.scala
@@ -23,8 +23,9 @@ trait IdeSupport extends Global with symtab.IdeSupport {
     normalCompile(run.compileSources(source :: Nil))
     run.units.find(unit => unit.source == source)
   }
-  object loaders1 extends scala.tools.nsc.symtab.SymbolLoaders {
-    lazy val global : IdeSupport.this.type = IdeSupport.this
+  object loaders1 extends {
+    val global : IdeSupport.this.type = IdeSupport.this
+  } with scala.tools.nsc.symtab.SymbolLoaders {
     import global._
     protected override def completeClassfile(root : global.Symbol, loader : ClassfileLoader)(f : => Unit) : Unit =
       global.normalCompile(f)
diff --git a/src/compiler/scala/tools/nsc/InterpreterCommand.scala b/src/compiler/scala/tools/nsc/InterpreterCommand.scala
index 8f9a104a9e..036e640c88 100644
--- a/src/compiler/scala/tools/nsc/InterpreterCommand.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterCommand.scala
@@ -14,5 +14,5 @@ package scala.tools.nsc
 class InterpreterCommand(arguments: List[String], error: String => Unit)
 extends CompilerCommand(arguments, new Settings(error), error, false) {
   override val cmdName = "scala"
-  override val fileEnding = ".scalaint"
+  override lazy val fileEnding = ".scalaint"
 }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index caaecc1b90..ac35ecc052 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -982,6 +982,8 @@ trait Namers { self: Analyzer =>
         context.error(sym.pos, "`override' modifier not allowed for constructors")
       if (sym.hasFlag(ABSOVERRIDE) && !sym.owner.isTrait)
         context.error(sym.pos, "`abstract override' modifier only allowed for members of traits")
+      if (sym.hasFlag(LAZY) && sym.hasFlag(PRESUPER))
+        context.error(sym.pos, "`lazy' definitions may not be initialized early")
       if (sym.info.typeSymbol == FunctionClass(0) &&
           sym.isValueParameter && sym.owner.isClass && sym.owner.hasFlag(CASE))
         context.error(sym.pos, "pass-by-name arguments not allowed for case class parameters");
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index 0e2227e3ed..26e584e2e4 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -186,9 +186,12 @@ abstract class RefChecks extends InfoTransform {
           overrideError("cannot override a mutable variable")
         } else if (other.isStable && !member.isStable) { // (1.4)
           overrideError("needs to be an immutable value")
-//        } else if (other.isStable && !other.isDeferred && other.owner.isTrait && (member hasFlag OVERRIDE)) {
-//          overrideError("cannot override a value or variable definition in a trait " +
-//                        "\n (this is an implementation restriction)")
+        } else if (member.isValue && (member hasFlag LAZY) &&
+                   other.isValue && !other.isSourceMethod && !other.isDeferred && !(other hasFlag LAZY)) {
+          overrideError("cannot override a concrete non-lazy value")
+        } else if (other.isValue && (other hasFlag LAZY) && !other.isSourceMethod && !other.isDeferred &&
+                   member.isValue && !(member hasFlag LAZY)) {
+          overrideError("must be declared lazy to override a concrete lazy value")
         } else {
           if (other.isAliasType) {
             //if (!member.typeParams.isEmpty) // (1.5)  @MAT
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 2740d8944d..5d61928388 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -331,7 +331,8 @@ trait Typers { self: Analyzer =>
     }
 
     def checkRegPatOK(pos: Position, mode: Int) =
-      if ((mode & REGPATmode) == 0)
+      if ((mode & REGPATmode) == 0 &&
+          phase.id <= currentRun.typerPhase.id) // fixes t1059
         error(pos, "no regular expression pattern allowed here\n"+
               "(regular expression patterns are only allowed in arguments to *-parameters)")
 
-- 
cgit v1.2.3