diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-07-14 20:45:02 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-07-14 20:45:02 +0000 |
commit | 8f6e0b272393fde6f3f54b7185d2d5e9e064e658 (patch) | |
tree | 15ae70b6e77e6ff4fc85d19e67f537b940781e58 /src/continuations/plugin | |
parent | 173a8a1a06b5736678c189284a2976448e4de139 (diff) | |
download | scala-8f6e0b272393fde6f3f54b7185d2d5e9e064e658.tar.gz scala-8f6e0b272393fde6f3f54b7185d2d5e9e064e658.tar.bz2 scala-8f6e0b272393fde6f3f54b7185d2d5e9e064e658.zip |
Merged revisions 22285,22291,22295-22300,22310,...
Merged revisions
22285,22291,22295-22300,22310,22314-22316,22318-22319,22323,22326,22335,
22347,22355-22359,22361-22362,22371-22373,22393,22396,22409-22411,22416-
22421,22423,22426,22435,22445-22446,22448-22464,22466-22479,22481-22482,
22484,22486-22490,22493,22498-22501,22508-22520,22523-22527,22532,22534,
22536-22540,22542,22544-22545,22549-22550,22556 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22285 | dubochet | 2010-06-14 16:10:43 +0200 (Mon, 14 Jun 2010) | 1 line
Added test case for #432. No review.
........
r22291 | extempore | 2010-06-15 03:46:57 +0200 (Tue, 15 Jun 2010) | 2 lines
A love letter to the inliner. This attempt to fix #3420 may more
closely approximate fixedness. Review by dragos. ........ r22295 |
michelou | 2010-06-15 17:17:10 +0200 (Tue, 15 Jun 2010) | 2 lines
updated version number in build.number file
........
r22296 | michelou | 2010-06-15 17:20:25 +0200 (Tue, 15 Jun 2010) | 2 lines
added Scala examples adapted from UAD book (Android examples) ........
r22297 | dubochet | 2010-06-15 18:08:57 +0200 (Tue, 15 Jun 2010) | 1
line
[scaladoc] Slightly more robust treatment of "code" HTML elements in
Scaladoc comments. No review. ........ r22298 | dubochet | 2010-06-15
18:09:36 +0200 (Tue, 15 Jun 2010) | 1 line
[scaladoc] New display mode for members: ordered by inheritance class.
Review by malayeri. ........ r22299 | prokopec | 2010-06-15 18:15:47
+0200 (Tue, 15 Jun 2010) | 2 lines
Adding primary version of parallel hash tries.
No review.
........
r22300 | michelou | 2010-06-15 20:01:21 +0200 (Tue, 15 Jun 2010) | 2 lines
updated svn props (Android examples)
........
r22310 | prokopec | 2010-06-16 12:07:42 +0200 (Wed, 16 Jun 2010) | 1 line
Fixed hash trie splitting. No review.
........
r22314 | prokopec | 2010-06-16 16:07:07 +0200 (Wed, 16 Jun 2010) | 1 line
Minor changes in parallel hash trie. No review.
........
r22315 | dubochet | 2010-06-16 16:16:31 +0200 (Wed, 16 Jun 2010) | 1 line
[Scaladoc] Self types are printed. Contributed by Manohar
Jonnalagedda. Checked by dubochet. ........ r22316 | michelou |
2010-06-16 16:28:53 +0200 (Wed, 16 Jun 2010) | 2 lines
updated svn properties (Android examples)
........
r22318 | odersky | 2010-06-16 17:36:08 +0200 (Wed, 16 Jun 2010) | 1 line
Imporved printing of private[C] in TreePrinters. No review. ........
r22319 | michelou | 2010-06-16 18:04:43 +0200 (Wed, 16 Jun 2010) | 2
lines
reverted change to avoid merge conflict
........
r22323 | cunei | 2010-06-16 20:36:00 +0200 (Wed, 16 Jun 2010) | 2 lines
temporarily reversing r22260; will be shortly re-committed in two
separate portions. ........ r22326 | cunei | 2010-06-16 20:46:50 +0200
(Wed, 16 Jun 2010) | 2 lines
second part of r22260
........
r22335 | extempore | 2010-06-17 00:14:52 +0200 (Thu, 17 Jun 2010) | 5 lines
The inliner now looks harder for method implementations. In addition
to the receiver, it will find those in directly mixed in traits and
in superclasses. It still won't find those in traits mixed only into
superclasses, as that didn't come quite so easily. Closes #3234 but
I'll be opening up another ticket. Review by dragos. ........ r22347 |
prokopec | 2010-06-18 09:49:14 +0200 (Fri, 18 Jun 2010) | 1 line
Refactorings and hash trie combiners. No review.
........
r22355 | dubochet | 2010-06-18 14:59:39 +0200 (Fri, 18 Jun 2010) | 1 line
[scaladoc] Added linear super types. Review by cunei. ........ r22356
| michelou | 2010-06-18 16:48:39 +0200 (Fri, 18 Jun 2010) | 2 lines
added support for customized ramdisks (Android examples) ........
r22357 | prokopec | 2010-06-18 17:06:17 +0200 (Fri, 18 Jun 2010) | 1
line
Moved parallel collections to library dir, changed sabbus script.
Added `par` to some of the classes. No review. ........ r22358 |
dubochet | 2010-06-18 17:34:35 +0200 (Fri, 18 Jun 2010) | 3 lines
[scaladoc] There is a text filter tool for members (searching on
member name and comment body). Adds button to reset text filter tool. No
review.
Known limitation: filtering of members is blocking on keystroke
leading to sluggish performance on large classes. Scheduler from index
needs to be used for member filtering. ........ r22359 | michelou |
2010-06-18 17:48:05 +0200 (Fri, 18 Jun 2010) | 2 lines
minor docu update (Android examples)
........
r22361 | dubochet | 2010-06-18 18:48:05 +0200 (Fri, 18 Jun 2010) | 1 line
[scaladoc] Abstract members can be filtered in or out. Pointer icons
are less crazy. Review by dubochet. Contributed by Pedro Furlanetto.
........ r22362 | dubochet | 2010-06-18 18:48:34 +0200 (Fri, 18 Jun
2010) | 1 line
[scaladoc] A warning is printed when usecase members have different
names than the real member being commented. Review by odersky.
Contributed by Pedro Furlanetto. ........ r22371 | michelou | 2010-06-20
18:54:24 +0200 (Sun, 20 Jun 2010) | 2 lines
updated busybox 1.8.1->1.16.1 (Android examples)
........
r22372 | michelou | 2010-06-20 18:59:34 +0200 (Sun, 20 Jun 2010) | 2 lines
minor script update (Android examples)
........
r22373 | michelou | 2010-06-20 19:03:52 +0200 (Sun, 20 Jun 2010) | 2 lines
added busybox license notice (Android examples)
........
r22393 | rytz | 2010-06-24 18:43:40 +0200 (Thu, 24 Jun 2010) | 1 line
close #3543
........
r22396 | michelou | 2010-06-25 15:56:23 +0200 (Fri, 25 Jun 2010) | 2 lines
yguard->proguard, more samples (Android examples) ........ r22409 |
michelou | 2010-06-28 19:26:38 +0200 (Mon, 28 Jun 2010) | 2 lines
added missing svn props
........
r22410 | michelou | 2010-06-28 19:37:16 +0200 (Mon, 28 Jun 2010) | 1 line
minor changes (Android examples)
........
r22411 | michelou | 2010-06-28 19:39:18 +0200 (Mon, 28 Jun 2010) | 1 line
fixed #3604
........
r22416 | rytz | 2010-06-29 14:32:45 +0200 (Tue, 29 Jun 2010) | 1 line
close #2413. maybe there's better place to this conversion, therefore
review by odersky. ........ r22417 | michelou | 2010-06-29 15:49:32
+0200 (Tue, 29 Jun 2010) | 2 lines
reverted svn:eol-style to LF (was intentionnal!)
........
r22418 | michelou | 2010-06-29 16:00:36 +0200 (Tue, 29 Jun 2010) | 2 lines
removed warnings (deprecation,unchecked)
........
r22419 | prokopec | 2010-06-29 16:05:59 +0200 (Tue, 29 Jun 2010) | 1 line
Implemented lazy combiners for parallel hash trie. ........ r22420 |
rytz | 2010-06-29 16:19:42 +0200 (Tue, 29 Jun 2010) | 1 line
companion objects of case classes know their name. review by
extempore. close #3579. ........ r22421 | michelou | 2010-06-29 16:43:40
+0200 (Tue, 29 Jun 2010) | 2 lines
Ant script improvements (Android examples)
........
r22423 | michelou | 2010-06-29 21:06:21 +0200 (Tue, 29 Jun 2010) | 2 lines
minor fix (Android examples)
........
r22426 | rytz | 2010-06-30 13:03:00 +0200 (Wed, 30 Jun 2010) | 1 line
moved toScalaRepeatedParam TypeMap to refchecks. no review ........
r22435 | prokopec | 2010-06-30 17:16:49 +0200 (Wed, 30 Jun 2010) | 1
line
Parallel array `map` optimisation. No review.
........
r22445 | extempore | 2010-06-30 22:51:18 +0200 (Wed, 30 Jun 2010) | 1 line
Added forkjoin to partest's classpath to unbreak the build. No review.
........ r22446 | extempore | 2010-07-01 00:57:41 +0200 (Thu, 01 Jul
2010) | 9 lines
Enumeration fixes. There was no way to do reflection-based naming
correctly simply by inspecting method signatures (because a Value from
a different Enumeration stored in a val looks identical to one from
this Enumeration) so I have Value store the outer Enum for comparison
purposes. This won't make anything new uncollectable because they
already have an $outer pointing there. This also simplified the
reflection logic: it's an eq test rather than a series of heuristics.
Closes #3616, #3615. Review by phaller.
........
r22448 | extempore | 2010-07-01 01:56:32 +0200 (Thu, 01 Jul 2010) | 1 line
Test case closes #3440. No review.
........
r22449 | extempore | 2010-07-01 01:56:44 +0200 (Thu, 01 Jul 2010) | 1 line
Removed a test from pending which is also in files. No review.
........ r22450 | extempore | 2010-07-01 02:16:32 +0200 (Thu, 01 Jul
2010) | 4 lines
Although everything now builds for me, the buildbot still fails
on src/dbc for lack of forkjoin.jar. We apparently have invented
non-deterministic jar dependencies. Added forkjoin.jar in another spot,
no review. ........ r22451 | extempore | 2010-07-01 20:28:52 +0200 (Thu,
01 Jul 2010) | 1 line
Test case closes #1845, no review.
........
r22452 | extempore | 2010-07-01 20:29:09 +0200 (Thu, 01 Jul 2010) | 2 lines
Warded off a parser crash on certain invalid programs. Closes #3209,
no review. ........ r22453 | extempore | 2010-07-01 20:29:22 +0200 (Thu,
01 Jul 2010) | 2 lines
Some modifications to ZipFile to make sure the stream is always closed
after iteration. No review. ........ r22454 | extempore | 2010-07-01
20:29:34 +0200 (Thu, 01 Jul 2010) | 1 line
Tweaked a test to pass under java 7. No review.
........
r22455 | extempore | 2010-07-01 20:29:45 +0200 (Thu, 01 Jul 2010) | 4 lines
Test case for #1974, which was fixed at some point even though martin
says in the comments it wouldn't be fixed for 2.8. Take that, things
which think they won't be fixed which really will be. Closes #1974, no
review. ........ r22456 | extempore | 2010-07-01 22:31:45 +0200 (Thu, 01
Jul 2010) | 2 lines
Separate option Ordering into a trait so it can be reused. Closes
#3539, no review. ........ r22457 | extempore | 2010-07-01 22:32:02
+0200 (Thu, 01 Jul 2010) | 2 lines
A crasher in the pattern matcher revealed a flaw in how equality
comparisons were constructed. Closes #3570, no review. ........ r22458 |
extempore | 2010-07-01 22:32:15 +0200 (Thu, 01 Jul 2010) | 2 lines
Removing some dead code from SyncVar and cleaning up a little. Closes
#3490, no review. ........ r22459 | extempore | 2010-07-01 22:32:30
+0200 (Thu, 01 Jul 2010) | 2 lines
Created mutable.SeqLike so as to mix in Cloneable like
mutable.{Set, Map} do. Closes #3590, review by odersky.
........
r22460 | extempore | 2010-07-01 22:32:47 +0200 (Thu, 01 Jul 2010) | 2 lines
Fixed an infinite loop in the xml parser on invalid input. Also found
an off by one bug in Source while fixing it. No review. ........ r22461
| extempore | 2010-07-01 22:33:11 +0200 (Thu, 01 Jul 2010) | 6 lines
Renaming files and inserting dummies to please ant. Note to
committers: whenever there is a source file which does not generate a
classfile whose name and path exactly match the name and path of the
source file, then ant will recompile the file every time it compiles
anything. In this batch there were 7 such files, so any 1-char change
meant an 8-file recompile. Someday we'll be rid of ant, but until
then... no review. ........ r22462 | extempore | 2010-07-01 22:43:32
+0200 (Thu, 01 Jul 2010) | 4 lines
Since the buildbots won't meet me in the middle, am putting the
forkjoin.jar everywhere with the hope/expectation we will see a restoral
of order. Someone should definitely figure out how it is we developed
this non-deterministic dependency. Review by phaller. ........ r22463 |
extempore | 2010-07-01 23:31:21 +0200 (Thu, 01 Jul 2010) | 7 lines
Took a cue from mharrah that we don't need to build global static
data to keep track of something when we know where it's kept. Altered
the Enumeration deserialization scheme to use reflection, preserving
the singleton property by delivering the MODULE$ singleton. This solves
the GC issue and lets us drop synchronization to boot. Also added some
graceful failure for malformed Enumerations. All tests look good but a
second opinion is in order: closes #2214, review by phaller. ........
r22464 | extempore | 2010-07-01 23:39:38 +0200 (Thu, 01 Jul 2010) | 3
lines
Abandoned any pretense of selectivity and put forkjoin.jar on every
compilation path from locker to strap. Review postponed until the
afterlife. ........ r22466 | extempore | 2010-07-02 03:01:44 +0200 (Fri,
02 Jul 2010) | 2 lines
Fail more gracefully on > 22 case class parameters. Closes #3631, no
review. ........ r22467 | extempore | 2010-07-02 05:14:10 +0200 (Fri, 02
Jul 2010) | 3 lines
Test cases close #13, #95. No review.
(That's right, multiple two digit tickets.)
........
r22468 | extempore | 2010-07-02 05:14:22 +0200 (Fri, 02 Jul 2010) | 1 line
Test case for (long ago closed) #2106, no review. ........ r22469 |
extempore | 2010-07-02 05:17:51 +0200 (Fri, 02 Jul 2010) | 1 line
New starr based on r22464, no review.
........
r22470 | extempore | 2010-07-02 06:20:28 +0200 (Fri, 02 Jul 2010) | 2 lines
Normalized protected type aliases before repl printing, so we don't
see things like x.Self. Closes #3193, no review. ........ r22471 |
extempore | 2010-07-02 06:20:44 +0200 (Fri, 02 Jul 2010) | 4 lines
Some more improvement on the error messages when @tailrec fails.
Now it gives a sensible message if the recursive target is actually a
supertype of this, rather than saying the call is not in tail position.
No review. ........ r22472 | extempore | 2010-07-02 08:26:29 +0200 (Fri,
02 Jul 2010) | 3 lines
Made a null output sink and applied it to the recently failing test,
which is displaying non-deterministic output by way of the underlying
parser. No review. ........ r22473 | extempore | 2010-07-02 18:26:05
+0200 (Fri, 02 Jul 2010) | 1 line
Option gets an empty factory like the collections. Closes #3414, no
review. ........ r22474 | dubochet | 2010-07-02 18:31:33 +0200 (Fri, 02
Jul 2010) | 1 line
Partest task will go into verbose debug mode when ant's debug flag is
set. ........ r22475 | dubochet | 2010-07-02 18:38:29 +0200 (Fri, 02 Jul
2010) | 1 line
Closes #1766 (structural method dispatch broken in class with multiple
constructors). Review by prokopec. ........ r22476 | dubochet |
2010-07-02 20:12:33 +0200 (Fri, 02 Jul 2010) | 1 line
Closes #2318 (spurious IllegalAccessException thrown by some
structural calls, caused by Java bug 4071957). Review by malayeri.
........ r22477 | extempore | 2010-07-02 22:50:14 +0200 (Fri, 02 Jul
2010) | 3 lines
A cosmetic change which serves to document that sourcepath can in fact
accept a path. No test because I can't figure out how to make partest
see the srcdirs. Closes #2202, no review. ........ r22478 | extempore |
2010-07-02 22:50:29 +0200 (Fri, 02 Jul 2010) | 6 lines
Routed all places in trunk which look for jar files through the same
function, and then changed the default behavior to recognize jars even
if they don't have a *.jar extension by squinting at the first few
bytes of the file.
Closes #3000 (THE AMAZING TICKET 3000!), review by phaller. ........
r22479 | michelou | 2010-07-02 22:51:14 +0200 (Fri, 02 Jul 2010) | 2
lines
minor changes (Android examples)
........
r22481 | extempore | 2010-07-03 02:56:00 +0200 (Sat, 03 Jul 2010) | 4 lines
When compilation fails because of an unimplemented abstract var, give
a more precise error message about what happened. Also avoid issuing
the same error twice because neither getter nor setter is implemented.
Closes #36, review by rytz. ........ r22482 | extempore | 2010-07-03
07:19:47 +0200 (Sat, 03 Jul 2010) | 1 line
Test case closes #261, no review.
........
r22484 | extempore | 2010-07-04 22:26:55 +0200 (Sun, 04 Jul 2010) | 2 lines
Tightened how the repl prints types so we don't see OverloadedTypes
slip through sometimes. Review by apocalisp. ........ r22486 | prokopec
| 2010-07-05 11:25:39 +0200 (Mon, 05 Jul 2010) | 1 line
Fixes #3580. Review by extempore.
........
r22487 | prokopec | 2010-07-05 12:08:32 +0200 (Mon, 05 Jul 2010) | 1 line
Fixes #3584. No review.
........
r22488 | extempore | 2010-07-05 17:35:46 +0200 (Mon, 05 Jul 2010) | 2 lines
Put a couple null checks in the inliner so it doesn't NPE under
-Ydebug. No review. ........ r22489 | extempore | 2010-07-05 18:00:22
+0200 (Mon, 05 Jul 2010) | 3 lines
The take/drop methods in IndexedSeqOptimized were overridden to call
slice without checking bounds, causing it to fail when the argument is
too large. Restored expected behavior. No review. ........ r22490 |
extempore | 2010-07-05 18:06:36 +0200 (Mon, 05 Jul 2010) | 1 line
A brown bag on the head fix to that last patch. No review. ........
r22493 | michelou | 2010-07-06 12:17:42 +0200 (Tue, 06 Jul 2010) | 2
lines
added support for ProGuard debug/release configs (Android examples)
........ r22498 | dubochet | 2010-07-06 18:07:31 +0200 (Tue, 06 Jul
2010) | 1 line
[scaladoc] Implements documentation of higher-kinded entities. Closes
#3618. Review by moors. ........ r22499 | dubochet | 2010-07-06 18:21:00
+0200 (Tue, 06 Jul 2010) | 1 line
[scaladoc] Hiding full comments in template pages at startup is done
by CSS instead of JavaScript, leading to better performance. Contributed
by Pedro Furlanetto. Review by dubochet. ........ r22500 | dubochet |
2010-07-06 18:29:38 +0200 (Tue, 06 Jul 2010) | 1 line
[scaladoc] Follow-up on review SCL-95. No review. ........ r22501 |
dubochet | 2010-07-06 18:39:31 +0200 (Tue, 06 Jul 2010) | 1 line
[scaladoc] Follow-up on review SCL-110. No review. ........ r22508 |
moors | 2010-07-08 17:58:41 +0200 (Thu, 08 Jul 2010) | 7 lines
closes #2331: the pre-transform in Erasure did not correctly recurse
in the case of a TypeApply.
It simply returned the function, which might very well have been, say,
a Select node, which had to be erased in case the qualifier's type is a
refinement.
(sorry about the whitespace changes)
review by odersky
........
r22509 | moors | 2010-07-08 17:58:47 +0200 (Thu, 08 Jul 2010) | 7 lines
closes #2416. this is a big one... typedAppliedTypeTree performed type
application (beta-reduction) without checking whether that application
was well-kinded
this patch introduces a new subclass of TypeTree: TypeTreeWithDeferredRefCheck, which tracks the type args and type params of a type application when it was beta-reduced during typing without checking that the application was well-kinded -- that check must wait until refchecks, but was never performed since the application had been beta-reduced away
caveat discovered while working on the fix: adapt turned all trees for
which _.isType holds into TypeTree's
review by odersky
........
r22510 | moors | 2010-07-08 17:58:52 +0200 (Thu, 08 Jul 2010) | 2 lines
closes #3247: syntax error regarding context bounds generalized to
include view bounds as we cannot easily be more specific no review
........ r22511 | moors | 2010-07-08 17:58:56 +0200 (Thu, 08 Jul 2010) |
2 lines
closes #3249. exclude method type parameters from java generic
signature of a class review by dragos ........ r22512 | moors |
2010-07-08 17:59:00 +0200 (Thu, 08 Jul 2010) | 2 lines
closes #3374. checkKindBoundsHK did not instantiate hk params far
enough. see also neg/bug1275 review by odersky ........ r22513 | moors |
2010-07-08 17:59:05 +0200 (Thu, 08 Jul 2010) | 5 lines
closes #3399. mergePrefixAndArgs expects types that have equal type
symbols (modulo normalization) but did not normalize these types before
retrieving their typeArgs
this broke the invariant that argss is a regular matrix
review by odersky
........
r22514 | moors | 2010-07-08 17:59:10 +0200 (Thu, 08 Jul 2010) | 15 lines
closes #3477. type arguments that were inferred to be Nothing should
be included in checkBounds. wonder why they weren't in the first place
note that all type parameters must be reported in error messages about
failing type inference, but only type parameters that were inferred
successfully should be substituted
the idea of mapping type parameter symbols to the corresponding type
ref in order to make substitution the identity does not seem to work,
leading to errors like:
src/library/scala/collection/immutable/SortedMap.scala:38:
error: type mismatch; found :
scala.collection.immutable.SortedMap[A,B(in method empty)]
required: scala.collection.immutable.SortedMap[A,B(in trait
SortedMap)]
override def empty: SortedMap[A, B] = SortedMap.empty
^
(I guess that's why they were retracted before, but that wasn't done consistently, leading to #3152 -- my first attempt at fixing the latter lead to this bug... I've assigned #3152 to you Martin, as I can't decide how to fix it.)
review by odersky
........
r22515 | moors | 2010-07-08 17:59:15 +0200 (Thu, 08 Jul 2010) | 5 lines
closes #3486. members of implclasses are clones of the original trait
members, but cloning discards a symbol's typehistory so that javaSig
could not look at the symbol's type before erasure
fixed by having mixin do the cloning at the beginning of erasure and
then updating the symbol's info to transform it to be valid in current
phase
review by odersky
........
r22516 | moors | 2010-07-08 17:59:19 +0200 (Thu, 08 Jul 2010) | 3 lines
closes #3494. don't let type argument for inserted wrapRefArray be
inferred (as the expected element type of the array could be a singleton
type, but that won't be inferred)
review by prokopec
........
r22517 | moors | 2010-07-08 17:59:23 +0200 (Thu, 08 Jul 2010) | 1 line
closes #3507: don't generate manifests where we can't refer to the
existentially bound value ........ r22518 | moors | 2010-07-08 17:59:27
+0200 (Thu, 08 Jul 2010) | 3 lines
closes #742. be more resilient to evil, ill-kinded type applications,
so we don't crash (subst assumes from.length == to.length), and get to
actually telling off the user for writing those nasty, nasty types
review by extempore
........
r22519 | moors | 2010-07-08 17:59:32 +0200 (Thu, 08 Jul 2010) | 2 lines
closes #3622: refchecks erased types without uncurrying them first
review by odersky ........ r22520 | moors | 2010-07-08 17:59:36 +0200
(Thu, 08 Jul 2010) | 1 line
made typechecker logging methods final so they can actually be inlined
........ r22523 | moors | 2010-07-09 02:24:02 +0200 (Fri, 09 Jul 2010) |
3 lines
cleaned up the mess that resulted from cobbling together fixes for
see #3477 and see #3152 adjustTypeArgs and methTypeArgs now return a
LinkedHashMap[Symbol, Option[Type]] TODO: check that type inference
is still just as lightning fast as before ........ r22524 | rytz |
2010-07-09 11:51:03 +0200 (Fri, 09 Jul 2010) | 1 line
close #3649. no review
........
r22525 | rytz | 2010-07-09 11:51:06 +0200 (Fri, 09 Jul 2010) | 1 line
close #3648. default getters for constructor defaults are now static.
however, they still need to live in the companion object to avoid name
conflicts when subclasses also define constructor defaults. review by
odersky. ........ r22526 | prokopec | 2010-07-09 13:31:34 +0200 (Fri, 09
Jul 2010) | 1 line
closes #3603. no review
........
r22527 | prokopec | 2010-07-09 17:06:01 +0200 (Fri, 09 Jul 2010) | 1 line
Closes #3493. Review by extempore.
........
r22532 | michelou | 2010-07-10 06:49:28 +0200 (Sat, 10 Jul 2010) | 2 lines
minor fix in Ant scripts, more samples (Android examples) ........
r22534 | michelou | 2010-07-11 09:45:58 +0200 (Sun, 11 Jul 2010) | 2
lines
updated docu (Android examples)
........
r22536 | phaller | 2010-07-12 10:29:45 +0200 (Mon, 12 Jul 2010) | 1 line
Added test case for #3645. Closes #3645.
........
r22537 | phaller | 2010-07-12 11:08:09 +0200 (Mon, 12 Jul 2010) | 1 line
Added test case for see #3636.
........
r22538 | phaller | 2010-07-12 11:27:59 +0200 (Mon, 12 Jul 2010) | 1 line
Added test case for see #3620.
........
r22539 | phaller | 2010-07-12 11:35:30 +0200 (Mon, 12 Jul 2010) | 1 line
Added test case for see #3628 in pending.
........
r22540 | phaller | 2010-07-12 13:49:28 +0200 (Mon, 12 Jul 2010) | 1 line
Fixed buggy test case. Closes #3551. No review.
........
r22542 | phaller | 2010-07-12 16:13:11 +0200 (Mon, 12 Jul 2010) | 1 line
Updated LinkedBlockingQueue to latest jsr166
version. Verified bug fix using test case in
[http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6806875 JDK bug
report 6806875]. Closes #3629. ........ r22544 | michelou | 2010-07-12
17:57:40 +0200 (Mon, 12 Jul 2010) | 2 lines
removed generics warnings in actors
........
r22545 | moors | 2010-07-12 19:03:03 +0200 (Mon, 12 Jul 2010) | 7 lines
Closes #3653. In uncurry phase, remove IMPLICIT flag from implicit
parameter list. no review
Author: Mark Harrah <dmharrah@gmail.com>
Date: Thu Jul 8 10:30:57 2010 -0400
Source: http://github.com/harrah/scala-starrless/commit/0c7759c95b47cebc6d9fa77cefd34ef638e2706e
Reviewer: moors
........
r22549 | rytz | 2010-07-13 09:14:37 +0200 (Tue, 13 Jul 2010) | 1 line
close #3648 (again). objects extending their companion class can no
longer use default constructor arguments. review by odersky ........
r22550 | michelou | 2010-07-13 12:38:05 +0200 (Tue, 13 Jul 2010) | 2
lines
minor proguard config change (Android examples)
........
r22556 | extempore | 2010-07-14 10:00:03 +0200 (Wed, 14 Jul 2010) | 2 lines
Moved the burden of forgivingness for string slices into StringOps
where it belongs. Review by odersky. ........
Diffstat (limited to 'src/continuations/plugin')
-rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala | 1 | ||||
-rw-r--r-- | src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala index 0c124c9c19..b9afcda3ec 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala @@ -14,6 +14,7 @@ abstract class CPSAnnotationChecker extends CPSUtils { import definitions._ //override val verbose = true + @inline override final def vprintln(x: =>Any): Unit = if (verbose) println(x) /** * Checks whether @cps annotations conform diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala index 57cba6e829..d1a35df04b 100644 --- a/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala +++ b/src/continuations/plugin/scala/tools/selectivecps/CPSUtils.scala @@ -11,8 +11,7 @@ trait CPSUtils { var cpsEnabled = false val verbose: Boolean = System.getProperty("cpsVerbose", "false") == "true" - @inline final def vprintln(x: =>Any): Unit = if (verbose) println(x) - + def vprintln(x: =>Any): Unit = if (verbose) println(x) lazy val MarkerCPSSym = definitions.getClass("scala.util.continuations.cpsSym") lazy val MarkerCPSTypes = definitions.getClass("scala.util.continuations.cpsParam") |