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 f8124953ed3a93a58778babb2a032762c6a297b7 Merge: f587000 965d8b7 Author: Mehdi Dogguy <[email protected]> Date: Wed Apr 23 19:14:39 2014 +0200 Merge tag 'upstream/2.10.2+dfsg' Upstream version 2.10.2+dfsg CONTRIBUTING.md | 2 +- README.rst | 13 +- bincompat-backward.whitelist.conf | 61 + bincompat-forward.whitelist.conf | 113 + build.number | 2 +- build.xml | 4107 +++++++------------- lib/forkjoin.jar.desired.sha1 | 2 +- src/actors/scala/actors/remote/TcpService.scala | 29 +- src/build/maven/scala-actors-pom.xml | 3 + src/build/maven/scala-library-pom.xml | 3 + src/build/maven/scala-reflect-pom.xml | 4 +- src/build/maven/scala-swing-pom.xml | 3 + src/build/pack.xml | 22 +- .../scala/reflect/macros/runtime/Aliases.scala | 5 + .../scala/reflect/macros/runtime/Enclosures.scala | 16 +- .../scala/reflect/macros/runtime/Typers.scala | 23 +- .../scala/reflect/macros/util/Traces.scala | 2 - src/compiler/scala/reflect/reify/Errors.scala | 5 + .../scala/reflect/reify/phases/Reshape.scala | 1 + .../scala/reflect/reify/utils/Extractors.scala | 65 +- .../scala/tools/ant/templates/tool-windows.tmpl | 5 +- src/compiler/scala/tools/nsc/Global.scala | 3 +- src/compiler/scala/tools/nsc/ast/DocComments.scala | 5 + src/compiler/scala/tools/nsc/ast/Trees.scala | 57 +- .../scala/tools/nsc/ast/parser/Parsers.scala | 62 +- .../scala/tools/nsc/ast/parser/Scanners.scala | 36 +- .../scala/tools/nsc/ast/parser/TreeBuilder.scala | 11 +- .../scala/tools/nsc/backend/icode/Members.scala | 1 + .../scala/tools/nsc/backend/icode/Opcodes.scala | 19 + .../scala/tools/nsc/backend/jvm/GenASM.scala | 22 +- .../scala/tools/nsc/backend/jvm/GenJVM.scala | 18 +- .../scala/tools/nsc/backend/opt/Inliners.scala | 1 + src/compiler/scala/tools/nsc/doc/Settings.scala | 5 +- .../tools/nsc/doc/base/MemberLookupBase.scala | 33 +- .../scala/tools/nsc/doc/base/comment/Body.scala | 18 +- .../scala/tools/nsc/doc/html/SyntaxHigh.scala | 6 +- .../scala/tools/nsc/doc/html/page/Index.scala | 19 +- .../scala/tools/nsc/doc/html/page/Template.scala | 29 +- .../scala/tools/nsc/doc/html/resource/lib/index.js | 17 +- .../scala/tools/nsc/doc/model/MemberLookup.scala | 25 + .../scala/tools/nsc/doc/model/ModelFactory.scala | 43 +- .../scala/tools/nsc/doc/model/TreeFactory.scala | 13 +- .../nsc/doc/model/diagram/DiagramFactory.scala | 34 +- .../tools/nsc/interactive/CompilerControl.scala | 31 +- .../scala/tools/nsc/interactive/Global.scala | 95 +- .../scala/tools/nsc/interactive/Picklers.scala | 4 +- .../tests/core/PresentationCompilerInstance.scala | 6 +- .../scala/tools/nsc/interpreter/ExprTyper.scala | 12 +- .../scala/tools/nsc/javac/JavaParsers.scala | 14 +- .../scala/tools/nsc/matching/Patterns.scala | 2 +- .../scala/tools/nsc/settings/ScalaSettings.scala | 1 + .../scala/tools/nsc/symtab/SymbolLoaders.scala | 11 +- .../nsc/symtab/classfile/ClassfileParser.scala | 316 +- .../tools/nsc/symtab/classfile/ICodeReader.scala | 9 + .../scala/tools/nsc/symtab/classfile/Pickler.scala | 7 +- .../scala/tools/nsc/transform/Erasure.scala | 3 +- .../scala/tools/nsc/transform/ExplicitOuter.scala | 64 +- .../tools/nsc/transform/SpecializeTypes.scala | 71 +- .../scala/tools/nsc/transform/TailCalls.scala | 14 +- .../scala/tools/nsc/transform/UnCurry.scala | 35 +- .../scala/tools/nsc/transform/patmat/Logic.scala | 644 +++ .../tools/nsc/transform/patmat/MatchAnalysis.scala | 709 ++++ .../tools/nsc/transform/patmat/MatchCodeGen.scala | 258 ++ .../nsc/transform/patmat/MatchOptimization.scala | 615 +++ .../nsc/transform/patmat/MatchTranslation.scala | 674 ++++ .../nsc/transform/patmat/MatchTreeMaking.scala | 614 +++ .../nsc/transform/patmat/PatternMatching.scala | 256 ++ .../scala/tools/nsc/transform/patmat/Solving.scala | 242 ++ .../tools/nsc/typechecker/ContextErrors.scala | 69 +- .../scala/tools/nsc/typechecker/Contexts.scala | 13 +- .../scala/tools/nsc/typechecker/EtaExpansion.scala | 1 + .../scala/tools/nsc/typechecker/Implicits.scala | 134 +- .../scala/tools/nsc/typechecker/Infer.scala | 18 +- .../scala/tools/nsc/typechecker/Macros.scala | 145 +- .../scala/tools/nsc/typechecker/Namers.scala | 8 +- .../tools/nsc/typechecker/NamesDefaults.scala | 32 +- .../tools/nsc/typechecker/PatternMatching.scala | 3876 ------------------ .../scala/tools/nsc/typechecker/RefChecks.scala | 62 +- .../tools/nsc/typechecker/SuperAccessors.scala | 40 +- .../scala/tools/nsc/typechecker/TreeCheckers.scala | 3 + .../tools/nsc/typechecker/TypeDiagnostics.scala | 42 +- .../scala/tools/nsc/typechecker/Typers.scala | 234 +- .../scala/tools/nsc/typechecker/Unapplies.scala | 5 +- .../scala/tools/nsc/util/SimpleTracer.scala | 2 +- src/compiler/scala/tools/nsc/util/TreeSet.scala | 20 +- .../scala/tools/reflect/MacroImplementations.scala | 77 +- .../scala/tools/reflect/ToolBoxFactory.scala | 10 +- .../scala/concurrent/forkjoin/ForkJoinPool.java | 2607 +++++++++---- .../scala/concurrent/forkjoin/ForkJoinTask.java | 356 +- .../concurrent/forkjoin/ForkJoinWorkerThread.java | 20 +- src/library/scala/PartialFunction.scala | 2 +- .../scala/collection/immutable/ListMap.scala | 8 +- .../scala/collection/mutable/ArrayBuffer.scala | 2 +- .../scala/collection/mutable/ArrayOps.scala | 23 +- .../scala/collection/parallel/package.scala | 7 +- src/library/scala/concurrent/Future.scala | 12 +- src/library/scala/concurrent/impl/Future.scala | 2 +- src/library/scala/math/BigInt.scala | 2 +- src/library/scala/math/Ordering.scala | 2 +- src/library/scala/runtime/BoxedUnit.java | 2 + src/library/scala/xml/Utility.scala | 2 +- src/partest/scala/tools/partest/CompilerTest.scala | 2 +- src/partest/scala/tools/partest/DirectTest.scala | 28 +- src/partest/scala/tools/partest/nest/Diff.java | 873 ----- .../scala/tools/partest/nest/DiffPrint.java | 606 --- .../scala/tools/partest/nest/FileManager.scala | 41 +- .../scala/tools/partest/nest/PathSettings.scala | 3 + .../tools/partest/nest/ReflectiveRunner.scala | 5 +- .../scala/tools/partest/nest/RunnerManager.scala | 3 +- src/reflect/scala/reflect/api/Mirrors.scala | 4 +- src/reflect/scala/reflect/api/Symbols.scala | 2 +- src/reflect/scala/reflect/api/TypeTags.scala | 38 +- src/reflect/scala/reflect/api/Types.scala | 2 +- .../reflect/internal/ClassfileConstants.scala | 5 +- .../scala/reflect/internal/Definitions.scala | 2 +- .../reflect/internal/ExistentialsAndSkolems.scala | 77 + src/reflect/scala/reflect/internal/Flags.scala | 14 +- src/reflect/scala/reflect/internal/StdNames.scala | 17 +- src/reflect/scala/reflect/internal/Symbols.scala | 2 +- src/reflect/scala/reflect/internal/TreeInfo.scala | 19 +- src/reflect/scala/reflect/internal/Trees.scala | 5 + src/reflect/scala/reflect/internal/Types.scala | 45 +- .../scala/reflect/internal/transform/UnCurry.scala | 11 +- .../scala/reflect/internal/util/Statistics.scala | 4 +- src/reflect/scala/reflect/macros/Enclosures.scala | 6 +- src/reflect/scala/reflect/macros/Typers.scala | 6 +- .../scala/reflect/runtime/JavaMirrors.scala | 24 +- .../scala/reflect/runtime/JavaUniverse.scala | 2 +- .../scala/reflect/runtime/ReflectionUtils.scala | 12 +- starr.number | 1 + test/debug/OBSOLETE | 0 test/disabled/jvm/scala-concurrent-tck-akka.scala | 391 -- .../akka/src/akka/dispatch/Future.scala | 832 ---- test/disabled/presentation/akka/src/pi.scala | 108 - test/files/jvm/future-spec/FutureTests.scala | 19 + test/files/jvm/t7253.check | 1 + test/files/jvm/t7253/Base_1.scala | 5 + test/files/jvm/t7253/JavaClient_1.java | 9 + test/files/jvm/t7253/ScalaClient_1.scala | 9 + test/files/jvm/t7253/test.scala | 28 + test/files/neg/delayed-init-ref.check | 10 + test/files/neg/delayed-init-ref.flags | 1 + test/files/neg/delayed-init-ref.scala | 42 + test/files/neg/macro-divergence-controlled.check | 4 + .../Impls_Macros_1.scala | 23 + .../neg/macro-divergence-controlled/Test_2.scala | 3 + test/files/neg/macro-qmarkqmarkqmark.check | 13 + test/files/neg/macro-qmarkqmarkqmark.scala | 13 + test/files/neg/macro-without-xmacros-a.check | 6 +- test/files/neg/macro-without-xmacros-b.check | 6 +- test/files/neg/stringinterpolation_macro-neg.check | 2 +- test/files/neg/t414.check | 2 +- test/files/neg/t4879.check | 4 +- test/files/neg/t5510.check | 6 +- test/files/neg/t5663-badwarneq.check | 34 +- test/files/neg/t5663-badwarneq.scala | 18 + test/files/neg/t5856.check | 2 +- test/files/neg/t6040.check | 2 +- test/files/neg/t6323a.check | 6 + test/files/neg/t6771b.check | 6 + test/files/neg/t6771b.scala | 16 + test/files/neg/t6952.check | 4 +- test/files/neg/{t696.check => t696a.check} | 2 +- test/files/neg/t696a.flags | 0 test/files/neg/{t696.scala => t696a.scala} | 0 test/files/neg/t696b.check | 9 + test/files/neg/t696b.flags | 1 + test/files/neg/{t696.scala => t696b.scala} | 7 +- test/files/neg/t7166.check | 4 + test/files/neg/t7166/Impls_Macros_1.scala | 26 + test/files/neg/t7166/Test_2.scala | 3 + test/files/neg/t7171.check | 7 + test/files/neg/t7171.flags | 1 + test/files/neg/t7171.scala | 11 + test/files/neg/t7171b.check | 10 + test/files/neg/t7171b.flags | 1 + test/files/neg/t7171b.scala | 15 + test/files/neg/t7185.check | 7 + test/files/neg/t7185.scala | 3 + test/files/neg/t7235.check | 4 + test/files/neg/t7235.scala | 14 + test/files/neg/t7238.check | 6 + test/files/neg/t7238.scala | 7 + test/files/neg/t7251.check | 4 + test/files/neg/t7251/A_1.scala | 10 + test/files/neg/t7251/B_2.scala | 7 + test/files/neg/t7259.check | 7 + test/files/neg/t7259.scala | 9 + test/files/neg/t7285.check | 13 + test/files/neg/t7285.flags | 1 + test/files/neg/t7285.scala | 55 + test/files/neg/t7289.check | 4 + test/files/neg/t7289.scala | 39 + test/files/neg/t7289_status_quo.check | 22 + test/files/neg/t7289_status_quo.scala | 23 + test/files/neg/t7290.check | 10 + test/files/neg/t7290.flags | 1 + test/files/neg/t7290.scala | 10 + test/files/neg/t7299.check | 7 + test/files/neg/t7299.scala | 6 + test/files/neg/t7325.check | 19 + test/files/neg/t7325.scala | 25 + test/files/neg/t7330.check | 5 + test/files/neg/t7330.scala | 5 + test/files/neg/t7369.check | 13 + test/files/neg/t7369.flags | 1 + test/files/neg/t7369.scala | 43 + test/files/neg/t7385.check | 10 + test/files/neg/t7385.scala | 7 + test/files/neg/t7388.check | 4 + test/files/neg/t7388.scala | 1 + test/files/neg/t7509.check | 12 + test/files/neg/t7509.scala | 4 + test/files/pos/macro-qmarkqmarkqmark.check | 0 test/files/pos/macro-qmarkqmarkqmark.scala | 7 + test/files/pos/spec-t6286.scala | 10 + test/files/pos/t3120/J1.java | 4 + test/files/pos/t3120/J2.java | 4 + test/files/pos/t3120/Q.java | 3 + test/files/pos/t3120/Test.scala | 3 + test/files/{neg => pos}/t5692a.check | 0 test/files/{neg => pos}/t5692a.flags | 0 test/files/{neg => pos}/t5692a/Macros_1.scala | 0 test/files/{neg => pos}/t5692a/Test_2.scala | 0 test/files/{neg => pos}/t5692b.check | 0 test/files/{neg => pos}/t5692b.flags | 0 test/files/{neg => pos}/t5692b/Macros_1.scala | 0 test/files/{neg => pos}/t5692b/Test_2.scala | 0 test/files/pos/t5692c.check | 0 test/files/pos/t5692c.scala | 4 + test/files/pos/t5744/Macros_1.scala | 22 + test/files/pos/t5744/Test_2.scala | 6 + test/files/pos/t5886.scala | 18 + test/files/pos/t6091.flags | 1 + test/files/pos/t6091.scala | 10 + test/files/pos/t6210.flags | 1 + test/files/pos/t6210.scala | 21 + test/files/pos/t6225.scala | 20 + test/files/pos/t6386.scala | 5 + test/files/pos/t6514.scala | 11 + test/files/pos/t6675.flags | 1 + test/files/pos/t6675.scala | 20 + test/files/pos/t6771.flags | 1 + test/files/pos/t6771.scala | 9 + test/files/pos/t6921.scala | 11 + test/files/pos/t7091.scala | 7 + test/files/pos/t7190.scala | 26 + test/files/pos/t7200b.scala | 50 + test/files/pos/t7226.scala | 26 + test/files/pos/t7232.flags | 1 + test/files/pos/t7232/Foo.java | 9 + test/files/pos/t7232/List.java | 4 + test/files/pos/t7232/Test.scala | 5 + test/files/pos/t7232b.flags | 1 + test/files/pos/t7232b/Foo.java | 8 + test/files/pos/t7232b/List.java | 5 + test/files/pos/t7232b/Test.scala | 5 + test/files/pos/t7232c.flags | 1 + test/files/pos/t7232c/Foo.java | 10 + test/files/pos/t7232c/Test.scala | 4 + test/files/pos/t7232d.flags | 1 + test/files/pos/t7232d/Entry.java | 4 + test/files/pos/t7232d/Foo.java | 8 + test/files/pos/t7232d/Test.scala | 4 + test/files/pos/t7233.scala | 14 + test/files/pos/t7233b.scala | 8 + test/files/pos/t7239.scala | 38 + test/files/pos/t7285a.flags | 1 + test/files/pos/t7285a.scala | 83 + test/files/pos/t7329.scala | 1 + test/files/pos/t7369.flags | 1 + test/files/pos/t7369.scala | 37 + test/files/pos/t7377/Client_2.scala | 11 + test/files/pos/t7377/Macro_1.scala | 7 + test/files/pos/t7377b.flags | 1 + test/files/pos/t7377b.scala | 13 + test/files/pos/t7426.scala | 3 + test/files/pos/t7516/A_1.scala | 9 + test/files/pos/t7516/B_2.scala | 4 + test/files/pos/t7517.scala | 22 + test/files/pos/t7532/A_1.java | 6 + test/files/pos/t7532/B_2.scala | 5 + test/files/pos/t7532b/A_1.scala | 7 + test/files/pos/t7532b/B_2.scala | 8 + test/files/pos/xlint1.flags | 1 + test/files/pos/xlint1.scala | 13 + test/files/presentation/doc.check | 50 +- test/files/presentation/doc/doc.scala | 132 +- test/files/presentation/doc/src/Class.scala | 1 + test/files/presentation/doc/src/Test.scala | 1 - test/files/presentation/doc/src/p/Base.scala | 11 + test/files/presentation/doc/src/p/Derived.scala | 9 + test/files/presentation/hyperlinks.check | 137 +- .../presentation/hyperlinks/src/SuperTypes.scala | 32 + test/files/presentation/ide-t1000567.check | 1 + test/files/presentation/ide-t1000567/Runner.scala | 15 + test/files/presentation/ide-t1000567/src/a/a.scala | 5 + test/files/presentation/ide-t1000567/src/b/b.scala | 5 + .../memory-leaks/MemoryLeaksTest.scala | 2 +- test/files/run/classfile-format-51.scala | 126 + test/files/run/inline-ex-handlers.check | 915 +++-- test/files/run/interpolation.scala | 2 +- test/files/run/interpolationMultiline1.scala | 2 +- test/files/run/macro-divergence-spurious.check | 1 + .../macro-divergence-spurious/Impls_Macros_1.scala | 23 + .../run/macro-divergence-spurious/Test_2.scala | 3 + test/files/run/macro-expand-nullary-generic.check | 10 +- test/files/run/macro-expand-tparams-explicit.check | 2 +- test/files/run/macro-expand-tparams-implicit.check | 2 +- test/files/run/macro-expand-tparams-prefix-a.check | 6 +- test/files/run/macro-expand-tparams-prefix-b.check | 4 +- .../files/run/macro-expand-tparams-prefix-c1.check | 4 +- .../files/run/macro-expand-tparams-prefix-c2.check | 4 +- .../files/run/macro-expand-tparams-prefix-d1.check | 2 +- test/files/run/macro-system-properties.check | 26 + test/files/run/macro-system-properties.scala | 16 + test/files/run/macro-undetparams-consfromsls.check | 6 +- test/files/run/macro-undetparams-macroitself.check | 2 +- test/files/run/outertest.scala | 47 +- .../run/reflection-fieldmirror-getsetval.check | 2 +- .../run/reflection-fieldmirror-getsetval.scala | 12 +- test/files/run/repl-colon-type.check | 21 +- test/files/run/repl-colon-type.scala | 4 + test/files/run/resetattrs-this.check | 1 + test/files/run/resetattrs-this.scala | 11 + test/files/run/t3994.scala | 20 + test/files/run/t5527.check | 2 +- test/files/run/t5603.check | 2 +- test/files/run/t5699.check | 11 + test/files/run/t5699.scala | 24 + test/files/run/t5710-1.check | 1 + test/files/run/t5710-1.scala | 15 + test/files/run/t5710-2.check | 1 + test/files/run/t5710-2.scala | 15 + test/files/run/t5923a.check | 3 + test/files/run/t5923a/Macros_1.scala | 14 + test/files/run/t5923a/Test_2.scala | 5 + test/files/run/t5923b.check | 3 + test/files/run/t5923b/Test.scala | 7 + test/files/run/t6028.check | 2 +- test/files/run/t6146b.check | 11 +- test/files/run/t6146b.scala | 3 +- test/files/run/t6223.check | 2 +- test/files/run/t6223.scala | 4 +- test/files/run/t6288.check | 2 +- test/files/run/t6370.scala | 12 + test/files/run/t6440.check | 2 +- test/files/run/t6555.check | 2 +- test/files/run/t6715.scala | 15 + test/files/run/t6725-1.check | 2 + test/files/run/t6725-1.scala | 5 + test/files/run/t6725-2.check | 8 + test/files/run/t6725-2.scala | 6 + test/files/run/t6793.scala | 9 + test/files/run/t6793b.scala | 11 + test/files/run/t6793c.scala | 11 + test/files/run/t6900.scala | 36 + test/files/run/t6935.scala | 14 + test/files/run/t6937.check | 26 + test/files/run/t6937.scala | 12 + test/files/run/t6989.check | 84 +- test/files/run/t6989/JavaClass_1.java | 2 + test/files/run/t7047.check | 0 test/files/run/t7047/Impls_Macros_1.scala | 19 + test/files/run/t7047/Test_2.scala | 3 + test/files/run/t7074.check | 9 + test/files/run/t7074.scala | 15 + test/files/run/t7171.scala | 22 + test/files/run/t7185.check | 34 + test/files/run/t7185.scala | 12 + test/files/run/t7200.scala | 34 + test/files/run/t7214.scala | 57 + test/files/run/t7215.scala | 6 + test/files/run/t7235.check | 4 + test/files/run/t7235.scala | 14 + test/files/run/t7240.check | 0 test/files/run/t7240/Macros_1.scala | 48 + test/files/run/t7240/Test_2.scala | 3 + test/files/run/t7242.scala | 71 + test/files/run/t7246.check | 1 + test/files/run/t7246/Outer.java | 4 + test/files/run/t7246/Test.scala | 16 + test/files/run/t7246b.check | 2 + test/files/run/t7246b/Base.scala | 7 + test/files/run/t7246b/Outer.java | 4 + test/files/run/t7246b/Test.scala | 14 + test/files/run/t7249.check | 1 + test/files/run/t7249.scala | 7 + test/files/run/t7271.check | 12 + test/files/run/t7271.scala | 34 + test/files/run/t7290.scala | 9 + test/files/run/t7291a.check | 1 + test/files/run/t7291a.flags | 0 test/files/run/t7291a.scala | 19 + test/files/run/t7291b.check | 2 + test/files/run/t7291b.flags | 1 + test/files/run/t7291b.scala | 19 + test/files/run/t7319.check | 38 + test/files/run/t7319.scala | 13 + test/files/run/t7325.check | 19 + test/files/run/t7325.scala | 25 + test/files/run/t7341.check | 0 test/files/run/t7341.flags | 1 + test/files/run/t7341.scala | 15 + test/files/run/t7359.check | 1 + test/files/run/t7359/Cyclic_1.java | 3 + test/files/run/t7359/Test_2.scala | 6 + test/files/run/t7398.scala | 31 + test/files/run/test-cpp.check | 146 +- ...tags_without_scala_reflect_typetag_lookup.check | 2 +- ...ut_scala_reflect_typetag_manifest_interop.check | 2 +- test/partest | 4 +- test/{files => pending}/neg/t5353.check | 0 test/{files => pending}/neg/t5353.scala | 0 test/pending/neg/t7441.check | 6 + test/pending/neg/t7441.scala | 7 + test/pending/pos/t7234.scala | 15 + test/pending/pos/t7234b.scala | 20 + test/pending/pos/t7486.scala | 8 + test/pending/run/t6387.check | 1 + test/pending/run/t6387.scala | 16 + test/scaladoc/run/SI-6580.check | 11 + test/scaladoc/run/SI-6580.scala | 32 + test/scaladoc/run/SI-6715.check | 1 + test/scaladoc/run/SI-6715.scala | 15 + test/scaladoc/run/SI-7367.check | 1 + test/scaladoc/run/SI-7367.scala | 25 + test/scaladoc/scalacheck/IndexTest.scala | 7 - tools/stability-test.sh | 29 + 429 files changed, 12974 insertions(+), 12260 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
