diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 02:36:10 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:32:28 +0200 |
| commit | 0b2f1bcf75d31c59b25e19eebcb80f39c155365b (patch) | |
| tree | 8d9dfc50ef01ca48c068b232af7e67a723325388 | |
| parent | 13213e3df0384b1fd815c0798758a22284572cdb (diff) | |
| download | scala-0b2f1bcf75d31c59b25e19eebcb80f39c155365b.tar.gz scala-0b2f1bcf75d31c59b25e19eebcb80f39c155365b.tar.bz2 scala-0b2f1bcf75d31c59b25e19eebcb80f39c155365b.zip | |
Introduces scala-reflect.jar
| -rw-r--r-- | build.xml | 234 | ||||
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-reflect.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 3 | ||||
| -rw-r--r-- | src/build/maven/scala-compiler-pom.xml | 5 | ||||
| -rw-r--r-- | src/build/maven/scala-reflect-pom.xml | 62 | ||||
| -rw-r--r-- | src/build/pack.xml | 3 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 11 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/AntRunner.scala | 1 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleFileManager.scala | 17 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 3 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 1 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/NestUI.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ReflectiveRunner.scala | 4 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/SBTRunner.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/AnnotationInfos.scala (renamed from src/library/scala/reflect/api/AnnotationInfos.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/Constants.scala (renamed from src/library/scala/reflect/api/Constants.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Exprs.scala (renamed from src/library/scala/reflect/api/Exprs.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/FlagSets.scala (renamed from src/library/scala/reflect/api/FlagSets.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/FrontEnds.scala (renamed from src/library/scala/reflect/api/FrontEnds.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Importers.scala (renamed from src/library/scala/reflect/api/Importers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/JavaUniverse.scala (renamed from src/compiler/scala/reflect/api/JavaUniverse.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Mirrors.scala (renamed from src/library/scala/reflect/api/Mirrors.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/Names.scala (renamed from src/library/scala/reflect/api/Names.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Positions.scala (renamed from src/library/scala/reflect/api/Positions.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/StandardDefinitions.scala (renamed from src/library/scala/reflect/api/StandardDefinitions.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/StandardNames.scala (renamed from src/library/scala/reflect/api/StandardNames.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/Symbols.scala (renamed from src/library/scala/reflect/api/Symbols.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/TagInterop.scala (renamed from src/compiler/scala/reflect/api/TagInterop.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/TreePrinters.scala (renamed from src/library/scala/reflect/api/TreePrinters.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Trees.scala (renamed from src/library/scala/reflect/api/Trees.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/Types.scala (renamed from src/library/scala/reflect/api/Types.scala) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/reflect/scala/reflect/api/Universe.scala (renamed from src/library/scala/reflect/api/Universe.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/package.scala (renamed from src/library/scala/reflect/api/package.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/AbstractFileApi.scala (renamed from src/compiler/scala/reflect/internal/AbstractFileApi.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/AnnotationCheckers.scala (renamed from src/compiler/scala/reflect/internal/AnnotationCheckers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/AnnotationInfos.scala (renamed from src/compiler/scala/reflect/internal/AnnotationInfos.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/BaseTypeSeqs.scala (renamed from src/compiler/scala/reflect/internal/BaseTypeSeqs.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/BuildUtils.scala (renamed from src/compiler/scala/reflect/internal/BuildUtils.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/CapturedVariables.scala (renamed from src/compiler/scala/reflect/internal/CapturedVariables.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Chars.scala (renamed from src/compiler/scala/reflect/internal/Chars.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/ClassfileConstants.scala (renamed from src/compiler/scala/reflect/internal/ClassfileConstants.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Constants.scala (renamed from src/compiler/scala/reflect/internal/Constants.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala (renamed from src/compiler/scala/reflect/internal/Definitions.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala (renamed from src/compiler/scala/reflect/internal/ExistentialsAndSkolems.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/FatalError.scala (renamed from src/compiler/scala/reflect/internal/FatalError.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/FlagSets.scala (renamed from src/compiler/scala/reflect/internal/FlagSets.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Flags.scala (renamed from src/compiler/scala/reflect/internal/Flags.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/HasFlags.scala (renamed from src/compiler/scala/reflect/internal/HasFlags.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Importers.scala (renamed from src/compiler/scala/reflect/internal/Importers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/InfoTransformers.scala (renamed from src/compiler/scala/reflect/internal/InfoTransformers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Kinds.scala (renamed from src/compiler/scala/reflect/internal/Kinds.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Mirrors.scala (renamed from src/compiler/scala/reflect/internal/Mirrors.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/MissingRequirementError.scala (renamed from src/compiler/scala/reflect/internal/MissingRequirementError.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Names.scala (renamed from src/compiler/scala/reflect/internal/Names.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Phase.scala (renamed from src/compiler/scala/reflect/internal/Phase.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Positions.scala (renamed from src/compiler/scala/reflect/internal/Positions.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Required.scala (renamed from src/compiler/scala/reflect/internal/Required.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Scopes.scala (renamed from src/compiler/scala/reflect/internal/Scopes.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdAttachments.scala (renamed from src/compiler/scala/reflect/internal/StdAttachments.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdCreators.scala (renamed from src/compiler/scala/reflect/internal/StdCreators.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdNames.scala (renamed from src/compiler/scala/reflect/internal/StdNames.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/SymbolTable.scala (renamed from src/compiler/scala/reflect/internal/SymbolTable.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala (renamed from src/compiler/scala/reflect/internal/Symbols.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/TreeGen.scala (renamed from src/compiler/scala/reflect/internal/TreeGen.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/TreeInfo.scala (renamed from src/compiler/scala/reflect/internal/TreeInfo.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/TreePrinters.scala (renamed from src/compiler/scala/reflect/internal/TreePrinters.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Trees.scala (renamed from src/compiler/scala/reflect/internal/Trees.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/TypeDebugging.scala (renamed from src/compiler/scala/reflect/internal/TypeDebugging.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala (renamed from src/compiler/scala/reflect/internal/Types.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/package.scala (renamed from src/compiler/scala/reflect/internal/package.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala (renamed from src/compiler/scala/reflect/internal/pickling/ByteCodecs.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/PickleBuffer.scala (renamed from src/compiler/scala/reflect/internal/pickling/PickleBuffer.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/PickleFormat.scala (renamed from src/compiler/scala/reflect/internal/pickling/PickleFormat.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala (renamed from src/compiler/scala/reflect/internal/pickling/UnPickler.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/settings/AbsSettings.scala (renamed from src/compiler/scala/reflect/internal/settings/AbsSettings.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/settings/MutableSettings.scala (renamed from src/compiler/scala/reflect/internal/settings/MutableSettings.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/transform/Erasure.scala (renamed from src/compiler/scala/reflect/internal/transform/Erasure.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/transform/RefChecks.scala (renamed from src/compiler/scala/reflect/internal/transform/RefChecks.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/transform/Transforms.scala (renamed from src/compiler/scala/reflect/internal/transform/Transforms.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/transform/UnCurry.scala (renamed from src/compiler/scala/reflect/internal/transform/UnCurry.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Collections.scala (renamed from src/compiler/scala/reflect/internal/util/Collections.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/HashSet.scala (renamed from src/compiler/scala/reflect/internal/util/HashSet.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Origins.scala (renamed from src/compiler/scala/reflect/internal/util/Origins.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Position.scala (renamed from src/compiler/scala/reflect/internal/util/Position.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Set.scala (renamed from src/compiler/scala/reflect/internal/util/Set.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/SourceFile.scala (renamed from src/compiler/scala/reflect/internal/util/SourceFile.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/StatBase.scala (renamed from src/compiler/scala/reflect/internal/util/StatBase.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/Statistics.scala (renamed from src/compiler/scala/reflect/internal/util/Statistics.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/StringOps.scala (renamed from src/compiler/scala/reflect/internal/util/StringOps.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/TableDef.scala (renamed from src/compiler/scala/reflect/internal/util/TableDef.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/TraceSymbolActivity.scala (renamed from src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/util/WeakHashSet.scala (renamed from src/compiler/scala/reflect/internal/util/WeakHashSet.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Aliases.scala (renamed from src/library/scala/reflect/makro/Aliases.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/CapturedVariables.scala (renamed from src/library/scala/reflect/makro/CapturedVariables.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Context.scala (renamed from src/library/scala/reflect/makro/Context.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Enclosures.scala (renamed from src/library/scala/reflect/makro/Enclosures.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Evals.scala (renamed from src/library/scala/reflect/makro/Evals.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/ExprUtils.scala (renamed from src/library/scala/reflect/makro/ExprUtils.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Exprs.scala (renamed from src/library/scala/reflect/makro/Exprs.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/FrontEnds.scala (renamed from src/library/scala/reflect/makro/FrontEnds.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Infrastructure.scala (renamed from src/library/scala/reflect/makro/Infrastructure.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Names.scala (renamed from src/library/scala/reflect/makro/Names.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Parsers.scala (renamed from src/library/scala/reflect/makro/Parsers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Reifiers.scala (renamed from src/library/scala/reflect/makro/Reifiers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Settings.scala (renamed from src/library/scala/reflect/makro/Settings.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/TreeBuilder.scala (renamed from src/library/scala/reflect/makro/TreeBuilder.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/TypeTags.scala (renamed from src/library/scala/reflect/makro/TypeTags.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Typers.scala (renamed from src/library/scala/reflect/makro/Typers.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/Universe.scala (renamed from src/library/scala/reflect/makro/Universe.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/makro/package.scala (renamed from src/library/scala/reflect/makro/package.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/AbstractFile.scala (renamed from src/compiler/scala/reflect/runtime/AbstractFile.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala (renamed from src/compiler/scala/reflect/runtime/JavaMirrors.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/JavaUniverse.scala (renamed from src/compiler/scala/reflect/runtime/JavaUniverse.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/ReflectSetup.scala (renamed from src/compiler/scala/reflect/runtime/ReflectSetup.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/ReflectionUtils.scala (renamed from src/compiler/scala/reflect/runtime/ReflectionUtils.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/Settings.scala (renamed from src/compiler/scala/reflect/runtime/Settings.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SymbolLoaders.scala (renamed from src/compiler/scala/reflect/runtime/SymbolLoaders.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SymbolTable.scala (renamed from src/compiler/scala/reflect/runtime/SymbolTable.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SynchronizedOps.scala (renamed from src/compiler/scala/reflect/runtime/SynchronizedOps.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala (renamed from src/compiler/scala/reflect/runtime/SynchronizedSymbols.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/SynchronizedTypes.scala (renamed from src/compiler/scala/reflect/runtime/SynchronizedTypes.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/TwoWayCache.scala (renamed from src/compiler/scala/reflect/runtime/TwoWayCache.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/package.scala (renamed from src/compiler/scala/reflect/runtime/package.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/AbstractFile.scala (renamed from src/compiler/scala/tools/nsc/io/AbstractFile.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/Directory.scala (renamed from src/compiler/scala/tools/nsc/io/Directory.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/File.scala (renamed from src/compiler/scala/tools/nsc/io/File.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/FileOperationException.scala (renamed from src/compiler/scala/tools/nsc/io/FileOperationException.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/NoAbstractFile.scala (renamed from src/compiler/scala/tools/nsc/io/NoAbstractFile.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/Path.scala (renamed from src/compiler/scala/tools/nsc/io/Path.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/PlainFile.scala (renamed from src/compiler/scala/tools/nsc/io/PlainFile.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/Streamable.scala (renamed from src/compiler/scala/tools/nsc/io/Streamable.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/VirtualDirectory.scala (renamed from src/compiler/scala/tools/nsc/io/VirtualDirectory.scala) | 0 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/VirtualFile.scala (renamed from src/compiler/scala/tools/nsc/io/VirtualFile.scala) | 3 | ||||
| -rw-r--r-- | src/reflect/scala/tools/nsc/io/ZipArchive.scala (renamed from src/compiler/scala/tools/nsc/io/ZipArchive.scala) | 3 | ||||
| -rw-r--r-- | test/files/presentation/memory-leaks/MemoryLeaksTest.scala | 4 |
138 files changed, 347 insertions, 33 deletions
@@ -175,6 +175,7 @@ PROPERTIES <!-- Sets location of pre-compiled libraries --> <property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/> + <property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/> <property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/> <property name="jline.jar" value="${lib.dir}/jline.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> @@ -396,6 +397,7 @@ INITIALISATION <!-- Define tasks that can be run with Starr --> <path id="starr.classpath"> <pathelement location="${lib.starr.jar}"/> + <pathelement location="${reflect.starr.jar}"/> <pathelement location="${comp.starr.jar}"/> <path refid="aux.libs"/> </path> @@ -507,12 +509,61 @@ LOCAL REFERENCE BUILD (LOCKER) <stopwatch name="locker.lib.timer" action="total"/> </target> - <target name="locker.pre-comp" depends="locker.lib" unless="locker.available"> + + <target name="locker.pre-reflect" depends="locker.lib" unless="locker.available"> + <condition property="locker.reflect.needed"> + <not><available file="${build-locker.dir}/reflect.complete"/></not> + </condition> + </target> + + <target name="locker.reflect" depends="locker.pre-reflect" if="locker.reflect.needed"> + <stopwatch name="locker.reflect.timer"/> + <mkdir dir="${build-locker.dir}/classes/reflect"/> + <scalacfork + destdir="${build-locker.dir}/classes/reflect" + compilerpathref="starr.classpath" + params="${scalac.args.all}" + srcdir="${src.dir}/reflect" + jvmargs="${scalacfork.jvmargs}"> + <include name="**/*.scala"/> + <compilationpath> + <pathelement location="${build-locker.dir}/classes/library"/> + <pathelement location="${build-locker.dir}/classes/reflect"/> + <path refid="aux.libs"/> + <pathelement location="${jline.jar}"/> + </compilationpath> + </scalacfork> + <!-- TODO - needed? --> + <propertyfile file="${build-locker.dir}/classes/reflect/reflect.properties"> + <entry key="version.number" value="${version.number}"/> + <entry key="maven.version.number" value="${maven.version.number}"/> + <entry key="osgi.version.number" value="${osgi.version.number}"/> + <entry key="copyright.string" value="${copyright.string}"/> + </propertyfile> + <copy todir="${build-locker.dir}/classes/reflect"> + <fileset dir="${src.dir}/reflect"> + <include name="**/*.tmpl"/> + <include name="**/*.xml"/> + <include name="**/*.js"/> + <include name="**/*.html"/> + <include name="**/*.css"/> + <include name="**/*.properties"/> + <include name="**/*.swf"/> + <include name="**/*.png"/> + <include name="**/*.gif"/> + </fileset> + </copy> + <touch file="${build-locker.dir}/reflect.complete" verbose="no"/> + <stopwatch name="locker.reflect.timer" action="total"/> + </target> + + <target name="locker.pre-comp" depends="locker.reflect" unless="locker.available"> <condition property="locker.comp.needed"> <not><available file="${build-locker.dir}/compiler.complete"/></not> </condition> </target> + <target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed"> <stopwatch name="locker.comp.timer"/> <mkdir dir="${build-locker.dir}/classes/compiler"/> @@ -525,6 +576,7 @@ LOCAL REFERENCE BUILD (LOCKER) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-locker.dir}/classes/library"/> + <pathelement location="${build-locker.dir}/classes/reflect"/> <pathelement location="${build-locker.dir}/classes/compiler"/> <path refid="aux.libs"/> <path refid="asm.classpath"/> @@ -558,12 +610,15 @@ LOCAL REFERENCE BUILD (LOCKER) <touch file="${build-locker.dir}/all.complete" verbose="no"/> <path id="locker.classpath"> <pathelement location="${build-locker.dir}/classes/library"/> + <pathelement location="${build-locker.dir}/classes/reflect"/> <pathelement location="${build-locker.dir}/classes/compiler"/> <path refid="asm.classpath"/> <path refid="aux.libs"/> </path> + <!-- TODO - Why is this *here* ? --> <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <path refid="asm.classpath"/> <path refid="aux.libs"/> @@ -586,7 +641,19 @@ LOCAL REFERENCE BUILD (LOCKER) <delete file="${build-locker.dir}/library.complete"/> </target> - <target name="locker.unlock.pre-comp" depends="locker.unlock.lib"> + <target name="locker.unlock.pre-reflect" depends="locker.unlock.lib"> + <uptodate property="locker.reflect.available" targetfile="${build-locker.dir}/reflect.complete"> + <srcfiles dir="${src.dir}"> + <include name="reflect/**"/> + </srcfiles> + </uptodate> + </target> + + <target name="locker.unlock.reflect" depends="locker.unlock.pre-reflect" unless="locker.reflect.available"> + <delete file="${build-locker.dir}/reflect.complete"/> + </target> + + <target name="locker.unlock.pre-comp" depends="locker.unlock.reflect"> <uptodate property="locker.comp.available" targetfile="${build-locker.dir}/compiler.complete"> <srcfiles dir="${src.dir}"> <include name="compiler/**"/> @@ -622,7 +689,21 @@ PACKED LOCKER BUILD (PALO) </jar> </target> - <target name="palo.pre-comp" depends="palo.lib"> + <target name="palo.pre-reflect" depends="palo.lib"> + <uptodate + property="palo.reflect.available" + targetfile="${build-palo.dir}/lib/scala-reflect.jar" + srcfile="${build-locker.dir}/reflect.complete"/> + </target> + + <target name="palo.reflect" depends="palo.pre-reflect" unless="palo.reflect.available"> + <mkdir dir="${build-palo.dir}/lib"/> + <jar destfile="${build-palo.dir}/lib/scala-reflect.jar" manifest="${basedir}/META-INF/MANIFEST.MF"> + <fileset dir="${build-locker.dir}/classes/reflect"/> + </jar> + </target> + + <target name="palo.pre-comp" depends="palo.reflect"> <uptodate property="palo.comp.available" targetfile="${build-palo.dir}/lib/scala-compiler.jar" @@ -660,6 +741,7 @@ PACKED LOCKER BUILD (PALO) <taskdef name="palo-bin" classname="scala.tools.ant.ScalaTool"> <classpath> <pathelement location="${build-palo.dir}/lib/scala-library.jar"/> + <pathelement location="${build-palo.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-palo.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-palo.dir}/lib/jline.jar"/> </classpath> @@ -776,7 +858,57 @@ QUICK BUILD (QUICK) <stopwatch name="quick.lib.timer" action="total"/> </target> - <target name="quick.newlibs" depends="quick.lib" if="libs.outdated"> + + <target name="quick.pre-reflect" depends="quick.lib"> + <uptodate property="quick.reflect.available" targetfile="${build-quick.dir}/reflect.complete"> + <srcfiles dir="${src.dir}"> + <include name="reflect/**"/> + </srcfiles> + </uptodate> + </target> + + <target name="quick.reflect" depends="quick.pre-reflect" unless="quick.reflect.available"> + <stopwatch name="quick.reflect.timer"/> + <mkdir dir="${build-quick.dir}/classes/reflect"/> + <scalacfork + destdir="${build-quick.dir}/classes/reflect" + compilerpathref="locker.classpath" + params="${scalac.args.all}" + srcdir="${src.dir}/reflect" + jvmargs="${scalacfork.jvmargs}"> + <include name="**/*.scala"/> + <compilationpath> + <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> + <path refid="aux.libs"/> + <pathelement location="${jline.jar}"/> + </compilationpath> + </scalacfork> + <!-- TODO - needed? --> + <propertyfile file="${build-quick.dir}/classes/reflect/reflect.properties"> + <entry key="version.number" value="${version.number}"/> + <entry key="maven.version.number" value="${maven.version.number}"/> + <entry key="osgi.version.number" value="${osgi.version.number}"/> + <entry key="copyright.string" value="${copyright.string}"/> + </propertyfile> + <copy todir="${build-quick.dir}/classes/reflect"> + <fileset dir="${src.dir}/reflect"> + <include name="**/*.tmpl"/> + <include name="**/*.xml"/> + <include name="**/*.js"/> + <include name="**/*.html"/> + <include name="**/*.css"/> + <include name="**/*.properties"/> + <include name="**/*.swf"/> + <include name="**/*.png"/> + <include name="**/*.gif"/> + </fileset> + </copy> + <touch file="${build-quick.dir}/reflect.complete" verbose="no"/> + <stopwatch name="quick.reflect.timer" action="total"/> + </target> + + <target name="quick.newlibs" depends="quick.reflect" if="libs.outdated"> <antcall target="libs.done" inheritRefs="true"/> <property name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/> <property name="msil.jar" value="${build-libs.dir}/msil.jar"/> @@ -814,6 +946,7 @@ QUICK BUILD (QUICK) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <path refid="aux.libs"/> <path refid="asm.classpath"/> @@ -862,6 +995,7 @@ QUICK BUILD (QUICK) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/continuations-plugin"/> <path refid="aux.libs"/> @@ -959,6 +1093,7 @@ QUICK BUILD (QUICK) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/partest"/> @@ -985,6 +1120,7 @@ QUICK BUILD (QUICK) target="1.5" source="1.5"> <classpath> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/partest"/> @@ -1001,6 +1137,7 @@ QUICK BUILD (QUICK) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/partest"/> @@ -1031,6 +1168,7 @@ QUICK BUILD (QUICK) <target name="quick.bin" depends="quick.pre-bin" unless="quick.bin.available"> <path id="quick.bin.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <path refid="aux.libs"/> @@ -1074,6 +1212,7 @@ QUICK BUILD (QUICK) <target name="quick.done" depends="quick.bin"> <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <path refid="asm.classpath"/> <path refid="aux.libs"/> @@ -1126,7 +1265,21 @@ PACKED QUICK BUILD (PACK) </jar> </target> - <target name="pack.pre-comp" depends="pack.lib"> + <target name="pack.pre-reflect" depends="pack.lib"> + <uptodate + property="pack.reflect.available" + targetfile="${build-pack.dir}/lib/scala-reflect.jar" + srcfile="${build-quick.dir}/reflect.complete"/> + </target> + + <target name="pack.reflect" depends="pack.pre-reflect" unless="pack.reflect.available"> + <mkdir dir="${build-pack.dir}/lib"/> + <jar destfile="${build-pack.dir}/lib/scala-reflect.jar"> + <fileset dir="${build-quick.dir}/classes/reflect" /> + </jar> + </target> + + <target name="pack.pre-comp" depends="pack.reflect"> <uptodate property="pack.comp.available" targetfile="${build-pack.dir}/lib/scala-compiler.jar" @@ -1215,6 +1368,7 @@ PACKED QUICK BUILD (PACK) <taskdef name="pack-bin" classname="scala.tools.ant.ScalaTool"> <classpath> <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-pack.dir}/lib/jline.jar"/> </classpath> @@ -1251,6 +1405,7 @@ PACKED QUICK BUILD (PACK) <target name="pack.done" depends="pack.bin"> <path id="pack.classpath"> <pathelement location="${build-pack.dir}/lib/scala-library.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/> <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/> <pathelement location="${build-pack.dir}/lib/scalap.jar"/> @@ -1349,7 +1504,54 @@ BOOTSTRAPPING BUILD (STRAP) <stopwatch name="strap.lib.timer" action="total"/> </target> - <target name="strap.pre-comp" depends="strap.lib"> + <target name="strap.pre-reflect" depends="strap.lib"> + <uptodate property="strap.reflect.available" targetfile="${build-strap.dir}/reflect.complete"> + <srcfiles dir="${src.dir}/reflect"/> + </uptodate> + </target> + + <target name="strap.reflect" depends="strap.pre-reflect" unless="strap.reflect.available"> + <stopwatch name="strap.reflect.timer"/> + <mkdir dir="${build-strap.dir}/classes/reflect"/> + <scalacfork + destdir="${build-strap.dir}/classes/reflect" + compilerpathref="pack.classpath" + params="${scalac.args.all}" + srcdir="${src.dir}/reflect" + jvmargs="${scalacfork.jvmargs}"> + <include name="**/*.scala"/> + <compilationpath> + <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> + <path refid="aux.libs"/> + <pathelement location="${jline.jar}"/> + </compilationpath> + </scalacfork> + <propertyfile file="${build-strap.dir}/classes/reflect/reflect.properties"> + <entry key="version.number" value="${version.number}"/> + <entry key="maven.version.number" value="${maven.version.number}"/> + <entry key="osgi.version.number" value="${osgi.version.number}"/> + <entry key="copyright.string" value="${copyright.string}"/> + </propertyfile> + <copy todir="${build-strap.dir}/classes/reflect"> + <fileset dir="${src.dir}/reflect"> + <include name="**/*.tmpl"/> + <include name="**/*.xml"/> + <include name="**/*.js"/> + <include name="**/*.css"/> + <include name="**/*.html"/> + <include name="**/*.properties"/> + <include name="**/*.swf"/> + <include name="**/*.png"/> + <include name="**/*.gif"/> + <include name="**/*.txt"/> + </fileset> + </copy> + <touch file="${build-strap.dir}/reflect.complete" verbose="no"/> + <stopwatch name="strap.comp.timer" action="total"/> + </target> + + <target name="strap.pre-comp" depends="strap.reflect"> <uptodate property="strap.comp.available" targetfile="${build-strap.dir}/compiler.complete"> <srcfiles dir="${src.dir}/compiler"/> </uptodate> @@ -1368,6 +1570,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <path refid="aux.libs"/> <path refid="asm.classpath"/> @@ -1416,6 +1619,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/continuations-plugin"/> <path refid="aux.libs"/> @@ -1478,6 +1682,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${build-strap.dir}/classes/partest"/> @@ -1504,6 +1709,7 @@ BOOTSTRAPPING BUILD (STRAP) target="1.5" source="1.5"> <classpath> <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${build-strap.dir}/classes/partest"/> @@ -1520,6 +1726,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${build-strap.dir}/classes/reflect"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${build-strap.dir}/classes/partest"/> @@ -1961,6 +2168,7 @@ BOOTRAPING TEST AND TEST SUITE </target> <target name="test.classload" depends="pack.done"> + <!-- TODO - Add actors + reflect to this --> <classloadVerify classpath="${build-pack.dir}/lib/scala-library.jar" /> </target> @@ -2126,6 +2334,9 @@ DISTRIBUTION <fileset dir="${src.dir}/library"/> <fileset dir="${src.dir}/continuations/library"/> </jar> + <jar destfile="${dist.dir}/src/scala-reflect-src.jar"> + <fileset dir="${src.dir}/reflect"/> + </jar> <jar destfile="${dist.dir}/src/scala-swing-src.jar"> <fileset dir="${src.dir}/swing"/> </jar> @@ -2195,6 +2406,7 @@ STABLE REFERENCE (STARR) <target name="starr.clean" depends="starr.start"> <delete file="${basedir}/lib/scala-library.jar"/> + <delete file="${basedir}/lib/scala-reflect.jar"/> <delete file="${basedir}/lib/scala-compiler.jar"/> <delete file="${basedir}/lib/scala-library-src.jar"/> </target> @@ -2205,7 +2417,13 @@ STABLE REFERENCE (STARR) </jar> </target> - <target name="starr.comp" depends="starr.lib"> + <target name="starr.reflect" depends="starr.lib"> + <jar destfile="${basedir}/lib/scala-reflect.jar"> + <fileset dir="${basedir}/build/quick/classes/reflect"/> + </jar> + </target> + + <target name="starr.comp" depends="starr.reflect"> <jar destfile="${basedir}/lib/scala-compiler.jar"> <fileset dir="${basedir}/build/quick/classes/compiler"/> </jar> @@ -2242,6 +2460,7 @@ STABLE REFERENCE (STARR) <delete> <fileset dir="${lib.dir}"> <include name="scala-compiler.jar.desired.sha1"/> + <include name="scala-reflect.jar.desired.sha1"/> <include name="scala-library.jar.desired.sha1"/> <include name="scala-library-src.jar.desired.sha1"/> </fileset> @@ -2390,6 +2609,7 @@ POSITIONS MISCELLANEOUS ============================================================================ --> + <target name="graph.init"> <taskdef name="vizant" classname="vizant.Vizant" classpath="${lib-ant.dir}/vizant.jar"/> </target> diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index 2656fe4776..022b392187 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -388fae20e2e54836af67c752ffed8ff5540b82ea ?scala-compiler.jar +bf1b1d794688e661cd9d94ec42be37515f06f453 ?scala-compiler.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index a17d53053e..78e21ae760 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -6e68e00a30b7328b55de7362f902619066094de7 ?scala-library.jar +9cc8e09873316a58bddef7dc59229ca6e1c27e79 ?scala-library.jar diff --git a/lib/scala-reflect.jar.desired.sha1 b/lib/scala-reflect.jar.desired.sha1 new file mode 100644 index 0000000000..cc9ac9405c --- /dev/null +++ b/lib/scala-reflect.jar.desired.sha1 @@ -0,0 +1 @@ +ec3636a6da2b3055f6a54488a002a5c3fc2ae192 ?scala-reflect.jar diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 7ab54f81c3..131358f0f3 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -111,6 +111,7 @@ <deploy-local name="scala-library" version="@{version}" repository="@{repository}" /> <deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" /> <deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/> + <deploy-local name="scala-reflect" version="@{version}" repository="@{repository}" /> <deploy-local name="scala-actors" version="@{version}" repository="@{repository}" /> <deploy-local name="scala-actors-migration" version="@{version}" repository="@{repository}" /> <deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/> @@ -170,6 +171,7 @@ </extra-attachments> </deploy-remote> <deploy-remote name="jline" version="@{version}" repository="@{repository}"/> + <deploy-remote name="scala-reflect" version="@{version}" repository="@{repository}"/> <deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" /> <deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/> <deploy-remote name="scala-actors" version="@{version}" repository="@{repository}"/> @@ -238,6 +240,7 @@ <deploy-remote-plugin-signed name="continuations" version="@{version}" repository="@{repository}"/> <deploy-remote-signed name="scala-library" version="@{version}" repository="@{repository}"/> <deploy-remote-signed name="jline" version="@{version}" repository="@{repository}"/> + <deploy-remote-signed name="scala-reflect" version="@{version}" repository="@{repository}"/> <deploy-remote-signed name="scala-compiler" version="@{version}" repository="@{repository}" /> <deploy-remote-signed name="scala-swing" version="@{version}" repository="@{repository}"/> <deploy-remote-signed name="scala-actors" version="@{version}" repository="@{repository}"/> diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml index 82d0ed7c91..fedc34a5d5 100644 --- a/src/build/maven/scala-compiler-pom.xml +++ b/src/build/maven/scala-compiler-pom.xml @@ -37,6 +37,11 @@ <artifactId>scala-library</artifactId> <version>@VERSION@</version> </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>@VERSION@</version> + </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml new file mode 100644 index 0000000000..7a1613f42c --- /dev/null +++ b/src/build/maven/scala-reflect-pom.xml @@ -0,0 +1,62 @@ +<project + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala Compiler</name> + <description>Compiler for the Scala Programming Language</description> + <url>http://www.scala-lang.org/</url> + <inceptionYear>2002</inceptionYear> + <organization> + <name>LAMP/EPFL</name> + <url>http://lamp.epfl.ch/</url> + </organization> + <licenses> + <license> + <name>BSD-like</name> + <url>http://www.scala-lang.org/downloads/license.html + </url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/scala/scala.git</connection> + <url>https://github.com/scala/scala.git</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://issues.scala-lang.org/</url> + </issueManagement> + + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>@VERSION@</version> + </dependency> + </dependencies> + <distributionManagement> + <repository> + <id>scala-tools.org</id> + <url>@RELEASE_REPOSITORY@</url> + </repository> + <snapshotRepository> + <id>scala-tools.org</id> + <url>@SNAPSHOT_REPOSITORY@</url> + <uniqueVersion>false</uniqueVersion> + </snapshotRepository> + </distributionManagement> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> +</project> diff --git a/src/build/pack.xml b/src/build/pack.xml index 956beaef88..564d290967 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -136,6 +136,7 @@ MAIN DISTRIBUTION PACKAGING </macrodef> <mvn-copy-lib mvn.artifact.name="jline"/> <mvn-copy-lib mvn.artifact.name="scala-library"/> + <mvn-copy-lib mvn.artifact.name="scala-reflect"/> <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> <mvn-copy-lib mvn.artifact.name="scala-actors"/> @@ -212,6 +213,8 @@ MAIN DISTRIBUTION PACKAGING file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/> <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar" file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/> + <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar" + file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/> </target> <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win"> diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 67b38d2e24..2f694b3cc8 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -279,6 +279,16 @@ class PartestTask extends Task with CompilationPathProperty { } } getOrElse sys.error("Provided classpath does not contain a Scala library.") + val scalaReflect = { + (classpath.list map { fs => new File(fs) }) find { f => + f.getName match { + case "scala-reflect.jar" => true + case "reflect" if (f.getParentFile.getName == "classes") => true + case _ => false + } + } + } getOrElse sys.error("Provided classpath does not contain a Scala reflection library.") + val scalaCompiler = { (classpath.list map { fs => new File(fs) }) find { f => f.getName match { @@ -342,6 +352,7 @@ class PartestTask extends Task with CompilationPathProperty { antFileManager.failed = runFailed antFileManager.CLASSPATH = ClassPath.join(classpath.list: _*) antFileManager.LATEST_LIB = scalaLibrary.getAbsolutePath + antFileManager.LATEST_REFLECT = scalaReflect.getAbsolutePath antFileManager.LATEST_COMP = scalaCompiler.getAbsolutePath antFileManager.LATEST_PARTEST = scalaPartest.getAbsolutePath antFileManager.LATEST_ACTORS = scalaActors.getAbsolutePath diff --git a/src/partest/scala/tools/partest/nest/AntRunner.scala b/src/partest/scala/tools/partest/nest/AntRunner.scala index dc83e4ea66..ee644c5315 100644 --- a/src/partest/scala/tools/partest/nest/AntRunner.scala +++ b/src/partest/scala/tools/partest/nest/AntRunner.scala @@ -20,6 +20,7 @@ class AntRunner extends DirectRunner { var JAVAC_CMD: String = "javac" var CLASSPATH: String = _ var LATEST_LIB: String = _ + var LATEST_REFLECT: String = _ var LATEST_COMP: String = _ var LATEST_PARTEST: String = _ var LATEST_ACTORS: String = _ diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala index b270a6b65a..68e9753575 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala @@ -85,6 +85,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = testClassesDir / "library" latestActorsFile = testClassesDir / "library" / "actors" latestActMigFile = testClassesDir / "actors-migration" + latestReflectFile = testClassesDir / "reflect" latestCompFile = testClassesDir / "compiler" latestPartestFile = testClassesDir / "partest" latestFjbgFile = testParent / "lib" / "fjbg.jar" @@ -96,6 +97,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = dir / "lib/scala-library.jar" latestActorsFile = dir / "lib/scala-actors.jar" latestActMigFile = dir / "lib/scala-actors-migration.jar" + latestReflectFile = dir / "lib/scala-reflect.jar" latestCompFile = dir / "lib/scala-compiler.jar" latestPartestFile = dir / "lib/scala-partest.jar" latestFjbgFile = testParent / "lib" / "fjbg.jar" @@ -107,6 +109,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("build/quick/classes/library") latestActorsFile = prefixFile("build/quick/classes/library/actors") latestActMigFile = prefixFile("build/quick/classes/actors-migration") + latestReflectFile = prefixFile("build/quick/classes/reflect") latestCompFile = prefixFile("build/quick/classes/compiler") latestPartestFile = prefixFile("build/quick/classes/partest") } @@ -118,6 +121,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFileWith(p, "lib/scala-library.jar") latestActorsFile = prefixFileWith(p, "lib/scala-actors.jar") latestActMigFile = prefixFileWith(p, "lib/scala-actors-migration.jar") + latestReflectFile = prefixFileWith(p, "lib/scala-reflect.jar") latestCompFile = prefixFileWith(p, "lib/scala-compiler.jar") latestPartestFile = prefixFileWith(p, "lib/scala-partest.jar") } @@ -128,6 +132,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("dists/latest/lib/scala-library.jar") latestActorsFile = prefixFile("dists/latest/lib/scala-actors.jar") latestActMigFile = prefixFile("dists/latest/lib/scala-actors-migration.jar") + latestReflectFile = prefixFile("dists/latest/lib/scala-reflect.jar") latestCompFile = prefixFile("dists/latest/lib/scala-compiler.jar") latestPartestFile = prefixFile("dists/latest/lib/scala-partest.jar") } @@ -138,6 +143,7 @@ class ConsoleFileManager extends FileManager { latestLibFile = prefixFile("build/pack/lib/scala-library.jar") latestActorsFile = prefixFile("build/pack/lib/scala-actors.jar") latestActMigFile = prefixFile("build/pack/lib/scala-actors-migration.jar") + latestReflectFile = prefixFile("build/pack/lib/scala-reflect.jar") latestCompFile = prefixFile("build/pack/lib/scala-compiler.jar") latestPartestFile = prefixFile("build/pack/lib/scala-partest.jar") } @@ -151,10 +157,10 @@ class ConsoleFileManager extends FileManager { names map (x => prefixFile(base + "/" + x).lastModified) reduceLeft (_ max _) // detect most recent build - val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "library/library.properties") - val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-library.jar") - val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-library.jar") - val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-library.jar") + val quickTime = mostRecentOf("build/quick/classes", "compiler/compiler.properties", "reflect/reflect.properties", "library/library.properties") + val packTime = mostRecentOf("build/pack/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") + val distTime = mostRecentOf("dists/latest/lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") + val instTime = mostRecentOf("lib", "scala-compiler.jar", "scala-reflect.jar", "scala-library.jar") val pairs = Map( (quickTime, () => setupQuick()), @@ -170,6 +176,7 @@ class ConsoleFileManager extends FileManager { } LATEST_LIB = latestLibFile.getAbsolutePath + LATEST_REFLECT = latestReflectFile.getAbsolutePath LATEST_COMP = latestCompFile.getAbsolutePath LATEST_PARTEST = latestPartestFile.getAbsolutePath LATEST_ACTORS = latestActorsFile.getAbsolutePath @@ -177,6 +184,7 @@ class ConsoleFileManager extends FileManager { } var LATEST_LIB: String = "" + var LATEST_REFLECT: String = "" var LATEST_COMP: String = "" var LATEST_PARTEST: String = "" var LATEST_ACTORS: String = "" @@ -186,6 +194,7 @@ class ConsoleFileManager extends FileManager { var latestLibFile: File = _ var latestActorsFile: File = _ var latestActMigFile: File = _ + var latestReflectFile: File = _ var latestCompFile: File = _ var latestPartestFile: File = _ var latestFjbgFile: File = _ diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 815c27f567..09896edc55 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -58,13 +58,14 @@ trait DirectRunner { //val consFM = new ConsoleFileManager //import consFM.{ latestCompFile, latestLibFile, latestPartestFile } val latestCompFile = new File(fileManager.LATEST_COMP) + val latestReflectFile = new File(fileManager.LATEST_REFLECT) val latestLibFile = new File(fileManager.LATEST_LIB) val latestPartestFile = new File(fileManager.LATEST_PARTEST) val latestActorsFile = new File(fileManager.LATEST_ACTORS) val latestActMigFile = new File(fileManager.LATEST_ACTORS_MIGRATION) val scalacheckURL = PathSettings.scalaCheck.toURL val scalaCheckParentClassLoader = ScalaClassLoader.fromURLs( - scalacheckURL :: (List(latestCompFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL)) + scalacheckURL :: (List(latestCompFile, latestReflectFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL)) ) Output.init() diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index cf7160f521..40bfa36b04 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -60,6 +60,7 @@ trait FileManager extends FileUtil { var CLASSPATH: String var LATEST_LIB: String + var LATEST_REFLECT: String var LATEST_COMP: String var LATEST_PARTEST: String var LATEST_ACTORS: String diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala index 6b81b66a39..7fd503e769 100644 --- a/src/partest/scala/tools/partest/nest/NestUI.scala +++ b/src/partest/scala/tools/partest/nest/NestUI.scala @@ -84,7 +84,7 @@ object NestUI { println(" --grep <expr> run all tests whose source file contains <expr>") println println(" Other options:") - println(" --pack pick compiler/library in build/pack, and run all tests") + println(" --pack pick compiler/reflect/library in build/pack, and run all tests") println(" --show-log show log") println(" --show-diff show diff between log and check file") println(" --failed run only those tests that failed during the last run") diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index a5d5952ff7..fa75d96b34 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -48,9 +48,9 @@ class ReflectiveRunner { new ConsoleFileManager import fileManager. - { latestCompFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile } + { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile } val files = - Array(latestCompFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile) map (x => io.File(x)) + Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile) map (x => io.File(x)) val sepUrls = files map (_.toURL) var sepLoader = new URLClassLoader(sepUrls, null) diff --git a/src/partest/scala/tools/partest/nest/SBTRunner.scala b/src/partest/scala/tools/partest/nest/SBTRunner.scala index 14e2dc3df9..7e2f37374b 100644 --- a/src/partest/scala/tools/partest/nest/SBTRunner.scala +++ b/src/partest/scala/tools/partest/nest/SBTRunner.scala @@ -13,6 +13,7 @@ object SBTRunner extends DirectRunner { var JAVAC_CMD: String = "javac" var CLASSPATH: String = _ var LATEST_LIB: String = _ + var LATEST_REFLECT: String = _ var LATEST_COMP: String = _ var LATEST_PARTEST: String = _ var LATEST_ACTORS: String = _ @@ -63,6 +64,7 @@ object SBTRunner extends DirectRunner { } // Find scala library jar file... fileManager.LATEST_LIB = findClasspath("scala-library", "scala-library") getOrElse sys.error("No scala-library found! Classpath = " + fileManager.CLASSPATH) + fileManager.LATEST_REFLECT = findClasspath("scala-reflect", "scala-reflect") getOrElse sys.error("No scala-reflect found! Classpath = " + fileManager.CLASSPATH) fileManager.LATEST_COMP = findClasspath("scala-compiler", "scala-compiler") getOrElse sys.error("No scala-compiler found! Classpath = " + fileManager.CLASSPATH) fileManager.LATEST_PARTEST = findClasspath("scala-partest", "partest") getOrElse sys.error("No scala-partest found! Classpath = " + fileManager.CLASSPATH) fileManager.LATEST_ACTORS = findClasspath("scala-actors", "actors") getOrElse sys.error("No scala-actors found! Classpath = " + fileManager.CLASSPATH) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index f2128cc219..1c2c52263d 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -53,6 +53,7 @@ class ScalaCheckFileManager(val origmanager: FileManager) extends FileManager { var CLASSPATH: String = join(origmanager.CLASSPATH, PathSettings.scalaCheck.path) var LATEST_LIB: String = origmanager.LATEST_LIB + var LATEST_REFLECT: String = origmanager.LATEST_REFLECT var LATEST_COMP: String = origmanager.LATEST_COMP var LATEST_PARTEST: String = origmanager.LATEST_PARTEST var LATEST_ACTORS: String = origmanager.LATEST_ACTORS @@ -323,6 +324,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor "-Djava.library.path="+logFile.getParentFile.getAbsolutePath, "-Dpartest.output="+outDir.getAbsolutePath, "-Dpartest.lib="+LATEST_LIB, + "-Dpartest.reflect="+LATEST_REFLECT, "-Dpartest.cwd="+outDir.getParent, "-Dpartest.test-path="+testFullPath, "-Dpartest.testname="+fileBase, diff --git a/src/library/scala/reflect/api/AnnotationInfos.scala b/src/reflect/scala/reflect/api/AnnotationInfos.scala index d9f35024d9..d9f35024d9 100755..100644 --- a/src/library/scala/reflect/api/AnnotationInfos.scala +++ b/src/reflect/scala/reflect/api/AnnotationInfos.scala diff --git a/src/library/scala/reflect/api/Constants.scala b/src/reflect/scala/reflect/api/Constants.scala index 7862ab0d25..7862ab0d25 100755..100644 --- a/src/library/scala/reflect/api/Constants.scala +++ b/src/reflect/scala/reflect/api/Constants.scala diff --git a/src/library/scala/reflect/api/Exprs.scala b/src/reflect/scala/reflect/api/Exprs.scala index bda125a1a1..bda125a1a1 100644 --- a/src/library/scala/reflect/api/Exprs.scala +++ b/src/reflect/scala/reflect/api/Exprs.scala diff --git a/src/library/scala/reflect/api/FlagSets.scala b/src/reflect/scala/reflect/api/FlagSets.scala index 969176d641..969176d641 100644 --- a/src/library/scala/reflect/api/FlagSets.scala +++ b/src/reflect/scala/reflect/api/FlagSets.scala diff --git a/src/library/scala/reflect/api/FrontEnds.scala b/src/reflect/scala/reflect/api/FrontEnds.scala index a201b83444..a201b83444 100644 --- a/src/library/scala/reflect/api/FrontEnds.scala +++ b/src/reflect/scala/reflect/api/FrontEnds.scala diff --git a/src/library/scala/reflect/api/Importers.scala b/src/reflect/scala/reflect/api/Importers.scala index 69d6414f4f..69d6414f4f 100644 --- a/src/library/scala/reflect/api/Importers.scala +++ b/src/reflect/scala/reflect/api/Importers.scala diff --git a/src/compiler/scala/reflect/api/JavaUniverse.scala b/src/reflect/scala/reflect/api/JavaUniverse.scala index 8bf62a357c..8bf62a357c 100644 --- a/src/compiler/scala/reflect/api/JavaUniverse.scala +++ b/src/reflect/scala/reflect/api/JavaUniverse.scala diff --git a/src/library/scala/reflect/api/Mirrors.scala b/src/reflect/scala/reflect/api/Mirrors.scala index 2fcee8f227..2fcee8f227 100644 --- a/src/library/scala/reflect/api/Mirrors.scala +++ b/src/reflect/scala/reflect/api/Mirrors.scala diff --git a/src/library/scala/reflect/api/Names.scala b/src/reflect/scala/reflect/api/Names.scala index 222ee5024b..222ee5024b 100755..100644 --- a/src/library/scala/reflect/api/Names.scala +++ b/src/reflect/scala/reflect/api/Names.scala diff --git a/src/library/scala/reflect/api/Positions.scala b/src/reflect/scala/reflect/api/Positions.scala index 9d3d90d9f8..9d3d90d9f8 100644 --- a/src/library/scala/reflect/api/Positions.scala +++ b/src/reflect/scala/reflect/api/Positions.scala diff --git a/src/library/scala/reflect/api/StandardDefinitions.scala b/src/reflect/scala/reflect/api/StandardDefinitions.scala index c2a89f92dd..c2a89f92dd 100755..100644 --- a/src/library/scala/reflect/api/StandardDefinitions.scala +++ b/src/reflect/scala/reflect/api/StandardDefinitions.scala diff --git a/src/library/scala/reflect/api/StandardNames.scala b/src/reflect/scala/reflect/api/StandardNames.scala index 9ec66b8531..9ec66b8531 100644 --- a/src/library/scala/reflect/api/StandardNames.scala +++ b/src/reflect/scala/reflect/api/StandardNames.scala diff --git a/src/library/scala/reflect/api/Symbols.scala b/src/reflect/scala/reflect/api/Symbols.scala index 1d266dc778..1d266dc778 100755..100644 --- a/src/library/scala/reflect/api/Symbols.scala +++ b/src/reflect/scala/reflect/api/Symbols.scala diff --git a/src/compiler/scala/reflect/api/TagInterop.scala b/src/reflect/scala/reflect/api/TagInterop.scala index e10b89d1c6..e10b89d1c6 100644 --- a/src/compiler/scala/reflect/api/TagInterop.scala +++ b/src/reflect/scala/reflect/api/TagInterop.scala diff --git a/src/library/scala/reflect/api/TreePrinters.scala b/src/reflect/scala/reflect/api/TreePrinters.scala index 08a08e7b90..08a08e7b90 100644 --- a/src/library/scala/reflect/api/TreePrinters.scala +++ b/src/reflect/scala/reflect/api/TreePrinters.scala diff --git a/src/library/scala/reflect/api/Trees.scala b/src/reflect/scala/reflect/api/Trees.scala index 2d130daa4e..2d130daa4e 100644 --- a/src/library/scala/reflect/api/Trees.scala +++ b/src/reflect/scala/reflect/api/Trees.scala diff --git a/src/library/scala/reflect/api/Types.scala b/src/reflect/scala/reflect/api/Types.scala index b62a92cbd7..b62a92cbd7 100755..100644 --- a/src/library/scala/reflect/api/Types.scala +++ b/src/reflect/scala/reflect/api/Types.scala diff --git a/src/library/scala/reflect/api/Universe.scala b/src/reflect/scala/reflect/api/Universe.scala index 002cd2e673..002cd2e673 100755..100644 --- a/src/library/scala/reflect/api/Universe.scala +++ b/src/reflect/scala/reflect/api/Universe.scala diff --git a/src/library/scala/reflect/api/package.scala b/src/reflect/scala/reflect/api/package.scala index d2fce7cf1d..d2fce7cf1d 100644 --- a/src/library/scala/reflect/api/package.scala +++ b/src/reflect/scala/reflect/api/package.scala diff --git a/src/compiler/scala/reflect/internal/AbstractFileApi.scala b/src/reflect/scala/reflect/internal/AbstractFileApi.scala index 9f37f4536f..9f37f4536f 100644 --- a/src/compiler/scala/reflect/internal/AbstractFileApi.scala +++ b/src/reflect/scala/reflect/internal/AbstractFileApi.scala diff --git a/src/compiler/scala/reflect/internal/AnnotationCheckers.scala b/src/reflect/scala/reflect/internal/AnnotationCheckers.scala index 449b0ca0bc..449b0ca0bc 100644 --- a/src/compiler/scala/reflect/internal/AnnotationCheckers.scala +++ b/src/reflect/scala/reflect/internal/AnnotationCheckers.scala diff --git a/src/compiler/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala index c283ae408e..c283ae408e 100644 --- a/src/compiler/scala/reflect/internal/AnnotationInfos.scala +++ b/src/reflect/scala/reflect/internal/AnnotationInfos.scala diff --git a/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala b/src/reflect/scala/reflect/internal/BaseTypeSeqs.scala index e07f1bac49..e07f1bac49 100644 --- a/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala +++ b/src/reflect/scala/reflect/internal/BaseTypeSeqs.scala diff --git a/src/compiler/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala index 3bde57ded8..3bde57ded8 100644 --- a/src/compiler/scala/reflect/internal/BuildUtils.scala +++ b/src/reflect/scala/reflect/internal/BuildUtils.scala diff --git a/src/compiler/scala/reflect/internal/CapturedVariables.scala b/src/reflect/scala/reflect/internal/CapturedVariables.scala index 77909d9157..77909d9157 100644 --- a/src/compiler/scala/reflect/internal/CapturedVariables.scala +++ b/src/reflect/scala/reflect/internal/CapturedVariables.scala diff --git a/src/compiler/scala/reflect/internal/Chars.scala b/src/reflect/scala/reflect/internal/Chars.scala index 50ec71094a..50ec71094a 100644 --- a/src/compiler/scala/reflect/internal/Chars.scala +++ b/src/reflect/scala/reflect/internal/Chars.scala diff --git a/src/compiler/scala/reflect/internal/ClassfileConstants.scala b/src/reflect/scala/reflect/internal/ClassfileConstants.scala index 3346e9cccb..3346e9cccb 100644 --- a/src/compiler/scala/reflect/internal/ClassfileConstants.scala +++ b/src/reflect/scala/reflect/internal/ClassfileConstants.scala diff --git a/src/compiler/scala/reflect/internal/Constants.scala b/src/reflect/scala/reflect/internal/Constants.scala index 820dfe0868..820dfe0868 100644 --- a/src/compiler/scala/reflect/internal/Constants.scala +++ b/src/reflect/scala/reflect/internal/Constants.scala diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index d55b38224d..d55b38224d 100644 --- a/src/compiler/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala diff --git a/src/compiler/scala/reflect/internal/ExistentialsAndSkolems.scala b/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala index f1fe4fc118..f1fe4fc118 100644 --- a/src/compiler/scala/reflect/internal/ExistentialsAndSkolems.scala +++ b/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala diff --git a/src/compiler/scala/reflect/internal/FatalError.scala b/src/reflect/scala/reflect/internal/FatalError.scala index c843308480..c843308480 100644 --- a/src/compiler/scala/reflect/internal/FatalError.scala +++ b/src/reflect/scala/reflect/internal/FatalError.scala diff --git a/src/compiler/scala/reflect/internal/FlagSets.scala b/src/reflect/scala/reflect/internal/FlagSets.scala index 0354d2513c..0354d2513c 100644 --- a/src/compiler/scala/reflect/internal/FlagSets.scala +++ b/src/reflect/scala/reflect/internal/FlagSets.scala diff --git a/src/compiler/scala/reflect/internal/Flags.scala b/src/reflect/scala/reflect/internal/Flags.scala index 37e5a23819..37e5a23819 100644 --- a/src/compiler/scala/reflect/internal/Flags.scala +++ b/src/reflect/scala/reflect/internal/Flags.scala diff --git a/src/compiler/scala/reflect/internal/HasFlags.scala b/src/reflect/scala/reflect/internal/HasFlags.scala index c7c0882209..c7c0882209 100644 --- a/src/compiler/scala/reflect/internal/HasFlags.scala +++ b/src/reflect/scala/reflect/internal/HasFlags.scala diff --git a/src/compiler/scala/reflect/internal/Importers.scala b/src/reflect/scala/reflect/internal/Importers.scala index 431d9819a5..431d9819a5 100644 --- a/src/compiler/scala/reflect/internal/Importers.scala +++ b/src/reflect/scala/reflect/internal/Importers.scala diff --git a/src/compiler/scala/reflect/internal/InfoTransformers.scala b/src/reflect/scala/reflect/internal/InfoTransformers.scala index e53f714c0c..e53f714c0c 100644 --- a/src/compiler/scala/reflect/internal/InfoTransformers.scala +++ b/src/reflect/scala/reflect/internal/InfoTransformers.scala diff --git a/src/compiler/scala/reflect/internal/Kinds.scala b/src/reflect/scala/reflect/internal/Kinds.scala index b736a9192f..b736a9192f 100644 --- a/src/compiler/scala/reflect/internal/Kinds.scala +++ b/src/reflect/scala/reflect/internal/Kinds.scala diff --git a/src/compiler/scala/reflect/internal/Mirrors.scala b/src/reflect/scala/reflect/internal/Mirrors.scala index e3680b14d5..e3680b14d5 100644 --- a/src/compiler/scala/reflect/internal/Mirrors.scala +++ b/src/reflect/scala/reflect/internal/Mirrors.scala diff --git a/src/compiler/scala/reflect/internal/MissingRequirementError.scala b/src/reflect/scala/reflect/internal/MissingRequirementError.scala index fbbbcc1928..fbbbcc1928 100644 --- a/src/compiler/scala/reflect/internal/MissingRequirementError.scala +++ b/src/reflect/scala/reflect/internal/MissingRequirementError.scala diff --git a/src/compiler/scala/reflect/internal/Names.scala b/src/reflect/scala/reflect/internal/Names.scala index 18671871ae..18671871ae 100644 --- a/src/compiler/scala/reflect/internal/Names.scala +++ b/src/reflect/scala/reflect/internal/Names.scala diff --git a/src/compiler/scala/reflect/internal/Phase.scala b/src/reflect/scala/reflect/internal/Phase.scala index 68dc5ce783..68dc5ce783 100644 --- a/src/compiler/scala/reflect/internal/Phase.scala +++ b/src/reflect/scala/reflect/internal/Phase.scala diff --git a/src/compiler/scala/reflect/internal/Positions.scala b/src/reflect/scala/reflect/internal/Positions.scala index 6ae9b40fcb..6ae9b40fcb 100644 --- a/src/compiler/scala/reflect/internal/Positions.scala +++ b/src/reflect/scala/reflect/internal/Positions.scala diff --git a/src/compiler/scala/reflect/internal/Required.scala b/src/reflect/scala/reflect/internal/Required.scala index abbe8fbfb7..abbe8fbfb7 100644 --- a/src/compiler/scala/reflect/internal/Required.scala +++ b/src/reflect/scala/reflect/internal/Required.scala diff --git a/src/compiler/scala/reflect/internal/Scopes.scala b/src/reflect/scala/reflect/internal/Scopes.scala index ceacd2afb0..ceacd2afb0 100644 --- a/src/compiler/scala/reflect/internal/Scopes.scala +++ b/src/reflect/scala/reflect/internal/Scopes.scala diff --git a/src/compiler/scala/reflect/internal/StdAttachments.scala b/src/reflect/scala/reflect/internal/StdAttachments.scala index 4ea9b27da9..4ea9b27da9 100644 --- a/src/compiler/scala/reflect/internal/StdAttachments.scala +++ b/src/reflect/scala/reflect/internal/StdAttachments.scala diff --git a/src/compiler/scala/reflect/internal/StdCreators.scala b/src/reflect/scala/reflect/internal/StdCreators.scala index 3e6b7c1ab4..3e6b7c1ab4 100644 --- a/src/compiler/scala/reflect/internal/StdCreators.scala +++ b/src/reflect/scala/reflect/internal/StdCreators.scala diff --git a/src/compiler/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 6f68b8f63a..6f68b8f63a 100644 --- a/src/compiler/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala diff --git a/src/compiler/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala index cadd76b1ba..cadd76b1ba 100644 --- a/src/compiler/scala/reflect/internal/SymbolTable.scala +++ b/src/reflect/scala/reflect/internal/SymbolTable.scala diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 86693cf880..86693cf880 100644 --- a/src/compiler/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala diff --git a/src/compiler/scala/reflect/internal/TreeGen.scala b/src/reflect/scala/reflect/internal/TreeGen.scala index c3a6fce164..c3a6fce164 100644 --- a/src/compiler/scala/reflect/internal/TreeGen.scala +++ b/src/reflect/scala/reflect/internal/TreeGen.scala diff --git a/src/compiler/scala/reflect/internal/TreeInfo.scala b/src/reflect/scala/reflect/internal/TreeInfo.scala index 4b2105876d..4b2105876d 100644 --- a/src/compiler/scala/reflect/internal/TreeInfo.scala +++ b/src/reflect/scala/reflect/internal/TreeInfo.scala diff --git a/src/compiler/scala/reflect/internal/TreePrinters.scala b/src/reflect/scala/reflect/internal/TreePrinters.scala index 6d035c8b9d..6d035c8b9d 100644 --- a/src/compiler/scala/reflect/internal/TreePrinters.scala +++ b/src/reflect/scala/reflect/internal/TreePrinters.scala diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala index 11d0790100..11d0790100 100644 --- a/src/compiler/scala/reflect/internal/Trees.scala +++ b/src/reflect/scala/reflect/internal/Trees.scala diff --git a/src/compiler/scala/reflect/internal/TypeDebugging.scala b/src/reflect/scala/reflect/internal/TypeDebugging.scala index 33f6a645e8..33f6a645e8 100644 --- a/src/compiler/scala/reflect/internal/TypeDebugging.scala +++ b/src/reflect/scala/reflect/internal/TypeDebugging.scala diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 23921d73cc..23921d73cc 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala diff --git a/src/compiler/scala/reflect/internal/package.scala b/src/reflect/scala/reflect/internal/package.scala index 99b837152d..99b837152d 100644 --- a/src/compiler/scala/reflect/internal/package.scala +++ b/src/reflect/scala/reflect/internal/package.scala diff --git a/src/compiler/scala/reflect/internal/pickling/ByteCodecs.scala b/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala index 4670bd4eef..4670bd4eef 100644 --- a/src/compiler/scala/reflect/internal/pickling/ByteCodecs.scala +++ b/src/reflect/scala/reflect/internal/pickling/ByteCodecs.scala diff --git a/src/compiler/scala/reflect/internal/pickling/PickleBuffer.scala b/src/reflect/scala/reflect/internal/pickling/PickleBuffer.scala index 7f0895ce64..7f0895ce64 100644 --- a/src/compiler/scala/reflect/internal/pickling/PickleBuffer.scala +++ b/src/reflect/scala/reflect/internal/pickling/PickleBuffer.scala diff --git a/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala b/src/reflect/scala/reflect/internal/pickling/PickleFormat.scala index 16747af08a..16747af08a 100644 --- a/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala +++ b/src/reflect/scala/reflect/internal/pickling/PickleFormat.scala diff --git a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index 757163a074..757163a074 100644 --- a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala diff --git a/src/compiler/scala/reflect/internal/settings/AbsSettings.scala b/src/reflect/scala/reflect/internal/settings/AbsSettings.scala index 9bbba3f079..9bbba3f079 100644 --- a/src/compiler/scala/reflect/internal/settings/AbsSettings.scala +++ b/src/reflect/scala/reflect/internal/settings/AbsSettings.scala diff --git a/src/compiler/scala/reflect/internal/settings/MutableSettings.scala b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala index 8640a23aa7..8640a23aa7 100644 --- a/src/compiler/scala/reflect/internal/settings/MutableSettings.scala +++ b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala diff --git a/src/compiler/scala/reflect/internal/transform/Erasure.scala b/src/reflect/scala/reflect/internal/transform/Erasure.scala index 5beec70d62..5beec70d62 100644 --- a/src/compiler/scala/reflect/internal/transform/Erasure.scala +++ b/src/reflect/scala/reflect/internal/transform/Erasure.scala diff --git a/src/compiler/scala/reflect/internal/transform/RefChecks.scala b/src/reflect/scala/reflect/internal/transform/RefChecks.scala index d6108ab665..d6108ab665 100644 --- a/src/compiler/scala/reflect/internal/transform/RefChecks.scala +++ b/src/reflect/scala/reflect/internal/transform/RefChecks.scala diff --git a/src/compiler/scala/reflect/internal/transform/Transforms.scala b/src/reflect/scala/reflect/internal/transform/Transforms.scala index c4c5dc3a1c..c4c5dc3a1c 100644 --- a/src/compiler/scala/reflect/internal/transform/Transforms.scala +++ b/src/reflect/scala/reflect/internal/transform/Transforms.scala diff --git a/src/compiler/scala/reflect/internal/transform/UnCurry.scala b/src/reflect/scala/reflect/internal/transform/UnCurry.scala index 0c1640ceb9..0c1640ceb9 100644 --- a/src/compiler/scala/reflect/internal/transform/UnCurry.scala +++ b/src/reflect/scala/reflect/internal/transform/UnCurry.scala diff --git a/src/compiler/scala/reflect/internal/util/Collections.scala b/src/reflect/scala/reflect/internal/util/Collections.scala index 1f8eb15c90..1f8eb15c90 100644 --- a/src/compiler/scala/reflect/internal/util/Collections.scala +++ b/src/reflect/scala/reflect/internal/util/Collections.scala diff --git a/src/compiler/scala/reflect/internal/util/HashSet.scala b/src/reflect/scala/reflect/internal/util/HashSet.scala index a771dad2b0..a771dad2b0 100644 --- a/src/compiler/scala/reflect/internal/util/HashSet.scala +++ b/src/reflect/scala/reflect/internal/util/HashSet.scala diff --git a/src/compiler/scala/reflect/internal/util/Origins.scala b/src/reflect/scala/reflect/internal/util/Origins.scala index 0bd5ad55ca..0bd5ad55ca 100644 --- a/src/compiler/scala/reflect/internal/util/Origins.scala +++ b/src/reflect/scala/reflect/internal/util/Origins.scala diff --git a/src/compiler/scala/reflect/internal/util/Position.scala b/src/reflect/scala/reflect/internal/util/Position.scala index 3c251b3b31..3c251b3b31 100644 --- a/src/compiler/scala/reflect/internal/util/Position.scala +++ b/src/reflect/scala/reflect/internal/util/Position.scala diff --git a/src/compiler/scala/reflect/internal/util/Set.scala b/src/reflect/scala/reflect/internal/util/Set.scala index cfc3e7eada..cfc3e7eada 100644 --- a/src/compiler/scala/reflect/internal/util/Set.scala +++ b/src/reflect/scala/reflect/internal/util/Set.scala diff --git a/src/compiler/scala/reflect/internal/util/SourceFile.scala b/src/reflect/scala/reflect/internal/util/SourceFile.scala index 7c80ddd37d..7c80ddd37d 100644 --- a/src/compiler/scala/reflect/internal/util/SourceFile.scala +++ b/src/reflect/scala/reflect/internal/util/SourceFile.scala diff --git a/src/compiler/scala/reflect/internal/util/StatBase.scala b/src/reflect/scala/reflect/internal/util/StatBase.scala index b033ff98bc..b033ff98bc 100644 --- a/src/compiler/scala/reflect/internal/util/StatBase.scala +++ b/src/reflect/scala/reflect/internal/util/StatBase.scala diff --git a/src/compiler/scala/reflect/internal/util/Statistics.scala b/src/reflect/scala/reflect/internal/util/Statistics.scala index ef17327fda..ef17327fda 100644 --- a/src/compiler/scala/reflect/internal/util/Statistics.scala +++ b/src/reflect/scala/reflect/internal/util/Statistics.scala diff --git a/src/compiler/scala/reflect/internal/util/StringOps.scala b/src/reflect/scala/reflect/internal/util/StringOps.scala index 281ade8134..281ade8134 100644 --- a/src/compiler/scala/reflect/internal/util/StringOps.scala +++ b/src/reflect/scala/reflect/internal/util/StringOps.scala diff --git a/src/compiler/scala/reflect/internal/util/TableDef.scala b/src/reflect/scala/reflect/internal/util/TableDef.scala index d692a6d8f5..d692a6d8f5 100644 --- a/src/compiler/scala/reflect/internal/util/TableDef.scala +++ b/src/reflect/scala/reflect/internal/util/TableDef.scala diff --git a/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala b/src/reflect/scala/reflect/internal/util/TraceSymbolActivity.scala index 5fbeb5f576..5fbeb5f576 100644 --- a/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala +++ b/src/reflect/scala/reflect/internal/util/TraceSymbolActivity.scala diff --git a/src/compiler/scala/reflect/internal/util/WeakHashSet.scala b/src/reflect/scala/reflect/internal/util/WeakHashSet.scala index 9882aad5e5..9882aad5e5 100644 --- a/src/compiler/scala/reflect/internal/util/WeakHashSet.scala +++ b/src/reflect/scala/reflect/internal/util/WeakHashSet.scala diff --git a/src/library/scala/reflect/makro/Aliases.scala b/src/reflect/scala/reflect/makro/Aliases.scala index c78c9a6a04..c78c9a6a04 100644 --- a/src/library/scala/reflect/makro/Aliases.scala +++ b/src/reflect/scala/reflect/makro/Aliases.scala diff --git a/src/library/scala/reflect/makro/CapturedVariables.scala b/src/reflect/scala/reflect/makro/CapturedVariables.scala index 592e28b3b2..592e28b3b2 100644 --- a/src/library/scala/reflect/makro/CapturedVariables.scala +++ b/src/reflect/scala/reflect/makro/CapturedVariables.scala diff --git a/src/library/scala/reflect/makro/Context.scala b/src/reflect/scala/reflect/makro/Context.scala index f9858a063c..f9858a063c 100644 --- a/src/library/scala/reflect/makro/Context.scala +++ b/src/reflect/scala/reflect/makro/Context.scala diff --git a/src/library/scala/reflect/makro/Enclosures.scala b/src/reflect/scala/reflect/makro/Enclosures.scala index 69bd8d09c7..69bd8d09c7 100644 --- a/src/library/scala/reflect/makro/Enclosures.scala +++ b/src/reflect/scala/reflect/makro/Enclosures.scala diff --git a/src/library/scala/reflect/makro/Evals.scala b/src/reflect/scala/reflect/makro/Evals.scala index 4e5fc2f97f..4e5fc2f97f 100644 --- a/src/library/scala/reflect/makro/Evals.scala +++ b/src/reflect/scala/reflect/makro/Evals.scala diff --git a/src/library/scala/reflect/makro/ExprUtils.scala b/src/reflect/scala/reflect/makro/ExprUtils.scala index c3e5cc6bc1..c3e5cc6bc1 100644 --- a/src/library/scala/reflect/makro/ExprUtils.scala +++ b/src/reflect/scala/reflect/makro/ExprUtils.scala diff --git a/src/library/scala/reflect/makro/Exprs.scala b/src/reflect/scala/reflect/makro/Exprs.scala index b4f8e7ac4e..b4f8e7ac4e 100644 --- a/src/library/scala/reflect/makro/Exprs.scala +++ b/src/reflect/scala/reflect/makro/Exprs.scala diff --git a/src/library/scala/reflect/makro/FrontEnds.scala b/src/reflect/scala/reflect/makro/FrontEnds.scala index 5087f90174..5087f90174 100644 --- a/src/library/scala/reflect/makro/FrontEnds.scala +++ b/src/reflect/scala/reflect/makro/FrontEnds.scala diff --git a/src/library/scala/reflect/makro/Infrastructure.scala b/src/reflect/scala/reflect/makro/Infrastructure.scala index e6bfe33366..e6bfe33366 100644 --- a/src/library/scala/reflect/makro/Infrastructure.scala +++ b/src/reflect/scala/reflect/makro/Infrastructure.scala diff --git a/src/library/scala/reflect/makro/Names.scala b/src/reflect/scala/reflect/makro/Names.scala index 909976d83c..909976d83c 100644 --- a/src/library/scala/reflect/makro/Names.scala +++ b/src/reflect/scala/reflect/makro/Names.scala diff --git a/src/library/scala/reflect/makro/Parsers.scala b/src/reflect/scala/reflect/makro/Parsers.scala index 9866b7e491..9866b7e491 100644 --- a/src/library/scala/reflect/makro/Parsers.scala +++ b/src/reflect/scala/reflect/makro/Parsers.scala diff --git a/src/library/scala/reflect/makro/Reifiers.scala b/src/reflect/scala/reflect/makro/Reifiers.scala index f39f56f935..f39f56f935 100644 --- a/src/library/scala/reflect/makro/Reifiers.scala +++ b/src/reflect/scala/reflect/makro/Reifiers.scala diff --git a/src/library/scala/reflect/makro/Settings.scala b/src/reflect/scala/reflect/makro/Settings.scala index c6c7e5870b..c6c7e5870b 100644 --- a/src/library/scala/reflect/makro/Settings.scala +++ b/src/reflect/scala/reflect/makro/Settings.scala diff --git a/src/library/scala/reflect/makro/TreeBuilder.scala b/src/reflect/scala/reflect/makro/TreeBuilder.scala index c4179b9c80..c4179b9c80 100644 --- a/src/library/scala/reflect/makro/TreeBuilder.scala +++ b/src/reflect/scala/reflect/makro/TreeBuilder.scala diff --git a/src/library/scala/reflect/makro/TypeTags.scala b/src/reflect/scala/reflect/makro/TypeTags.scala index 3251c27908..3251c27908 100644 --- a/src/library/scala/reflect/makro/TypeTags.scala +++ b/src/reflect/scala/reflect/makro/TypeTags.scala diff --git a/src/library/scala/reflect/makro/Typers.scala b/src/reflect/scala/reflect/makro/Typers.scala index 2610d7dd50..2610d7dd50 100644 --- a/src/library/scala/reflect/makro/Typers.scala +++ b/src/reflect/scala/reflect/makro/Typers.scala diff --git a/src/library/scala/reflect/makro/Universe.scala b/src/reflect/scala/reflect/makro/Universe.scala index ffc4042a0a..ffc4042a0a 100644 --- a/src/library/scala/reflect/makro/Universe.scala +++ b/src/reflect/scala/reflect/makro/Universe.scala diff --git a/src/library/scala/reflect/makro/package.scala b/src/reflect/scala/reflect/makro/package.scala index 3c0e51030e..3c0e51030e 100644 --- a/src/library/scala/reflect/makro/package.scala +++ b/src/reflect/scala/reflect/makro/package.scala diff --git a/src/compiler/scala/reflect/runtime/AbstractFile.scala b/src/reflect/scala/reflect/runtime/AbstractFile.scala index 0f88af1b0a..0f88af1b0a 100644 --- a/src/compiler/scala/reflect/runtime/AbstractFile.scala +++ b/src/reflect/scala/reflect/runtime/AbstractFile.scala diff --git a/src/compiler/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index a8120d220a..a8120d220a 100644 --- a/src/compiler/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala diff --git a/src/compiler/scala/reflect/runtime/JavaUniverse.scala b/src/reflect/scala/reflect/runtime/JavaUniverse.scala index d4a83b960d..d4a83b960d 100644 --- a/src/compiler/scala/reflect/runtime/JavaUniverse.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverse.scala diff --git a/src/compiler/scala/reflect/runtime/ReflectSetup.scala b/src/reflect/scala/reflect/runtime/ReflectSetup.scala index 6e28fc8520..6e28fc8520 100644 --- a/src/compiler/scala/reflect/runtime/ReflectSetup.scala +++ b/src/reflect/scala/reflect/runtime/ReflectSetup.scala diff --git a/src/compiler/scala/reflect/runtime/ReflectionUtils.scala b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala index 4e82fe8ad2..4e82fe8ad2 100644 --- a/src/compiler/scala/reflect/runtime/ReflectionUtils.scala +++ b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala diff --git a/src/compiler/scala/reflect/runtime/Settings.scala b/src/reflect/scala/reflect/runtime/Settings.scala index b247797c6c..b247797c6c 100644 --- a/src/compiler/scala/reflect/runtime/Settings.scala +++ b/src/reflect/scala/reflect/runtime/Settings.scala diff --git a/src/compiler/scala/reflect/runtime/SymbolLoaders.scala b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala index c1cd5d2911..c1cd5d2911 100644 --- a/src/compiler/scala/reflect/runtime/SymbolLoaders.scala +++ b/src/reflect/scala/reflect/runtime/SymbolLoaders.scala diff --git a/src/compiler/scala/reflect/runtime/SymbolTable.scala b/src/reflect/scala/reflect/runtime/SymbolTable.scala index c90665508b..c90665508b 100644 --- a/src/compiler/scala/reflect/runtime/SymbolTable.scala +++ b/src/reflect/scala/reflect/runtime/SymbolTable.scala diff --git a/src/compiler/scala/reflect/runtime/SynchronizedOps.scala b/src/reflect/scala/reflect/runtime/SynchronizedOps.scala index 907c0dd369..907c0dd369 100644 --- a/src/compiler/scala/reflect/runtime/SynchronizedOps.scala +++ b/src/reflect/scala/reflect/runtime/SynchronizedOps.scala diff --git a/src/compiler/scala/reflect/runtime/SynchronizedSymbols.scala b/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala index 3b28ddf42c..3b28ddf42c 100644 --- a/src/compiler/scala/reflect/runtime/SynchronizedSymbols.scala +++ b/src/reflect/scala/reflect/runtime/SynchronizedSymbols.scala diff --git a/src/compiler/scala/reflect/runtime/SynchronizedTypes.scala b/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala index e1eb7a57fe..e1eb7a57fe 100644 --- a/src/compiler/scala/reflect/runtime/SynchronizedTypes.scala +++ b/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala diff --git a/src/compiler/scala/reflect/runtime/TwoWayCache.scala b/src/reflect/scala/reflect/runtime/TwoWayCache.scala index c7bfb3435d..c7bfb3435d 100644 --- a/src/compiler/scala/reflect/runtime/TwoWayCache.scala +++ b/src/reflect/scala/reflect/runtime/TwoWayCache.scala diff --git a/src/compiler/scala/reflect/runtime/package.scala b/src/reflect/scala/reflect/runtime/package.scala index a5809a2629..a5809a2629 100644 --- a/src/compiler/scala/reflect/runtime/package.scala +++ b/src/reflect/scala/reflect/runtime/package.scala diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/reflect/scala/tools/nsc/io/AbstractFile.scala index 3faaeaeaec..fd56608fab 100644 --- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala +++ b/src/reflect/scala/tools/nsc/io/AbstractFile.scala @@ -8,8 +8,7 @@ package scala.tools.nsc package io import java.io.{ FileOutputStream, IOException, InputStream, OutputStream, BufferedOutputStream } -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } import java.net.URL import scala.collection.mutable.ArrayBuffer diff --git a/src/compiler/scala/tools/nsc/io/Directory.scala b/src/reflect/scala/tools/nsc/io/Directory.scala index 0eecd9a6e2..ebd6edc8d8 100644 --- a/src/compiler/scala/tools/nsc/io/Directory.scala +++ b/src/reflect/scala/tools/nsc/io/Directory.scala @@ -9,8 +9,7 @@ package scala.tools.nsc package io -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } object Directory { import scala.util.Properties.{ tmpDir, userHome, userDir } diff --git a/src/compiler/scala/tools/nsc/io/File.scala b/src/reflect/scala/tools/nsc/io/File.scala index 4cea8439b1..eedf92ef98 100644 --- a/src/compiler/scala/tools/nsc/io/File.scala +++ b/src/reflect/scala/tools/nsc/io/File.scala @@ -13,8 +13,7 @@ package io import java.io.{ FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter, BufferedInputStream, BufferedOutputStream, IOException, PrintStream, PrintWriter, Closeable => JCloseable } -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } import java.nio.channels.{ Channel, FileChannel } import scala.io.Codec import language.{reflectiveCalls, implicitConversions} diff --git a/src/compiler/scala/tools/nsc/io/FileOperationException.scala b/src/reflect/scala/tools/nsc/io/FileOperationException.scala index f23658efbc..f23658efbc 100644 --- a/src/compiler/scala/tools/nsc/io/FileOperationException.scala +++ b/src/reflect/scala/tools/nsc/io/FileOperationException.scala diff --git a/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala b/src/reflect/scala/tools/nsc/io/NoAbstractFile.scala index e468356722..04568b0e2e 100644 --- a/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala +++ b/src/reflect/scala/tools/nsc/io/NoAbstractFile.scala @@ -7,8 +7,7 @@ package scala.tools.nsc package io import java.io.InputStream -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } /** A distinguished object so you can avoid both null * and Option. diff --git a/src/compiler/scala/tools/nsc/io/Path.scala b/src/reflect/scala/tools/nsc/io/Path.scala index 1db015e2f5..984c96dfbb 100644 --- a/src/compiler/scala/tools/nsc/io/Path.scala +++ b/src/reflect/scala/tools/nsc/io/Path.scala @@ -9,8 +9,7 @@ package io import java.io.{ FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter, BufferedInputStream, BufferedOutputStream, RandomAccessFile } -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } import java.net.{ URI, URL } import scala.util.Random.alphanumeric import language.implicitConversions diff --git a/src/compiler/scala/tools/nsc/io/PlainFile.scala b/src/reflect/scala/tools/nsc/io/PlainFile.scala index 21276e8740..21276e8740 100644 --- a/src/compiler/scala/tools/nsc/io/PlainFile.scala +++ b/src/reflect/scala/tools/nsc/io/PlainFile.scala diff --git a/src/compiler/scala/tools/nsc/io/Streamable.scala b/src/reflect/scala/tools/nsc/io/Streamable.scala index 03318674ee..03318674ee 100644 --- a/src/compiler/scala/tools/nsc/io/Streamable.scala +++ b/src/reflect/scala/tools/nsc/io/Streamable.scala diff --git a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala b/src/reflect/scala/tools/nsc/io/VirtualDirectory.scala index 0bcb2de43f..0bcb2de43f 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala +++ b/src/reflect/scala/tools/nsc/io/VirtualDirectory.scala diff --git a/src/compiler/scala/tools/nsc/io/VirtualFile.scala b/src/reflect/scala/tools/nsc/io/VirtualFile.scala index 48826ed191..b9a946598c 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualFile.scala +++ b/src/reflect/scala/tools/nsc/io/VirtualFile.scala @@ -8,8 +8,7 @@ package scala.tools.nsc package io import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream } -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } /** This class implements an in-memory file. * diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/reflect/scala/tools/nsc/io/ZipArchive.scala index e61a9ba0da..766b1fd093 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/reflect/scala/tools/nsc/io/ZipArchive.scala @@ -8,8 +8,7 @@ package io import java.net.URL import java.io.{ IOException, InputStream, ByteArrayInputStream } -// [scala-reflect.jar migration note] uncomment when creating scala-reflect.jar -// import java.io.{ File => JFile } +import java.io.{ File => JFile } import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream } import scala.collection.{ immutable, mutable } import annotation.tailrec diff --git a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala index 6e2c0a6c43..857beac7df 100644 --- a/test/files/presentation/memory-leaks/MemoryLeaksTest.scala +++ b/test/files/presentation/memory-leaks/MemoryLeaksTest.scala @@ -37,8 +37,8 @@ object Test extends InteractiveTest { val filename = "usedmem-%tF.txt".format(Calendar.getInstance.getTime) val typerUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/compiler/scala/tools/nsc/typechecker/Typers.scala") - val typesUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/compiler/scala/reflect/internal/Types.scala") - val treesUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/compiler/scala/reflect/internal/Trees.scala") + val typesUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/reflect/scala/reflect/internal/Types.scala") + val treesUnit = AbstractFile.getFile(baseDir.parent.parent.parent.parent / "src/reflect/scala/reflect/internal/Trees.scala") askReload(Seq(new BatchSourceFile(typerUnit), new BatchSourceFile(typesUnit), new BatchSourceFile(treesUnit))) typeCheckWith(treesUnit, new String(treesUnit.toCharArray)) |