Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

Author: retronym

.gitignore

@@ -39,9 +39,9 @@
 # eclipse, intellij
 /.classpath
 /.project
-/src/intellij/*.iml
-/src/intellij/*.ipr
-/src/intellij/*.iws
+/src/intellij*/*.iml
+/src/intellij*/*.ipr
+/src/intellij*/*.iws
 **/.cache
 /.idea
 /.settings

bincompat-backward.whitelist.conf

@@ -207,6 +207,16 @@ filter {
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$4"
         problemName=MissingMethodProblem
+    },
+    // SI-8946
+    {
+        matchName="scala.reflect.runtime.ThreadLocalStorage#MyThreadLocalStorage.values"
+        problemName=MissingMethodProblem
+    },
+    // the below method was the unused private (sic!) method but the compatibility checker was complaining about it
+    {
+        matchName="scala.reflect.io.ZipArchive.scala$reflect$io$ZipArchive$$walkIterator"
+        problemName=MissingMethodProblem
     }
   ]
 }

bincompat-forward.whitelist.conf

@@ -389,6 +389,28 @@ filter {
     {
         matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$2"
         problemName=MissingMethodProblem
+    },
+    // changes needed by ZipArchiveFileLookup (the flat classpath representation)
+    {
+        matchName="scala.reflect.io.FileZipArchive.allDirs"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.io.FileZipArchive.root"
+        problemName=MissingMethodProblem
+    },
+    // introduced the harmless method (instead of the repeated code in several places)
+    {
+        matchName="scala.reflect.runtime.Settings#MultiStringSetting.valueSetByUser"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.runtime.Settings#BooleanSetting.valueSetByUser"
+        problemName=MissingMethodProblem
+    },
+    {
+        matchName="scala.reflect.runtime.Settings#IntSetting.valueSetByUser"
+        problemName=MissingMethodProblem
     }
   ]
 }

build.xml

@@ -272,28 +272,36 @@ TODO:
       </artifact:dependencies>
 
       <!-- JUnit -->
-      <property name="junit.version" value="4.10"/>
+      <property name="junit.version" value="4.11"/>
       <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
       </artifact:dependencies>
       <copy-deps project="junit"/>
 
       <!-- Pax runner -->
-      <property name="pax.exam.version" value="2.6.0"/>
+      <property name="pax.exam.version" value="3.5.0"/><!-- Last version which supports Java 6 -->
+      <property name="osgi.felix.version" value="4.0.3"/>
+      <property name="osgi.equinox.version" value="3.7.1"/>
       <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
-        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
+        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}">
+          <exclusion groupId="org.osgi" artifactId="org.osgi.core"/><!-- Avoid dragging in a dependency which requires Java >6 -->
+        </dependency>
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
-        <!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
-      https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
-        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
-        <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
-        <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
-        <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
+        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="2.2.0"/>
+        <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-tracker" version="1.8.0"/>
+        <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/>
+        <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/>
         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
-        <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
       </artifact:dependencies>
 
+      <artifact:dependencies pathId="osgi.framework.felix">
+        <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="${osgi.felix.version}"/>
+      </artifact:dependencies>
+
+      <artifact:dependencies pathId="osgi.framework.equinox">
+        <dependency groupId="org.eclipse.osgi" artifactId="org.eclipse.osgi" version="${osgi.equinox.version}"/>
+      </artifact:dependencies>
 
       <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
       <artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/>
@@ -840,8 +848,7 @@ TODO:
     -->
 
     <path id="pack.reflect.files">    <fileset dir="${build-quick.dir}/classes/reflect"/> </path>
-    <path id="pack.scalap.files">     <fileset dir="${build-quick.dir}/classes/scalap"/>
-                                      <fileset file="${src.dir}/scalap/decoder.properties"/> </path>
+    <path id="pack.scalap.files">     <fileset dir="${build-quick.dir}/classes/scalap"/>  </path>
 
     <path id="pack.partest-extras.files"> <fileset dir="${build-quick.dir}/classes/partest-extras"/> </path>
     <path id="pack.partest-javaagent.files"> <fileset dir="${build-quick.dir}/classes/partest-javaagent"/> </path>
@@ -984,6 +991,16 @@ TODO:
       <path refid="forkjoin.classpath"/>
     </path>
 
