[Pkg-scala-commits] [scala] 08/15: Merge tag 'upstream/2.10.4+dfsg'
Mehdi Dogguy
mehdi at moszumanska.debian.org
Wed Apr 23 21:31:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository scala.
commit 72010bf4a71e19fd4f04935cef1740aa7eb22d40
Merge: 81f447c fe0c68f
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Wed Apr 23 19:19:25 2014 +0200
Merge tag 'upstream/2.10.4+dfsg'
Upstream version 2.10.4+dfsg
.gitignore | 1 +
bincompat-backward.whitelist.conf | 217 +---
bincompat-forward.whitelist.conf | 1274 +-------------------
build.examples.xml | 283 -----
build.number | 2 +-
build.xml | 59 +-
docs/LICENSE | 36 +
docs/README | 58 +-
docs/examples/actors/auction.scala | 131 --
docs/examples/actors/boundedbuffer.scala | 37 -
docs/examples/actors/channels.scala | 32 -
docs/examples/actors/fringe.scala | 82 --
docs/examples/actors/links.scala | 47 -
docs/examples/actors/looping.scala | 26 -
docs/examples/actors/message.scala | 40 -
docs/examples/actors/pingpong.scala | 61 -
docs/examples/actors/producers.scala | 114 --
docs/examples/actors/seq.scala | 15 -
docs/examples/boundedbuffer.scala | 46 -
docs/examples/computeserver.scala | 54 -
.../examples/expressions/expressions-current.scala | 68 --
docs/examples/fors.scala | 112 --
docs/examples/futures.scala | 17 -
docs/examples/gadts.scala | 22 -
docs/examples/iterators.scala | 28 -
docs/examples/jolib/Ref.scala | 55 -
docs/examples/jolib/parallelOr.scala | 58 -
docs/examples/maps.scala | 187 ---
docs/examples/monads/callccInterpreter.scala | 86 --
docs/examples/monads/directInterpreter.scala | 55 -
docs/examples/monads/errorInterpreter.scala | 86 --
docs/examples/monads/simpleInterpreter.scala | 75 --
docs/examples/monads/stateInterpreter.scala | 86 --
docs/examples/oneplacebuffer.scala | 64 -
docs/examples/parsing/ArithmeticParser.scala | 57 -
docs/examples/parsing/ArithmeticParsers.scala | 70 --
docs/examples/parsing/JSON.scala | 44 -
docs/examples/parsing/ListParser.scala | 33 -
docs/examples/parsing/ListParsers.scala | 30 -
docs/examples/parsing/MiniML.scala | 52 -
docs/examples/parsing/lambda/Main.scala | 34 -
docs/examples/parsing/lambda/TestParser.scala | 68 --
docs/examples/parsing/lambda/TestSyntax.scala | 86 --
docs/examples/parsing/lambda/test/test-01.kwi | 1 -
docs/examples/parsing/lambda/test/test-02.kwi | 1 -
docs/examples/parsing/lambda/test/test-03.kwi | 1 -
docs/examples/parsing/lambda/test/test-04.kwi | 1 -
docs/examples/parsing/lambda/test/test-05.kwi | 1 -
docs/examples/parsing/lambda/test/test-06.kwi | 1 -
docs/examples/parsing/lambda/test/test-07.kwi | 1 -
docs/examples/parsing/lambda/test/test-08.kwi | 1 -
docs/examples/patterns.scala | 36 -
docs/examples/pilib/elasticBuffer.scala | 77 --
docs/examples/pilib/handover.scala | 186 ---
docs/examples/pilib/mobilePhoneProtocol.scala | 172 ---
docs/examples/pilib/piNat.scala | 89 --
docs/examples/pilib/rwlock.scala | 329 -----
docs/examples/pilib/scheduler.scala | 150 ---
docs/examples/pilib/semaphore.scala | 72 --
docs/examples/pilib/twoPlaceBuffer.scala | 67 -
docs/examples/plugintemplate/.classpath | 11 -
docs/examples/plugintemplate/.project | 18 -
docs/examples/plugintemplate/build.xml | 265 ----
docs/examples/plugintemplate/doc/README | 68 --
.../plugintemplate/examples/BasicExample.scala | 8 -
.../plugintemplate/lib/scalatest.jar.desired.sha1 | 1 -
.../examples/plugintemplate/misc/scalac-plugin.xml | 4 -
docs/examples/plugintemplate/plugin.properties | 10 -
.../src/plugintemplate/PluginProperties.scala | 61 -
.../plugintemplate/TemplateAnnotationChecker.scala | 20 -
.../src/plugintemplate/TemplateComponent.scala | 35 -
.../TemplateInfoTransformComponent.scala | 79 --
.../src/plugintemplate/TemplatePlugin.scala | 52 -
.../TemplateTransformComponent.scala | 58 -
.../plugintemplate/TemplateTraverseComponent.scala | 32 -
.../src/plugintemplate/standalone/Main.scala | 44 -
.../plugintemplate/standalone/PluginRunner.scala | 36 -
.../plugintemplate/PluginPropertiesSuite.scala | 14 -
.../test/plugintemplate/TemplatePluginSuite.scala | 22 -
docs/examples/sort.scala | 48 -
docs/examples/sort1.scala | 22 -
docs/examples/sort2.scala | 25 -
docs/examples/swing/ButtonApp.scala | 24 -
docs/examples/swing/CelsiusConverter.scala | 42 -
docs/examples/swing/CelsiusConverter2.scala | 36 -
docs/examples/swing/ComboBoxes.scala | 86 --
docs/examples/swing/CountButton.scala | 30 -
docs/examples/swing/Dialogs.scala | 176 ---
docs/examples/swing/GridBagDemo.scala | 64 -
docs/examples/swing/HelloWorld.scala | 13 -
docs/examples/swing/LabelTest.scala | 19 -
docs/examples/swing/LinePainting.scala | 53 -
docs/examples/swing/ListViewDemo.scala | 17 -
docs/examples/swing/SimpleApplet.scala | 18 -
docs/examples/swing/SwingApp.scala | 29 -
docs/examples/swing/TableSelection.scala | 96 --
docs/examples/swing/UIDemo.scala | 147 ---
docs/examples/swing/images/banana.jpg | Bin 6000 -> 0 bytes
docs/examples/swing/images/margarita1.jpg | Bin 14770 -> 0 bytes
docs/examples/swing/images/margarita2.jpg | Bin 17310 -> 0 bytes
docs/examples/swing/images/rose.jpg | Bin 13808 -> 0 bytes
docs/examples/tcpoly/collection/HOSeq.scala | 167 ---
docs/examples/tcpoly/monads/Monads.scala | 69 --
docs/examples/typeinf.scala | 253 ----
docs/examples/xml/phonebook/embeddedBook.scala | 26 -
docs/examples/xml/phonebook/phonebook.scala | 38 -
docs/examples/xml/phonebook/phonebook1.scala | 21 -
docs/examples/xml/phonebook/phonebook2.scala | 25 -
docs/examples/xml/phonebook/phonebook3.scala | 81 --
docs/examples/xml/phonebook/verboseBook.scala | 24 -
docs/licenses/apache_android.txt | 16 -
docs/licenses/apache_ant.txt | 16 -
docs/licenses/apache_jansi.txt | 203 ++++
docs/licenses/bsd_asm.txt | 31 +
docs/licenses/bsd_jline.txt | 2 +-
src/asm/scala/tools/asm/MethodWriter.java | 7 +-
src/build/maven/maven-deploy.xml | 20 +
src/build/pack.xml | 2 +-
.../scala/tools/ant/templates/tool-windows.tmpl | 17 +-
.../scala/tools/nsc/ast/parser/Parsers.scala | 7 +-
.../scala/tools/nsc/ast/parser/Scanners.scala | 5 +-
.../scala/tools/nsc/backend/icode/GenICode.scala | 5 +-
.../scala/tools/nsc/backend/icode/Members.scala | 4 +
.../scala/tools/nsc/backend/jvm/GenASM.scala | 38 +-
.../nsc/backend/opt/DeadCodeElimination.scala | 8 +-
.../tools/nsc/interactive/CompilerControl.scala | 23 +-
.../scala/tools/nsc/interactive/ContextTrees.scala | 65 +-
.../scala/tools/nsc/interactive/Global.scala | 47 +-
.../scala/tools/nsc/interactive/Picklers.scala | 2 +-
.../scala/tools/nsc/interactive/REPL.scala | 2 +-
.../nsc/interactive/tests/InteractiveTest.scala | 2 +-
.../nsc/interactive/tests/core/AskCommand.scala | 23 +-
.../nsc/interactive/tests/core/CoreTestDefs.scala | 47 +-
.../nsc/interactive/tests/core/TestMarker.scala | 4 +-
.../nsc/interpreter/AbstractFileClassLoader.scala | 16 +-
.../scala/tools/nsc/interpreter/ILoop.scala | 28 +-
.../scala/tools/nsc/symtab/BrowsingLoaders.scala | 6 +-
.../tools/nsc/symtab/classfile/ICodeReader.scala | 7 +-
.../scala/tools/nsc/transform/Erasure.scala | 21 +-
.../scala/tools/nsc/transform/UnCurry.scala | 12 +-
.../tools/nsc/typechecker/ContextErrors.scala | 10 +-
.../tools/nsc/typechecker/NamesDefaults.scala | 9 +-
.../scala/tools/nsc/typechecker/RefChecks.scala | 14 +-
.../scala/tools/nsc/typechecker/Typers.scala | 48 +-
.../scala/tools/reflect/ToolBoxFactory.scala | 9 +-
src/library/scala/MatchError.scala | 10 +-
src/library/scala/collection/TraversableLike.scala | 2 +-
.../generic/GenericClassTagCompanion.scala | 2 +-
.../collection/generic/GenericCompanion.scala | 2 +-
.../generic/GenericOrderedCompanion.scala | 2 +-
.../scala/collection/immutable/TrieIterator.scala | 2 +-
.../scala/collection/parallel/ParSeqLike.scala | 2 +-
.../scala/concurrent/ExecutionContext.scala | 2 +-
src/library/scala/concurrent/Future.scala | 5 +-
src/reflect/scala/reflect/api/Universe.scala | 10 +-
src/reflect/scala/reflect/internal/Kinds.scala | 3 +-
src/reflect/scala/reflect/internal/Symbols.scala | 13 +-
src/reflect/scala/reflect/internal/Types.scala | 37 +-
src/swing/scala/swing/Publisher.scala | 2 +-
starr.number | 3 +-
test/{files => disabled}/presentation/doc.check | 0
.../{files => disabled}/presentation/doc/doc.scala | 0
.../presentation/doc/src/Class.scala | 0
.../presentation/doc/src/p/Base.scala | 0
.../presentation/doc/src/p/Derived.scala | 0
test/disabled/run/t6026.check | 9 +
test/disabled/run/t6026.scala | 9 +
test/files/android/HelloAndroid.scala | 16 -
test/files/android/HelloAndroid.xml | 11 -
test/files/{neg => disabled}/t7020.check | 0
test/files/{neg => disabled}/t7020.flags | 0
test/files/{neg => disabled}/t7020.scala | 0
test/files/jvm/future-spec/PromiseTests.scala | 4 +-
test/files/jvm/scala-concurrent-tck.scala | 4 +-
test/files/neg/applydynamic_sip.check | 8 +-
.../neg/classmanifests_new_deprecations.check | 8 +-
test/files/neg/macro-invalidimpl-f.check | 2 +-
test/files/neg/macro-invalidimpl-g.check | 2 +-
test/files/neg/macro-invalidret-nontree.check | 2 +-
.../neg/macro-invalidret-nonuniversetree.check | 2 +-
.../neg/macro-invalidsig-context-bounds.check | 5 +-
test/files/neg/macro-invalidsig-ctx-badargc.check | 2 +-
test/files/neg/macro-invalidsig-ctx-badtype.check | 2 +-
.../neg/macro-invalidsig-ctx-badvarargs.check | 2 +-
test/files/neg/macro-invalidsig-ctx-noctx.check | 2 +-
.../neg/macro-invalidsig-implicit-params.check | 5 +-
.../neg/macro-invalidsig-params-badargc.check | 2 +-
.../neg/macro-invalidsig-params-badtype.check | 2 +-
.../neg/macro-invalidsig-params-badvarargs.check | 2 +-
.../neg/macro-invalidsig-params-namemismatch.check | 2 +-
.../neg/macro-invalidsig-tparams-badtype.check | 2 +-
.../neg/macro-invalidsig-tparams-notparams-a.check | 2 +-
.../neg/macro-invalidsig-tparams-notparams-b.check | 2 +-
test/files/neg/t5689.check | 2 +-
test/files/neg/t6426.check | 7 -
test/files/neg/t6426.scala | 5 -
test/files/neg/t6563.check | 4 +
test/files/neg/t6563.scala | 8 +
test/files/neg/t7519-b.check | 4 +
test/files/neg/t7519-b/Mac_1.scala | 14 +
test/files/neg/t7519-b/Use_2.scala | 8 +
test/files/neg/t7519.check | 7 +
test/files/neg/t7519.scala | 18 +
test/files/neg/t7783.check | 16 +
test/files/neg/t7783.flags | 1 +
test/files/neg/t7783.scala | 15 +
test/files/neg/t8104a.check | 4 +
test/files/neg/t8104a/Macros_1.scala | 23 +
test/files/neg/t8104a/Test_2.scala | 20 +
test/files/neg/t8104b.check | 4 +
test/files/neg/t8104b/Macros_1.scala | 23 +
test/files/neg/t8104b/Test_2.scala | 24 +
test/files/neg/t8146-non-finitary-2.check | 9 +
test/files/neg/t8146-non-finitary-2.scala | 8 +
test/files/neg/t8146-non-finitary.check | 9 +
test/files/neg/t8146-non-finitary.scala | 7 +
test/files/pos/SI-4012-a.scala | 7 +
test/files/pos/SI-4012-b.scala | 15 +
test/files/pos/t7776.check | 0
test/files/pos/t7776.scala | 12 +
test/files/pos/t7815.scala | 30 +
test/files/pos/t7902.scala | 17 +
test/files/pos/t8060.scala | 11 +
test/files/pos/t8062.flags | 1 +
test/files/pos/t8062/A_1.scala | 5 +
test/files/pos/t8062/B_2.scala | 3 +
test/files/pos/t8111.scala | 24 +
test/files/pos/t8138.scala | 24 +
test/files/pos/t8146a.scala | 9 +
test/files/pos/t8146b.scala | 77 ++
test/files/pos/t8152-performance.scala | 13 +
test/files/presentation/callcc-interpreter.check | 2 +-
...349.check => completion-implicit-chained.check} | 27 +-
.../completion-implicit-chained/Test.scala | 3 +
.../src/Completions.scala | 12 +
test/files/presentation/ide-bug-1000349.check | 2 +-
test/files/presentation/ide-bug-1000475.check | 6 +-
test/files/presentation/ide-bug-1000531.check | 2 +-
test/files/presentation/ide-t1001388.check | 1 +
test/files/presentation/ide-t1001388/Test.scala | 28 +
test/files/presentation/ide-t1001388/src/a/A.scala | 6 +
test/files/presentation/implicit-member.check | 2 +-
test/files/presentation/ping-pong.check | 4 +-
test/files/presentation/scope-completion-1.check | 19 +
.../presentation/scope-completion-1/Test.scala | 3 +
.../scope-completion-1/src/Completions.scala | 12 +
test/files/presentation/scope-completion-2.check | 33 +
.../presentation/scope-completion-2/Test.scala | 3 +
.../scope-completion-2/src/Completions.scala | 31 +
test/files/presentation/scope-completion-3.check | 111 ++
.../presentation/scope-completion-3/Test.scala | 3 +
.../scope-completion-3/src/Completions.scala | 106 ++
test/files/presentation/scope-completion-4.check | 293 +++++
.../presentation/scope-completion-4/Test.scala | 3 +
.../scope-completion-4/src/Completions.scala | 84 ++
.../presentation/scope-completion-import.check | 193 +++
.../scope-completion-import/Test.scala | 3 +
.../scope-completion-import/src/Completions.scala | 72 ++
test/files/presentation/t5708.check | 2 +-
test/files/presentation/t7548.check | 1 +
test/files/presentation/t7548/Test.scala | 17 +
test/files/presentation/t7548/src/Foo.scala | 7 +
test/files/presentation/t7548b.check | 1 +
test/files/presentation/t7548b/Test.scala | 17 +
test/files/presentation/t7548b/src/Foo.scala | 12 +
test/files/presentation/t7915.check | 11 +
test/files/presentation/t7915/Test.scala | 8 +
test/files/presentation/t7915/src/Foo.scala | 9 +
test/files/presentation/t8085.check | 3 +
test/files/presentation/t8085.flags | 1 +
test/files/presentation/t8085/Test.scala | 27 +
.../presentation/t8085/src/nodescala/Foo.scala | 3 +
.../t8085/src/nodescala/NodeScalaSuite.scala | 10 +
.../presentation/t8085/src/nodescala/package.scala | 7 +
test/files/presentation/t8085b.check | 3 +
test/files/presentation/t8085b.flags | 1 +
test/files/presentation/t8085b/Test.scala | 27 +
.../presentation/t8085b/src/p1/nodescala/Foo.scala | 4 +
.../t8085b/src/p1/nodescala/NodeScalaSuite.scala | 11 +
.../t8085b/src/p1/nodescala/package.scala | 9 +
test/files/presentation/visibility.check | 10 +-
test/files/run/dynamic-applyDynamic.check | 14 +
test/files/run/dynamic-applyDynamic.scala | 26 +
test/files/run/dynamic-applyDynamicNamed.check | 14 +
test/files/run/dynamic-applyDynamicNamed.scala | 26 +
test/files/run/dynamic-selectDynamic.check | 13 +
test/files/run/dynamic-selectDynamic.scala | 25 +
test/files/run/dynamic-updateDynamic.check | 14 +
test/files/run/dynamic-updateDynamic.scala | 28 +
test/files/run/large_code.check | 3 +
test/files/run/large_code.scala | 24 +
test/files/run/t4542.check | 3 -
test/files/run/t6546.flags | 1 +
test/files/run/t6546/A_1.scala | 6 +
test/files/run/t6546/B_2.scala | 8 +
test/files/run/t7439.check | 1 +
test/files/run/t7439/A_1.java | 3 +
test/files/run/t7439/B_1.java | 3 +
test/files/run/t7439/Test_2.scala | 31 +
test/files/run/t7912.scala | 16 +
test/files/run/t8010.scala | 22 +
test/files/run/t8029.scala | 57 +
test/files/run/t8114.scala | 15 +
test/files/run/toolbox_rangepos.check | 1 +
test/files/run/toolbox_rangepos.scala | 8 +
.../reflect/internal/util/SourceFileTest.scala | 58 +
306 files changed, 2930 insertions(+), 7986 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-scala/packages/scala.git
More information about the Pkg-scala-commits
mailing list