diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-04-12 07:44:39 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-04-12 07:44:39 +0000 |
commit | f31eaf606f2f1f524621dacd280abfccb9110f59 (patch) | |
tree | cb7aa7c227e526571a74b92b6b9471032dce4ba5 /test/files/run/spec-absfun.scala | |
parent | 8ff235f9491a4a90969b494a32c1f55c69e2e0a8 (diff) | |
download | scala-f31eaf606f2f1f524621dacd280abfccb9110f59.tar.gz scala-f31eaf606f2f1f524621dacd280abfccb9110f59.tar.bz2 scala-f31eaf606f2f1f524621dacd280abfccb9110f59.zip |
Merged revisions 21396,21401-21439,21441-21448,...
Merged revisions
21396,21401-21439,21441-21448,21450-21453,21455-21456,21459 via svnmerge
from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r21396 | rytz | 2010-04-09 11:51:00 +0200 (Fri, 09 Apr 2010) | 1 line
close #3207. review by odersky
........
r21401 | rytz | 2010-04-09 14:05:11 +0200 (Fri, 09 Apr 2010) | 1 line
minor cleanup in build script. no review
........
r21402 | prokopec | 2010-04-09 14:25:37 +0200 (Fri, 09 Apr 2010) | 1 line
Changes to docs of collections in the `immutable` package. Review by
odersky. ........ r21403 | dragos | 2010-04-09 17:41:19 +0200 (Fri, 09
Apr 2010) | 1 line
Implemented specialized subclassing for traits
........
r21404 | dragos | 2010-04-09 17:41:51 +0200 (Fri, 09 Apr 2010) | 2 lines
More information on type skolems when browsing trees and logged
normalized member. ........ r21405 | dragos | 2010-04-09 17:41:59 +0200
(Fri, 09 Apr 2010) | 1 line
Special-cased 'isHigherKinded' for ThisTypes, in order to get around a
CircularReference error. Reviewed by martin ........ r21406 | dragos |
2010-04-09 17:42:08 +0200 (Fri, 09 Apr 2010) | 1 line
Made 'specialized' a printable flag. No review.
........
r21407 | dragos | 2010-04-09 17:42:16 +0200 (Fri, 09 Apr 2010) | 3 lines
Fixed a cyclic error when specializing Option.
Improved the term transformer to transitively
rewrite specialized calls.
........
r21408 | dragos | 2010-04-09 17:42:24 +0200 (Fri, 09 Apr 2010) | 7 lines
Companion objects of primitive types are now values. Term 'scala.Int'
resolves in bytecode to an instance of 'scala.runtime.Int'. This is
the first step towards replacing strings in @specialized with a proper
list of types, so instead of @specialized("Int, Float") one will write
@specialized(Int, Float). Review by odersky. ........ r21409 | dragos |
2010-04-09 17:42:34 +0200 (Fri, 09 Apr 2010) | 5 lines
Changed the syntax of the specialized annotation: instead of a flaky
string, it now takes a repeated parameter list of primitive types:
@specialized("Int, Double") becomes @specialized(Int, Double). No
review. ........ r21410 | dragos | 2010-04-09 17:42:53 +0200 (Fri, 09
Apr 2010) | 1 line
New starr for primitive companion objects
........
r21411 | dragos | 2010-04-09 17:43:10 +0200 (Fri, 09 Apr 2010) | 3 lines
Fixed retyping of singleton types, replacing invalid symbols by their
updated symbols, as was done for type refs. ........ r21412 | dragos |
2010-04-09 17:43:18 +0200 (Fri, 09 Apr 2010) | 3 lines
Changed default of 'keepsTypeParams' to true. All phases that may
change type parameters have to explicitly override this method. ........
r21413 | dragos | 2010-04-09 17:43:27 +0200 (Fri, 09 Apr 2010) | 5 lines
Changed TreeSymSubstituter from a traverser to
transformer. It now aligns tree nodes that contain
names to the symbol name that was substituted. Before
this change identifiers may refer to one symbol, while
the name they carry would resovlve to another one.
........
r21414 | dragos | 2010-04-09 17:43:35 +0200 (Fri, 09 Apr 2010) | 1 line
Less logging unless '-Ydebug', refactorings.
........
r21415 | dragos | 2010-04-09 17:43:44 +0200 (Fri, 09 Apr 2010) | 4 lines
Added a cast for alias replacement that caused
code to be untypable. The optimization that replaced
an overriding param field with its super field now
downcasts when they don't have the same type.
........
r21416 | dragos | 2010-04-09 17:43:52 +0200 (Fri, 09 Apr 2010) | 3 lines
Brought back stack traces in TypeError. This is
essential when debugging any transformer. Review by
extempore.
........
r21417 | dragos | 2010-04-09 17:44:03 +0200 (Fri, 09 Apr 2010) | 1 line
New starr with the latest fixes to specialization. ........ r21418 |
odersky | 2010-04-09 17:56:35 +0200 (Fri, 09 Apr 2010) | 1 line
Fixed problem in scaladoc which did not expand variables in top-level
classes. ........ r21419 | dragos | 2010-04-09 18:15:45 +0200 (Fri, 09
Apr 2010) | 1 line
Fixed weird character that made its way while fixing merge conflicts.
Sorry 'bout that. No review. ........ r21420 | odersky | 2010-04-09
18:22:02 +0200 (Fri, 09 Apr 2010) | 1 line
Interrupted attempt to fix #2897. I am committing what I have because
the refactorings improve things a little bit. To fix the ticket a
frightening lot more has to be done. ........ r21421 | odersky |
2010-04-09 18:22:40 +0200 (Fri, 09 Apr 2010) | 1 line
@inlined auxiliary typed methods to reduce stack pressure. ........
r21422 | dragos | 2010-04-09 19:10:33 +0200 (Fri, 09 Apr 2010) | 1 line
Turn on specialization by default. No review.
........
r21423 | dubochet | 2010-04-09 19:17:47 +0200 (Fri, 09 Apr 2010) | 1 line
[scaladoc] FIxed issue with wiki parser that prevented parsing of code
blocks. Review by pedrofurla. ........ r21424 | prokopec | 2010-04-09
19:22:58 +0200 (Fri, 09 Apr 2010) | 1 line
Work on mutable collections docs. Review by odersky. ........ r21425 |
odersky | 2010-04-09 19:25:34 +0200 (Fri, 09 Apr 2010) | 1 line
Updated documentation
........
r21426 | odersky | 2010-04-09 19:28:31 +0200 (Fri, 09 Apr 2010) | 1 line
more docs
........
r21427 | odersky | 2010-04-09 19:29:00 +0200 (Fri, 09 Apr 2010) | 1 line
fixed one more issue that prevented variables in companion objects to
be expanded. ........ r21428 | dragos | 2010-04-09 19:36:33 +0200 (Fri,
09 Apr 2010) | 1 line
Turn on specialization by default. No review.
........
r21429 | prokopec | 2010-04-09 19:41:15 +0200 (Fri, 09 Apr 2010) | 1 line
MultiMap and WeakHashMap docs. no review
........
r21430 | extempore | 2010-04-09 21:07:40 +0200 (Fri, 09 Apr 2010) | 1 line
Some tweaks to process to see if it'll fix auxjvm. No review. ........
r21431 | extempore | 2010-04-09 21:26:39 +0200 (Fri, 09 Apr 2010) | 1
line
Fix test with new specialized output, no review.
........
r21432 | prokopec | 2010-04-09 23:00:41 +0200 (Fri, 09 Apr 2010) | 1 line
Docs for MultiMap done. Review by community.p
........
r21433 | prokopec | 2010-04-10 00:09:47 +0200 (Sat, 10 Apr 2010) | 1 line
Docs. No review.
........
r21434 | prokopec | 2010-04-10 14:39:48 +0200 (Sat, 10 Apr 2010) | 1 line
docs. no review
........
r21435 | prokopec | 2010-04-10 17:20:46 +0200 (Sat, 10 Apr 2010) | 1 line
More docs. No review.
........
r21436 | plocinic | 2010-04-10 22:56:07 +0200 (Sat, 10 Apr 2010) | 1 line
Fix windows build. In partest we use UNIX file separators to verify
the results. No review. ........ r21437 | prokopec | 2010-04-10 23:29:20
+0200 (Sat, 10 Apr 2010) | 1 line
Docs. No review.
........
r21438 | extempore | 2010-04-11 02:32:00 +0200 (Sun, 11 Apr 2010) | 14 lines
Introduces scala.tools.cmd providing command line tool infrastructure.
For a quick look at what can be done, see
scala.tools.cmd.Demo
For a more involved, potentially eye-straining look, see
scala.tools.partest.PartestSpec
To experience it through the eyes of Joe Partest User, run
test/partest
Review by community.
........
r21439 | extempore | 2010-04-11 02:32:20 +0200 (Sun, 11 Apr 2010) | 6 lines
Restores the passing of scalac.args and javac.args from ant to partest
for use on all tests, which rytz had astutely pointed out I made
disappear. Long term I think one ought to be able to specify different
arguments for building the compiler and for partest, but now is not the
moment for such grand ambition. No review. ........ r21441 | extempore |
2010-04-11 07:58:32 +0200 (Sun, 11 Apr 2010) | 2 lines
Temporarily reverted r21421 so the build will build again and
hopefully the auxjvm nightly will run. Review by odersky. ........
r21442 | extempore | 2010-04-11 17:45:08 +0200 (Sun, 11 Apr 2010) | 1
line
Some overdue cleanups on Exception. Review by community. ........
r21443 | ilyas | 2010-04-11 17:56:55 +0200 (Sun, 11 Apr 2010) | 1 line
ScalaSigPrinter fixed for multiline string values in annotations
........ r21444 | dubochet | 2010-04-11 18:28:16 +0200 (Sun, 11 Apr
2010) | 1 line
[scaladoc] Refactors Paul's refactorings from r21353 to fit Scaladoc's
design. No review. ........ r21445 | dubochet | 2010-04-11 18:28:39
+0200 (Sun, 11 Apr 2010) | 1 line
[scaladoc] UI tweak: definition classes list is separated by a
different arrow. No review. ........ r21446 | phaller | 2010-04-11
18:30:56 +0200 (Sun, 11 Apr 2010) | 1 line
Completed scaladoc for Reactor and Combinators.
........
r21447 | dubochet | 2010-04-11 18:38:58 +0200 (Sun, 11 Apr 2010) | 1 line
[scaladoc] Fixes efficiency issue in the way pages are generated. This
issue can lead to the same page being generated a very large number
of times and probably explains why building Scaladoc had been so slow
previously. Donna helped identifying the issue, review by malayeri.
........ r21448 | phaller | 2010-04-11 19:43:54 +0200 (Sun, 11 Apr 2010)
| 1 line
Scaladoc clean-ups for various actor and channel types. Actor now
extends InputChannel. Channel now extends CanReply. Review by plocinic.
........ r21450 | phaller | 2010-04-11 20:09:46 +0200 (Sun, 11 Apr 2010)
| 1 line
Made use of random number generator in ForkJoinScheduler's fair mode
thread safe. Review by plocinic. ........ r21451 | dragos | 2010-04-11
20:51:45 +0200 (Sun, 11 Apr 2010) | 1 line
Fixed some position issues and build manager test. No review. ........
r21452 | rytz | 2010-04-11 21:11:40 +0200 (Sun, 11 Apr 2010) | 1 line
moved plugin folder back to 'misc/scala-devel/plugins'. moved bash
completion to scala-tool-support (see r21449). include continuations
in compiler sbaz package. replaced some tabs by spaces. review by
extempore. ........ r21453 | extempore | 2010-04-11 21:45:08 +0200 (Sun,
11 Apr 2010) | 16 lines
Added --update-check option to partest. Now you can automatically
update all the checkfiles with whatever output the tests are
producing. I suppose it goes without saying that this would be easy to
misuse, so let the record show that I accept no responsibility when
someone overwrites all the checkfiles in trunk with their shopping
list and checks it in.
Recommended usage: See some tests fail. Run
partest --failed --show-diff
Verify that all output differs in the expected fashion. Then run
partest --failed --update-check
Mission accomplished. No review.
........
r21455 | extempore | 2010-04-12 00:24:21 +0200 (Mon, 12 Apr 2010) | 2 lines
Reverting r21442 the Exception patch because I think it is the cause
of the deadlocking. Not my greatest weekend. No review. ........ r21456
| extempore | 2010-04-12 05:30:26 +0200 (Mon, 12 Apr 2010) | 1 line
Disabled the test which is hanging the -optimise run. No review.
........ r21459 | extempore | 2010-04-12 08:46:53 +0200 (Mon, 12 Apr
2010) | 1 line
Disabling some more tests which crash under -optimise. No review.
........
Diffstat (limited to 'test/files/run/spec-absfun.scala')
-rw-r--r-- | test/files/run/spec-absfun.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/spec-absfun.scala b/test/files/run/spec-absfun.scala index ab16e8febc..2b780548f5 100644 --- a/test/files/run/spec-absfun.scala +++ b/test/files/run/spec-absfun.scala @@ -37,7 +37,7 @@ class Pair[A](_first: A, _second: A) { def second = _second } -class SpecializedPair[@specialized("Int") A](_first: A, _second: A) { +class SpecializedPair[@specialized(Int) A](_first: A, _second: A) { def first = _first def second = _second } |