removed unsealedClass in Definitions

improved symlink handling in build.xml

2 files changed, 27 insertions, 33 deletions

diff --git a/build.xml b/build.xml
index 550917ab4b..c4f13052df 100644
--- a/build.xml
+++ b/build.xml
@@ -72,7 +72,7 @@ PROPERTIES
 INITIALISATION
 ============================================================================ -->
 
-  <target name="init" unless="init.avail">
+  <target name="deps">
   <!-- Making sure lib/ contains everything that is needed -->
     <fail message="A required library is missing in 'lib/'. The README file describes what should be there.">
       <condition><not><and>
@@ -91,6 +91,9 @@ INITIALISATION
         <available file="${ant.home}/lib/ant-nodeps.jar"/>
       </and></not></condition>
     </fail>
+  </target>
+
+  <target name="init" depends="deps" unless="init.avail">
   <!-- Making sure enough memory is available -->
     <propertyregex
       property="memory.set" input="${env.ANT_OPTS}" select="\1"
@@ -305,6 +308,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
       <symlink
         link="${build.dir}"
         resource="${build.resource}" overwrite="yes" failonerror="no"/>
+      <touch file="${build.dir}/is_symlink" verbose="no"/>
     </then></if>
     <mkdir dir="${locker.dir}/lib/library"/>
     <javac
@@ -934,6 +938,7 @@ GENERATES A DISTRIBUTION
       <symlink
         link="${dist.dir}"
         resource="${dist.resource}" overwrite="yes" failonerror="no"/>
+      <touch file="${dist.dir}/is_symlink" verbose="no"/>
     </then></if>
     <mkdir dir="${dist.current.dir}"/>
   <!-- Copy all requires libraries -->
@@ -1177,6 +1182,13 @@ CLEAN
   <macrodef name="remove">
     <attribute name="dir"/>
     <sequential>
+      <if>
+        <available file="@{dir}/is_symlink"/>
+      <then>
+        <delete includeemptydirs="true" quiet="yes" failonerror="no">
+          <fileset dir="@{dir}" includes="**/*"/>
+        </delete>
+      </then></if>
       <delete dir="@{dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
     </sequential>
   </macrodef>
@@ -1187,7 +1199,8 @@ CLEAN
     <remove dir="${api.dir}"/>
   </target>
 
-  <target name="clean.build" description="Removes all build products">
+  <target name="clean.build" depends="deps"
+    description="Removes all build products">
     <remove dir="${build.dir}"/>
   </target>
 
@@ -1195,7 +1208,7 @@ CLEAN
     <remove dir="${msil.dir}"/>
   </target>
 
-  <target name="clean.all"
+  <target name="clean.all" depends="deps"
     description="Removes all build products and distributions">
     <remove dir="${build.dir}"/>
     <remove dir="${dist.dir}"/>
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 2be8f7b034..21515a3d57 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -1,5 +1,5 @@
 /* NSC -- new Scala compiler
- * Copyright 2005-2006 LAMP/EPFL
+ * Copyright 2005-2007 LAMP/EPFL
  * @author  Martin Odersky
  */
 // $Id$