+    <path id="test.osgi.compiler.build.path.felix">
+      <path refid="test.osgi.compiler.build.path"/>
+      <path refid="osgi.framework.felix"/>
+    </path>
+
+    <path id="test.osgi.compiler.build.path.equinox">
+      <path refid="test.osgi.compiler.build.path"/>
+      <path refid="osgi.framework.equinox"/>
+    </path>
+
     <path id="test.positions.sub.build.path" path="${build-quick.dir}/classes/library"/>
 
     <!-- TODO: consolidate *.includes -->
@@ -1351,7 +1368,7 @@ TODO:
       srcdir="${test.osgi.src}"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
-      <compilationpath refid="test.osgi.compiler.build.path"/>
+      <compilationpath refid="test.osgi.compiler.build.path.felix"/>
     </scalacfork>
     <touch file="${build-osgi.dir}/test-compile.complete" verbose="no"/>
     <stopwatch name="test.osgi.compiler.timer" action="total"/>
@@ -1365,8 +1382,22 @@ TODO:
       <stopwatch name="test.osgi.timer"/>
       <mkdir dir="${test.osgi.classes}"/>
 
+      <echo message="Test pass 1 of 2 using Apache Felix ${osgi.felix.version}"/>
+      <junit fork="yes" haltonfailure="yes">
+        <classpath refid="test.osgi.compiler.build.path.felix"/>
+        <jvmarg value="-Duser.home=${user.home}"/>
+        <batchtest fork="yes" todir="${build-osgi.dir}">
+          <fileset dir="${test.osgi.classes}">
+            <include name="**/*Test.class"/>
+          </fileset>
+        </batchtest>
+        <formatter type="xml" />
+      </junit>
+
+      <echo message="Test pass 2 of 2 using Eclipse Equinox ${osgi.equinox.version}"/>
       <junit fork="yes" haltonfailure="yes">
-        <classpath refid="test.osgi.compiler.build.path"/>
+        <classpath refid="test.osgi.compiler.build.path.equinox"/>
+        <jvmarg value="-Duser.home=${user.home}"/>
         <batchtest fork="yes" todir="${build-osgi.dir}">
           <fileset dir="${test.osgi.classes}">
             <include name="**/*Test.class"/>

docs/development/scala.tools.nsc/zipfile-bug.txt

@@ -323,14 +323,12 @@ Literal  ::=  [‘-’] integerLiteral
 ### Integer Literals
 
 ```ebnf
-integerLiteral  ::=  (decimalNumeral | hexNumeral | octalNumeral)
+integerLiteral  ::=  (decimalNumeral | hexNumeral)
                        [‘L’ | ‘l’]
 decimalNumeral  ::=  ‘0’ | nonZeroDigit {digit}
-hexNumeral      ::=  ‘0’ ‘x’ hexDigit {hexDigit}
-octalNumeral    ::=  ‘0’ octalDigit {octalDigit}
+hexNumeral      ::=  ‘0’ (‘x’ | ‘X’) hexDigit {hexDigit}
 digit           ::=  ‘0’ | nonZeroDigit
 nonZeroDigit    ::=  ‘1’ | … | ‘9’
-octalDigit      ::=  ‘0’ | … | ‘7’
 ```
 
 Integer literals are usually of type `Int`, or of type

spec/01-lexical-syntax.md

@@ -41,7 +41,7 @@ idrest           ::=  {letter | digit} [‘_’ op]
 
 integerLiteral   ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
 decimalNumeral   ::=  ‘0’ | nonZeroDigit {digit}
-hexNumeral       ::=  ‘0’ ‘x’ hexDigit {hexDigit}
+hexNumeral       ::=  ‘0’ (‘x’ | ‘X’) hexDigit {hexDigit}
 digit            ::=  ‘0’ | nonZeroDigit
 nonZeroDigit     ::=  ‘1’ | … | ‘9’
 
