summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* work around optimizer bug SI-5672Adriaan Moors2012-04-141-2/+7
| | | | | | the optimizer generates wrong bytecode for switches in arguments virtpatmat happily emits a switch for a one-case switch, whereas -Xoldpatmat did not this is not the focus of this test, hence the temporary workaround
* Merge commit 'refs/pull/398/head' into developPaul Phillips2012-04-142-4/+4
|\
| * change com.typesafe.config dep to version 0.4.0Havoc Pennington2012-04-132-4/+4
| |
| |
| \
| \
| \
| \
| \
*-----. \ Merge commit 'refs/pull/387/head'; commit 'refs/pull/388/head'; commit ↵Paul Phillips2012-04-1433-762/+1100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'refs/pull/392/head'; commit 'refs/pull/397/head' into develop
| | | | * | Reimplemented shadowing between class membersVlad Ureche2012-04-145-34/+189
| | | | | | | | | | | | | | | | | | | | | | | | and implicit pimped on members. Thanks to Lukas for pointing it out!
| | | | * | Adapted implicits testsuite for SIP18Vlad Ureche2012-04-1412-1/+11
| | | | | |
| | | | * | Fixing the docs.scalap breakageVlad Ureche2012-04-141-0/+2
| | | | | |
| | | * | | SI-5663: Tweak warnings on case class equalsSom Snytt2012-04-134-22/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable testing the sensibility of comparing instances of two case classes. In particular, warn if we detect that the two objects inherit from different case classes. In addition, avoid emitting misleading warnings when comparing "new C".
| | * | | | Improved formatting/display of documentation.Simon Ochsenreither2012-04-1310-705/+705
| | | |_|/ | | |/| | | | | | | | | | | | Made the primary constructors private to prevent them from appearing in ScalaDoc.
| * / | | Adds test and check files for SI-5666. Covers common non-newable types.Simon Ochsenreither2012-04-132-0/+51
| |/ / /
* | | | Merge branch 'develop'Paul Phillips2012-04-14135-549/+962
|\ \ \ \
| | \ \ \
| | \ \ \
| *-. \ \ \ Merge commit 'refs/pull/391/head'; commit 'refs/pull/390/head' into developPaul Phillips2012-04-1490-419/+794
| |\ \ \ \ \
| | | * | | | no longer need -YvirtpatmatAdriaan Moors2012-04-141-1/+1
| | | | | | |
| | | * | | | enable implicit enrichment when typing patternsAdriaan Moors2012-04-135-5/+62
| | | | | | |
| | | * | | | parse patterns, not exprs in interpolatedString's holesAdriaan Moors2012-04-131-7/+13
| | | | | | |
| | * | | | | virtpatmat on by default; chicken out: -XoldpatmatAdriaan Moors2012-04-1470-197/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some tests (unreachability, exhaustivity, @switch annotation checking) are still run under -Xoldpatmat, but that will change before we go into RC mode (then the test/ partest of this commit will be reverted) removed irrelevant dependency on patmat
| | * | | | | virtpatmat: initial CPS supportAdriaan Moors2012-04-145-93/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typers&patmatvirtualizer have ad-hoc support for dropping annotations in a way that makes the CPS plugins happy... this is not ideal, but unless virtpatmat runs after the plugin phases, I don't see how to solve it running virtpatmat after the CPS plugin would mean the pattern matching evaluation cannot be captured by CPS, so it's not even desirable to move it to a later phase - typedIf must lub annotated types - drop selector.tpe's annotations - drop annots in matchEnd's argument type - deal with annots in casts synth by in virtpatmat (drop them from type arg to asInstanceof, recover them using type ascription) - workaround skolemize existential dropping annots CPS is the main reason why typedMatchAnonFun is not used anymore, and PartialFunction synthesis is moved back to uncurry (which is quite painful due to labeldefs being so broken) we can't synth partialfunction during typer since T @cps[U] does not conform to Any, so we can't pass it as a type arg to PartialFunction, so we can't type a cps-transformed PF after the CPS plugin, T @cps[U] becomes ControlContext[...], which is a type we can pass to PartialFunction virtpatmat is now also run until right before uncurry (so, can't use isPastTyper, although it means more or less the same thing -- we don't run after uncurry) the main functional improvements are in the selective ANF transform its treatment of labeldefs was broken: for example, LabelDef L1; LabelDef L2 --> DefDef L1; L1(); DefDef L2; L2() but this does not take into account L1 may jump over L2 to another label since methods always return (or fail), and the ANF transform generates ValDefs to store the result of those method calls, both L1 and L2 would always be executed (so you would run a match with N cases N times, with each partial run starting at a later case) also fixed a couple of weird bugs in selective anf that caused matches to be duplicated (with the duplicate being nested in the original) since label defs are turned into method defs, and later defs will be nested in the flatMap calls on the controlcontext yielded by earlier statements, we reverse the list of method definitions, so that earlier (in the control flow sense) methods are visible in later ones selective CPS now generates a catch that's directly digestible by backend
| | * | | | | wip: put skeleton for typetag-based typetests in placeAdriaan Moors2012-04-143-7/+78
| | | | | | |
| | * | | | | more prudent bridging to unapply[Seq]Adriaan Moors2012-04-143-10/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we can't statically know whether the unapply we'll be bridging to is synthetic, drop this condition, and do pessimistic bridging for all unapply[Seq] (i.e., if we can't statically guarantee the type that would be assumed to be safe to cast to by a synthetic extractor, do the type test and return None if it fails)
| | * | | | | synth PartialFunction in uncurryAdriaan Moors2012-04-146-99/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to interaction with the CPS plugin, can't synth PartialFun during typer (the types don't work out: in PartialFun[T, U @cps[V]], U @cps[V] does not conform to Any, and we can't move the annot from the type arg directly to applyOrElse's result, since then it won't override anything) thus, we face the pain of mangling labeldefs again resetLocalAttrsKeepLabels can't use leaveAlone don't cast matcherror throw, uncurry gets confused uncurry: cast selector valdef's rhs to avoid skolem mismatch NOTE: I'm not happy about this code, but I don't know how to make the clean way (typedMatchAnonFun) compatible with the CPS plugin one avenue to explor would be to introduce PartialFunCPS, which is transformed into a regular PartialFun when T @cps[U] is turned into ControlContext[T, U]
| | * | | | | cleanup in refchecksAdriaan Moors2012-04-141-1/+2
| | | | | | |
| | * | | | | print labeldef's parameter typesAdriaan Moors2012-04-141-1/+11
| | | |_|_|/ | | |/| | |
| * | | | | Merge commit '625397b02e'; commit 'refs/pull/396/head' into developPaul Phillips2012-04-1442-110/+148
| |\ \ \ \ \
| | * | | | | restores some disabled macro tests, makes checkFeature synchronous when used ↵Eugene Burmako2012-04-1442-110/+148
| | |/ / / / | | | | | | | | | | | | | | | | | | for macros
| * / / / / Added NameTree Tree interface.Paul Phillips2012-04-143-20/+20
| |/ / / /
* / / / / Move primitive widening implicits to companions.Paul Phillips2012-04-148-25/+58
|/ / / / | | | | | | | | | | | | | | | | Take a 15-implicit load off Predef and put it where it belongs: on those brave souls who like their longs to get floaty by way of T.
* | | | Merge commit 'refs/pull/395/head'Paul Phillips2012-04-148-4/+8
|\ \ \ \
| * | | | disabling scaladoc tests. Don't know how to fix them to make them work under ↵Martin Odersky2012-04-138-4/+8
| | | | | | | | | | | | | | | | | | | | SIP 18.
| * | | | one more macro test sdisabled that lipped through the net before.Martin Odersky2012-04-133-0/+0
| | | | |
* | | | | One more macro test to disable for SIP 18.Paul Phillips2012-04-143-0/+0
| | | | |
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge commit 'refs/pull/389/head'; commit 'refs/pull/393/head' into developPaul Phillips2012-04-1414-16/+407
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| | * | | | DynamicProxy: improved docs, fixed EOL styleChristopher Vogt2012-04-144-160/+167
| | | | | |
| | * | | | implemented DynamicProxy as portrayed by the Scala reflection teamChristopher Vogt2012-04-145-2/+162
| | | |/ / | | |/| |
| * | | | rule out sequence arg to applyDynamicAdriaan Moors2012-04-135-7/+38
| | | | |
| * | | | implement SIP Type DynamicAdriaan Moors2012-04-136-14/+207
| | |/ / | |/| |
* | | | disabled failing macro test; needs to be adapted to new scheme.Martin Odersky2012-04-134-0/+0
| | | |
* | | | Disabled macro neg tests that no longer make sense in this formMartin Odersky2012-04-1351-0/+0
| | | |
* | | | Merge branch 'master' into topic/sip18Martin Odersky2012-04-13154-866/+3028
|\ \ \ \
| * | | | Renamed seven files.Paul Phillips2012-04-137-0/+0
| | |/ / | |/| | | | | | | | | | | | | | Hey everyone, if classnames don't match filenames, ant will recompile said file on every run until the end of time. Still here, ant is.
| * | | Small cleanup in typeref toStringPaul Phillips2012-04-131-4/+4
| | | |
| * | | Touching the untouchable.Paul Phillips2012-04-132-25/+54
| | | | | | | | | | | | | | | | | | | | extempore thinks polymorphism beats boolean constructor parameters any day of the week.
| | | |
| | \ \
| *-. \ \ Merge commit 'refs/pull/385/head'; commit 'refs/pull/386/head' into developPaul Phillips2012-04-1343-434/+2184
| |\ \ \ \ | | | |/ / | | |/| |
| | | * | Scaladoc feature that shows implicit conversionsVlad Ureche2012-04-1341-263/+2001
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/VladUreche/scala/tree/feature/doc-implicits for the history. See https://scala-webapps.epfl.ch/jenkins/view/scaladoc/job/scaladoc-implicits-nightly/ for nightlies. Many thanks fly out to Adriaan for his help with implicit search!
| | * | | performance counters for macros expansionsEugene Burmako2012-04-132-171/+183
| | | | |
| * | | | Portability changes to binary-repo-lib.sh.Paul Phillips2012-04-131-2/+8
| | | | |
| * | | | Introducing some whitespace before colons.Paul Phillips2012-04-132-17/+5
| | |/ / | |/| | | | | | | | | | Maybe helping -Xcheckinit along too.
| * | | Fixes https://scala-webapps.epfl.ch/jenkins/job/scala-checkin-rangpos/404/Eugene Burmako2012-04-131-2/+1
| |/ /
| * | Fix for failing test.Paul Phillips2012-04-131-2/+2
| | |
| * | Merge commit 'refs/pull/383/head' into developPaul Phillips2012-04-139-76/+133
| |\ \
| | * | Add managed blockers to execution contexts.aleksandar2012-04-131-1/+17
| | | |