@@ -99,15 +99,13 @@ trait Definitions requires SymbolTable {
     //  def MatchError_fail = getMember(MatchErrorModule, nme.fail)
     //  def MatchError_report = getMember(MatchErrorModule, nme.report)
     var IndexOutOfBoundsExceptionClass: Symbol = _
-    //var RemoteExecutionModule: Symbol = _
-    //  def RemoteExecution_detach = getMember(RemoteExecutionModule, "detach")
     var ScalaRunTimeModule: Symbol = _
       def SeqFactory = getMember(ScalaRunTimeModule, nme.Seq);
       def checkDefinedMethod = getMember(ScalaRunTimeModule, "checkDefined")
       def isArrayMethod = getMember(ScalaRunTimeModule, "isArray")
     var RepeatedParamClass: Symbol = _
     var ByNameParamClass: Symbol = _
-    var UnsealedClass: Symbol = _
+    //var UnsealedClass: Symbol = _
     var UncheckedClass: Symbol = _
 
     val MaxTupleArity = 22
@@ -115,7 +113,7 @@ trait Definitions requires SymbolTable {
       def tupleField(n: Int, j: Int) = getMember(TupleClass(n), "_" + j)
       def isTupleType(tp: Type): Boolean = tp match {
         case TypeRef(_, sym, elems) =>
-          elems.length <= MaxTupleArity && sym == TupleClass(elems.length);
+          elems.length <= MaxTupleArity && sym == TupleClass(elems.length)
         case _ =>
           false
       }
@@ -133,7 +131,7 @@ trait Definitions requires SymbolTable {
     /** returns true if this type is exactly ProductN[T1,...,Tn], not some subclass */
       def isExactProductType(tp: Type): Boolean = tp match {
         case TypeRef(_, sym, elems) =>
-          elems.length <= MaxProductArity && sym == ProductClass(elems.length);
+          elems.length <= MaxProductArity && sym == ProductClass(elems.length)
         case _ =>
           false
       }
@@ -283,22 +281,22 @@ trait Definitions requires SymbolTable {
       }
 
     def isCorrespondingDelegate(delegateType: Type, functionType: Type): boolean = {
-      var isCD: Boolean = false;
+      var isCD: Boolean = false
       if (DelegateClass != null && delegateType != null &&
 	  isSubType(delegateType, DelegateClass.tpe))
 	{
 	  val meth: Symbol = delegateType.member(nme.apply)
 	  meth.tpe match {
 	    case MethodType(delegateParams, delegateReturn) =>
-	      val delegateParamsO = delegateParams.map(pt => {if (pt == definitions.AnyClass.tpe) definitions.ObjectClass.tpe else pt});
-	      if(isFunctionType(functionType))
+	      val delegateParamsO = delegateParams.map(pt => {if (pt == definitions.AnyClass.tpe) definitions.ObjectClass.tpe else pt})
+	      if (isFunctionType(functionType))
 		functionType match {
 		  case TypeRef(_, _, args) =>
-		    if(delegateParamsO == args.dropRight(1) &&
-		       delegateReturn == args.last)
+		    if (delegateParamsO == args.dropRight(1) &&
+		        delegateReturn == args.last)
 		      isCD = true;
 
-		  case _ => ();
+		  case _ => ()
 		}
 
 	    case _ => ()
@@ -307,21 +305,6 @@ trait Definitions requires SymbolTable {
       isCD
     }
 
-/*    val RemoteFunctionClass: Array[Symbol] = new Array(MaxFunctionArity + 1)
-      def remoteFunctionApply(n: Int) = getMember(RemoteFunctionClass(n), nme.apply)
-      def remoteFunctionType(formals: List[Type], restpe: Type) =
-        if (formals.length <= MaxFunctionArity) {
-          val sym = RemoteFunctionClass(formals.length)
-          typeRef(sym.typeConstructor.prefix, sym, formals ::: List(restpe))
-        } else NoType;
-      def isRemoteFunctionType(tp: Type): boolean = tp match {
-        case TypeRef(_, sym, args) =>
-          (args.length > 0) && (args.length - 1 <= MaxFunctionArity) &&
-          (sym == RemoteFunctionClass(args.length - 1))
-        case _ =>
-          false
-      }
-*/
     def seqType(arg: Type) =
       typeRef(SeqClass.typeConstructor.prefix, SeqClass, List(arg))
 
@@ -798,7 +781,6 @@ trait Definitions requires SymbolTable {
       IndexOutOfBoundsExceptionClass =
         getClass(if (forMSIL) "System.IndexOutOfRangeException"
                  else "java.lang.IndexOutOfBoundsException")
-      //RemoteExecutionModule = getModule("scala.distributed.RemoteExecution")
       ScalaRunTimeModule = getModule("scala.runtime.ScalaRunTime")
       RepeatedParamClass = newCovariantPolyClass(
         ScalaPackageClass, nme.REPEATED_PARAM_CLASS_NAME,
@@ -806,7 +788,7 @@ trait Definitions requires SymbolTable {
       ByNameParamClass = newCovariantPolyClass(
         ScalaPackageClass, nme.BYNAME_PARAM_CLASS_NAME, tparam => AnyClass.typeConstructor)
       /* <unapply> */
-      UnsealedClass = getClass("scala.unsealed") //todo: remove once 2.4 is out.
+      //UnsealedClass = getClass("scala.unsealed") //todo: remove once 2.4 is out.
       UncheckedClass = getClass("scala.unchecked")
       OptionClass = getClass("scala.Option")
 
@@ -819,7 +801,6 @@ trait Definitions requires SymbolTable {
       /* </unapply> */
       for (val i <- 0 to MaxFunctionArity) {
         FunctionClass(i) = getClass("scala.Function" + i)
-        //RemoteFunctionClass(i) = getClass("scala.distributed.RemoteFunction" + i)
       }
       initValueClasses