@@ -210,7 +210,7 @@ grammar.
   ClassParams       ::=  ClassParam {‘,’ ClassParam}
   ClassParam        ::=  {Annotation} {Modifier} [(`val' | `var')]
                          id ‘:’ ParamType [‘=’ Expr]
-  Bindings          ::=  ‘(’ Binding {‘,’ Binding ‘)’
+  Bindings          ::=  ‘(’ Binding {‘,’ Binding} ‘)’
   Binding           ::=  (id | ‘_’) [‘:’ Type]
 
   Modifier          ::=  LocalModifier

spec/13-syntax-summary.md

@@ -6,6 +6,8 @@ layout: toc
 # The Scala Language Specification
 # Version 2.11
 
+### Maintained online at [https://github.com/scala/scala/tree/2.11.x/spec](https://github.com/scala/scala/tree/2.11.x/spec)
+
 ### Martin Odersky, Philippe Altherr, Vincent Cremet, Gilles Dubochet, Burak Emir, Philipp Haller, Stéphane Micheloud, Nikolay Mihaylov, Adriaan Moors, Lukas Rytz, Michel Schinz, Erik Stenman, Matthias Zenger
 
 ### Markdown Conversion by Iain McGinniss.

spec/index.md

@@ -12,7 +12,7 @@ abstract class DefaultMacroCompiler extends Resolvers
   import treeInfo._
   import definitions._
   val runDefinitions = currentRun.runDefinitions
-  import runDefinitions.{Predef_???, _}
+  import runDefinitions.Predef_???
 
   val typer: global.analyzer.Typer
   val context = typer.context

src/compiler/scala/reflect/macros/compiler/DefaultMacroCompiler.scala

@@ -11,7 +11,6 @@ trait Errors extends Traces {
   import analyzer._
   import definitions._
   import treeInfo._
-  import typer.TyperErrorGen._
   import typer.infer.InferErrorGen._
   import runDefinitions._
   def globalSettings = global.settings

src/compiler/scala/reflect/macros/compiler/Errors.scala

@@ -1,18 +1,12 @@
 package scala.reflect.macros
 package compiler
 
-import scala.reflect.internal.Flags._
-import scala.reflect.macros.TypecheckException
-
 trait Resolvers {
   self: DefaultMacroCompiler =>
 
   import global._
   import analyzer._
-  import definitions._
   import treeInfo._
-  import gen._
-  import runDefinitions._
 
   trait Resolver {
     self: MacroImplRefCompiler =>

src/compiler/scala/reflect/macros/compiler/Resolvers.scala

@@ -9,7 +9,7 @@ trait Validators {
   import global._
   import analyzer._
   import definitions._
-  import runDefinitions.{Predef_???, _}
+  import runDefinitions.Predef_???
 
   trait Validator {
     self: MacroImplRefCompiler =>

src/compiler/scala/reflect/macros/compiler/Validators.scala

@@ -12,5 +12,5 @@ trait Infrastructure {
 
   def compilerSettings: List[String] = universe.settings.recreateArgs
 
-  def classPath: List[java.net.URL] = global.classPath.asURLs
+  def classPath: List[java.net.URL] = global.classPath.asURLs.toList
 }

src/compiler/scala/reflect/macros/contexts/Infrastructure.scala

@@ -54,14 +54,10 @@ trait Helpers {
    *
    *  @see Metalevels.scala for more information and examples about metalevels
    */
-  def increaseMetalevel(pre: Type, tp: Type): Type = {
-    val runDefinitions = currentRun.runDefinitions
-    import runDefinitions._
-
+  def increaseMetalevel(pre: Type, tp: Type): Type =
     transparentShallowTransform(RepeatedParamClass, tp) {
       case tp => typeRef(pre, MacroContextExprClass, List(tp))
     }
-  }
 
   /** Transforms c.Expr[T] types into c.Tree and leaves the rest unchanged.
    */

src/compiler/scala/reflect/macros/util/Helpers.scala

@@ -90,7 +90,7 @@ trait Parsers { self: Quasiquotes =>
           case _ => super.makePatDef(mods, pat, rhs)
         }
       }
-      import treeBuilder.{global => _, unit => _, _}
+      import treeBuilder.{global => _, unit => _}
 
       // q"def foo($x)"
       override def param(owner: Name, implicitmod: Int, caseParam: Boolean): ValDef =

src/compiler/scala/reflect/quasiquotes/Parsers.scala

@@ -8,7 +8,6 @@ import scala.reflect.internal.Flags._
 trait Reifiers { self: Quasiquotes =>
   import global._
   import global.build._
-  import global.treeInfo._
   import global.definitions._
   import Rank._
   import universeTypes._

src/compiler/scala/reflect/quasiquotes/Reifiers.scala

@@ -21,7 +21,6 @@ abstract class Reifier extends States
   import global._
   import definitions._
   private val runDefinitions = currentRun.runDefinitions
-  import runDefinitions._
 
   val typer: global.analyzer.Typer
   val universe: Tree