[scala-2.10] 82/166: Merge commit 'upstream/2.9.1.dfsg'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Nov 15 12:43:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository scala-2.10.
commit a925b27610d277569f7d950b38a840144b033e5b
Merge: 2f35355 06880a4
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Thu Sep 1 11:41:26 2011 +0200
Merge commit 'upstream/2.9.1.dfsg'
META-INF/MANIFEST.MF | 11 +-
build.number | 4 +-
build.xml | 4 +-
lib/jline.jar | Bin 158463 -> 158705 bytes
project/build.properties | 2 +-
src/actors/scala/actors/Actor.scala | 27 +-
src/compiler/scala/tools/ant/Scalac.scala | 2 +-
.../scala/tools/ant/templates/tool-windows.tmpl | 4 +-
src/compiler/scala/tools/cmd/gen/AnyVals.scala | 23 +-
src/compiler/scala/tools/nsc/Global.scala | 21 +-
src/compiler/scala/tools/nsc/ScriptRunner.scala | 15 +-
src/compiler/scala/tools/nsc/ast/TreeDSL.scala | 6 -
src/compiler/scala/tools/nsc/ast/TreeGen.scala | 2 +-
src/compiler/scala/tools/nsc/ast/TreeInfo.scala | 30 +-
src/compiler/scala/tools/nsc/ast/Trees.scala | 12 +-
.../tools/nsc/ast/parser/SyntaxAnalyzer.scala | 13 +-
.../scala/tools/nsc/backend/JavaPlatform.scala | 19 +-
.../scala/tools/nsc/backend/icode/ICodes.scala | 19 +-
.../scala/tools/nsc/backend/jvm/GenJVM.scala | 28 +-
.../scala/tools/nsc/backend/jvm/GenJVMUtil.scala | 10 +-
.../scala/tools/nsc/doc/Uncompilable.scala | 4 +-
.../scala/tools/nsc/doc/html/HtmlFactory.scala | 1 +
.../scala/tools/nsc/doc/html/HtmlPage.scala | 71 +-
src/compiler/scala/tools/nsc/doc/html/Page.scala | 93 ++
.../scala/tools/nsc/doc/html/page/Index.scala | 70 +-
.../tools/nsc/doc/html/page/IndexScript.scala | 68 ++
.../scala/tools/nsc/doc/html/page/Template.scala | 12 +-
.../tools/nsc/doc/html/resource/lib/template.css | 4 +-
.../scala/tools/nsc/interactive/Global.scala | 5 +-
.../nsc/interpreter/AbstractOrMissingHandler.scala | 41 +
.../scala/tools/nsc/interpreter/CodeHandlers.scala | 71 ++
.../scala/tools/nsc/interpreter/ExprTyper.scala | 125 +++
.../scala/tools/nsc/interpreter/ILoop.scala | 234 +++--
.../scala/tools/nsc/interpreter/ILoopInit.scala | 131 +++
.../scala/tools/nsc/interpreter/IMain.scala | 767 ++++++++-------
.../scala/tools/nsc/interpreter/Imports.scala | 12 +-
.../tools/nsc/interpreter/JLineCompletion.scala | 8 +-
.../scala/tools/nsc/interpreter/JLineReader.scala | 51 +-
.../scala/tools/nsc/interpreter/Line.scala | 2 +-
.../scala/tools/nsc/interpreter/Logger.scala | 18 +
.../scala/tools/nsc/interpreter/LoopCommands.scala | 7 +-
.../tools/nsc/interpreter/MemberHandlers.scala | 47 +-
.../scala/tools/nsc/interpreter/Naming.scala | 64 +-
.../scala/tools/nsc/interpreter/Power.scala | 281 +++---
.../scala/tools/nsc/interpreter/ReplConfig.scala | 47 +-
.../scala/tools/nsc/interpreter/ReplProps.scala | 32 +
.../scala/tools/nsc/interpreter/ReplReporter.scala | 22 +
.../scala/tools/nsc/interpreter/ReplStrings.scala | 2 +-
.../scala/tools/nsc/interpreter/ReplVals.scala | 22 +-
.../scala/tools/nsc/interpreter/SimpleReader.scala | 8 +-
.../scala/tools/nsc/interpreter/package.scala | 9 +-
.../interpreter/session/FileBackedHistory.scala | 13 +-
src/compiler/scala/tools/nsc/io/AbstractFile.scala | 32 +-
.../scala/tools/nsc/io/DaemonThreadFactory.scala | 21 +
src/compiler/scala/tools/nsc/io/File.scala | 37 +-
src/compiler/scala/tools/nsc/io/Path.scala | 46 +-
src/compiler/scala/tools/nsc/io/PlainFile.scala | 20 +-
src/compiler/scala/tools/nsc/io/SourceReader.scala | 50 +-
src/compiler/scala/tools/nsc/io/VirtualFile.scala | 21 +-
src/compiler/scala/tools/nsc/io/ZipArchive.scala | 426 +++-----
src/compiler/scala/tools/nsc/io/package.scala | 40 +-
.../scala/tools/nsc/matching/MatchSupport.scala | 4 +
src/compiler/scala/tools/nsc/matching/Matrix.scala | 13 +-
.../scala/tools/nsc/matching/MatrixAdditions.scala | 54 +-
.../tools/nsc/matching/ParallelMatching.scala | 43 +-
.../scala/tools/nsc/matching/PatternBindings.scala | 42 +-
.../scala/tools/nsc/matching/Patterns.scala | 74 +-
.../tools/nsc/reporters/AbstractReporter.scala | 10 +-
.../tools/nsc/reporters/ConsoleReporter.scala | 9 +-
.../scala/tools/nsc/reporters/Reporter.scala | 120 +--
.../scala/tools/nsc/reporters/StoreReporter.scala | 12 +-
.../tools/nsc/settings/AestheticSettings.scala | 2 +-
.../scala/tools/nsc/settings/MutableSettings.scala | 11 +-
.../scala/tools/nsc/settings/ScalaSettings.scala | 17 +-
.../scala/tools/nsc/settings/Warnings.scala | 62 ++
.../scala/tools/nsc/symtab/BrowsingLoaders.scala | 4 +-
src/compiler/scala/tools/nsc/symtab/Caches.scala | 103 --
.../scala/tools/nsc/symtab/Definitions.scala | 27 +-
src/compiler/scala/tools/nsc/symtab/Names.scala | 6 +-
src/compiler/scala/tools/nsc/symtab/StdNames.scala | 1 -
.../scala/tools/nsc/symtab/SymbolLoaders.scala | 31 +-
.../scala/tools/nsc/symtab/SymbolTable.scala | 22 +-
src/compiler/scala/tools/nsc/symtab/Symbols.scala | 78 +-
.../scala/tools/nsc/symtab/TypeDebugging.scala | 41 +-
src/compiler/scala/tools/nsc/symtab/Types.scala | 528 +++++++---
.../nsc/symtab/classfile/ClassfileParser.scala | 2 +-
.../scala/tools/nsc/transform/Erasure.scala | 96 +-
src/compiler/scala/tools/nsc/transform/Mixin.scala | 23 +-
.../tools/nsc/transform/SpecializeTypes.scala | 1036 +++++++++-----------
.../scala/tools/nsc/transform/UnCurry.scala | 3 +-
.../scala/tools/nsc/typechecker/Contexts.scala | 72 +-
.../scala/tools/nsc/typechecker/EtaExpansion.scala | 2 +-
.../scala/tools/nsc/typechecker/Implicits.scala | 233 +++--
.../scala/tools/nsc/typechecker/Infer.scala | 428 ++++----
.../scala/tools/nsc/typechecker/Namers.scala | 17 +-
.../scala/tools/nsc/typechecker/RefChecks.scala | 164 +++-
.../tools/nsc/typechecker/SyntheticMethods.scala | 8 +
.../tools/nsc/typechecker/TypeDiagnostics.scala | 2 +-
.../scala/tools/nsc/typechecker/Typers.scala | 193 ++--
.../scala/tools/nsc/util/CharArrayReader.scala | 19 +-
src/compiler/scala/tools/nsc/util/ClassPath.scala | 279 +++---
.../scala/tools/nsc/util/MsilClassPath.scala | 8 +-
src/compiler/scala/tools/nsc/util/SourceFile.scala | 2 +-
.../scala/tools/reflect/WrappedProperties.scala | 39 +
src/compiler/scala/tools/util/PathResolver.scala | 35 +-
src/compiler/scala/tools/util/Signallable.scala | 30 +-
src/compiler/scala/tools/util/StringOps.scala | 35 +-
.../tools/selectivecps/SelectiveANFTransform.scala | 5 +-
src/jline/TEST-NOTE.txt | 4 +
src/jline/project/build.properties | 6 +-
src/jline/project/plugins/project/build.properties | 2 +-
.../main/java/scala/tools/jline/UnixTerminal.java | 3 +
.../scala/tools/jline/console/ConsoleReader.java | 30 +-
.../scala/tools/jline/console/CursorBuffer.java | 15 +-
.../main/java/scala/tools/jline/console/Key.java | 2 +
.../java/scala/tools/jline/console/Operation.java | 6 +
.../scala/tools/jline/keybindings.properties | 5 +-
.../scala/tools/jline/console/EditLineTest.java | 48 +-
src/library-aux/scala/Any.scala | 6 +
src/library/scala/Boolean.scala | 2 +
src/library/scala/Byte.scala | 1 +
src/library/scala/Char.scala | 1 +
src/library/scala/Double.scala | 1 +
src/library/scala/Enumeration.scala | 6 +-
src/library/scala/Float.scala | 1 +
src/library/scala/Int.scala | 1 +
src/library/scala/Long.scala | 1 +
src/library/scala/Option.scala | 29 +-
src/library/scala/Predef.scala | 45 +-
src/library/scala/Short.scala | 1 +
src/library/scala/Unit.scala | 5 +-
src/library/scala/collection/GenIterableLike.scala | 2 +-
.../scala/collection/GenIterableViewLike.scala | 6 +-
src/library/scala/collection/GenMapLike.scala | 2 +-
src/library/scala/collection/GenSeqLike.scala | 2 +-
src/library/scala/collection/GenSeqViewLike.scala | 6 +-
src/library/scala/collection/GenSetLike.scala | 10 +-
.../scala/collection/GenTraversableLike.scala | 2 +-
.../scala/collection/GenTraversableViewLike.scala | 6 +-
src/library/scala/collection/Iterator.scala | 10 +-
src/library/scala/collection/SetLike.scala | 2 +-
.../scala/collection/TraversableViewLike.scala | 23 +-
.../scala/collection/immutable/NumericRange.scala | 18 +-
src/library/scala/collection/immutable/Range.scala | 11 +-
.../scala/collection/immutable/Stream.scala | 4 +
.../scala/collection/immutable/StringOps.scala | 10 +
.../scala/collection/immutable/WrappedString.scala | 11 +-
.../scala/collection/mutable/ArrayBuffer.scala | 2 +-
.../scala/collection/mutable/ArrayOps.scala | 2 +-
.../scala/collection/mutable/ArrayStack.scala | 5 +-
src/library/scala/collection/mutable/Builder.scala | 4 +-
.../scala/collection/mutable/FlatHashTable.scala | 6 +-
.../scala/collection/mutable/ListBuffer.scala | 9 +-
.../collection/parallel/mutable/ParHashSet.scala | 4 +-
src/library/scala/io/BufferedSource.scala | 60 +-
src/library/scala/math/BigInt.scala | 7 +-
.../scala/reflect/generic/AnnotationInfos.scala | 2 +-
src/library/scala/reflect/generic/ByteCodecs.scala | 8 -
src/library/scala/reflect/generic/Constants.scala | 2 +-
src/library/scala/reflect/generic/Flags.scala | 39 +-
src/library/scala/reflect/generic/HasFlags.scala | 2 +-
src/library/scala/reflect/generic/Names.scala | 2 +-
.../scala/reflect/generic/PickleBuffer.scala | 2 +-
.../scala/reflect/generic/PickleFormat.scala | 2 +-
src/library/scala/reflect/generic/Scopes.scala | 2 +-
.../reflect/generic/StandardDefinitions.scala | 2 +-
src/library/scala/reflect/generic/StdNames.scala | 2 +-
src/library/scala/reflect/generic/Symbols.scala | 2 +-
src/library/scala/reflect/generic/Trees.scala | 2 +-
src/library/scala/reflect/generic/Types.scala | 2 +-
src/library/scala/reflect/generic/UnPickler.scala | 42 +-
src/library/scala/reflect/generic/Universe.scala | 1 +
.../scala/runtime/NonLocalReturnControl.scala | 4 +-
src/library/scala/runtime/ScalaRunTime.scala | 46 +-
src/library/scala/util/control/NoStackTrace.scala | 6 +-
src/library/scala/xml/pull/XMLEventReader.scala | 2 +-
src/partest/scala/tools/partest/ReplTest.scala | 60 +-
.../partest/{ReplTest.scala => SigTest.scala} | 12 +-
.../scala/tools/partest/nest/ConsoleRunner.scala | 2 +-
.../scala/tools/partest/nest/DirectRunner.scala | 1 -
.../scala/tools/partest/nest/FileManager.scala | 2 +-
src/partest/scala/tools/partest/nest/Worker.scala | 12 +-
src/scalap/scala/tools/scalap/Main.scala | 13 +-
src/swing/scala/swing/RichWindow.scala | 6 +-
test/{files => disabled}/pos/spec-List.scala | 0
test/files/continuations-run/t3501.check | 5 +
test/files/continuations-run/t3501.scala | 15 +
test/files/jvm/actor-sync-send-timeout.scala | 47 +
test/files/jvm/interpreter.check | 6 +-
test/files/jvm/interpreter.scala | 158 +++
test/files/jvm/manifests.check | 2 +-
test/files/neg/abstract-inaccessible.check | 13 +
test/files/neg/abstract-inaccessible.flags | 1 +
test/files/neg/abstract-inaccessible.scala | 9 +
test/files/neg/bug278.check | 2 +-
test/files/neg/bug4419.check | 4 +
test/files/neg/bug4419.scala | 3 +
test/files/neg/bug4533.check | 4 -
test/files/neg/bug4533.scala | 8 -
test/files/neg/bug4584.check | 4 +
test/files/neg/bug4584.scala | 1 +
test/files/neg/bug4727.check | 11 +
test/files/neg/bug4727.scala | 7 +
test/files/neg/bug588.check | 4 +-
test/files/neg/bug752.check | 4 +-
test/files/neg/divergent-implicit.check | 6 +-
test/files/neg/nullary-override.check | 4 +
test/files/neg/nullary-override.flags | 1 +
test/files/neg/nullary-override.scala | 3 +
test/files/neg/t0003.check | 4 +-
test/files/neg/t0015.check | 2 +-
test/files/neg/t2179.check | 9 -
test/files/neg/t2641.check | 12 +-
test/files/neg/t3507.check | 2 +-
test/files/neg/t3774.check | 7 -
test/files/neg/unit2anyref.check | 4 +-
test/files/neg/variances.check | 2 +-
test/files/pos/bug1048.scala | 15 +
test/files/pos/bug1439.flags | 1 +
test/files/pos/{t1439.scala => bug1439.scala} | 3 +-
test/files/pos/bug2094.scala | 31 +
test/files/pos/bug3048.scala | 8 +
test/files/pos/bug3343.scala | 15 +
test/files/pos/bug3528.scala | 8 +
test/files/pos/bug4018.scala | 15 +
test/files/pos/bug4237.scala | 6 +
test/files/pos/bug4501.scala | 14 +
test/files/pos/bug4553.scala | 11 +
test/files/pos/bug4603/J.java | 7 +
test/files/pos/bug4603/S.scala | 8 +
test/files/pos/bug4731.scala | 14 +
test/files/pos/bug4757/A_2.scala | 4 +
test/files/pos/bug4757/B_3.scala | 3 +
test/files/pos/bug4757/P_1.scala | 6 +
test/files/pos/bug4840.flags | 1 +
test/files/pos/bug4840.scala | 13 +
test/files/pos/hk-infer.scala | 37 +
test/files/{neg => pos}/t2179.scala | 0
test/files/{neg => pos}/t3774.scala | 0
test/files/pos/t4547.scala | 4 +
test/files/pos/t4593.scala | 20 +
test/files/pos/t4692.scala | 27 +
test/files/pos/widen-existential.scala | 7 +
test/files/run/bug1048.check | 2 +
test/files/run/bug1048.scala | 21 +
test/files/run/bug2308a.check | 1 +
test/files/run/bug2308a.scala | 7 +
test/files/run/bug4110.check | 2 +
test/files/run/bug4110.scala | 11 +
test/files/run/bug4570.check | 1 +
test/files/run/bug4570.scala | 8 +
test/files/run/bug4656.check | 1 +
test/files/run/bug4656.scala | 13 +
test/files/run/bug4660.scala | 11 +
test/files/run/bug4671.check | 46 +
test/files/run/bug4671.scala | 13 +
test/files/run/bug4697.check | 1 +
test/files/run/bug4697.scala | 8 +
test/files/run/bug4710.check | 7 +
test/files/run/bug4710.scala | 6 +
test/files/run/bug4752.scala | 10 +
test/files/run/constrained-types.check | 2 +-
test/files/run/constrained-types.scala | 5 +-
test/files/run/getClassTest.check | 18 +
test/files/run/getClassTest.scala | 66 ++
test/files/run/null-and-intersect.check | 9 +
test/files/run/null-and-intersect.scala | 34 +
test/files/run/repl-bare-expr.check | 36 +
test/files/run/repl-bare-expr.scala | 16 +
test/files/run/repl-colon-type.check | 57 ++
test/files/run/repl-colon-type.scala | 23 +
test/files/run/repl-parens.check | 61 ++
test/files/run/repl-parens.scala | 27 +
test/files/run/repl-paste-2.check | 3 +
test/files/run/repl-paste.check | 22 +-
test/files/run/repl-paste.scala | 22 +-
test/files/run/repl-power.check | 16 +
test/files/run/repl-power.scala | 10 +
test/files/run/repl-transcript.check | 3 +
test/files/run/run-bug4840.check | 2 +
test/files/run/run-bug4840.flags | 1 +
test/files/run/run-bug4840.scala | 30 +
test/files/run/view-headoption.check | 28 +
test/files/run/view-headoption.scala | 18 +
test/files/scalacheck/range.scala | 7 +
test/files/scalap/caseObject/result.test | 1 +
test/files/specialized/fft.check | 2 +-
test/{files => pending}/pos/no-widen-locals.scala | 2 +
test/pending/pos/those-kinds-are-high.scala | 37 +
test/pending/pos/unapplyGeneric.scala | 11 +
test/pending/run/TestFlatMap.scala | 29 +
test/scaladoc/scala/IndexScriptTest.scala | 52 +
test/scaladoc/scala/IndexTest.scala | 20 -
293 files changed, 6170 insertions(+), 3368 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git
More information about the pkg-java-commits
mailing list