summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1894 from retronym/ticket/6082Adriaan Moors2013-01-143-4/+22
|\ | | | | SI-6082 Conditionally expand @ann(x) to @ann(value = x)
| * SI-6082 Conditionally expand @ann(x) to @ann(value = x)Jason Zaugg2013-01-133-4/+22
| | | | | | | | | | | | | | | | | | ... if the annotation has an argument with the name `value`. Doing so unconditionally obscures error messages. We still require that arguments to ClassFileAnnotations are named, other than for this special case.
* | Merge pull request #1890 from retronym/ticket/5440Adriaan Moors2013-01-143-0/+13
|\ \ | | | | | | SI-5440 Test case for exhaustiveness check
| * | SI-5440 Test case for exhaustiveness checkJason Zaugg2013-01-133-0/+13
| | | | | | | | | | | | Reported against patmatclassic, working in virtpatmat.
* | | Merge pull request #1889 from retronym/ticket/5340Adriaan Moors2013-01-143-1/+36
|\ \ \ | | | | | | | | SI-5340 Change println to log
| * | | SI-5340 Change println to logJason Zaugg2013-01-133-1/+36
| |/ / | | | | | | | | | | | | | | | An esoteric implicit search could trigger an "amb prefix ..." message to standard out. Now the message has been improved and sent to the logger.
* | | Merge pull request #1878 from adriaanm/ticket-6925Adriaan Moors2013-01-145-145/+183
|\ \ \ | | | | | | | | SI-6925 use concrete type in applyOrElse's match's selecto
| * | | clean up synthesizePartialFunctionAdriaan Moors2013-01-103-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement the following review comments by @retronym: - [x] Please clothe this naked assert. - [x] Use match to dissect targs and check isFullyDefined. - [x] Instead of `targs.head`/`targs.last`, use `val argTp :: resTp :: Nil = targs`. - [x] Add a quasi-quote-style comment for `apply`. - [x] Factor out mkCastPreservingAnnotations.
| * | | rework partial function synthesisAdriaan Moors2013-01-092-146/+163
| | | | | | | | | | | | | | | | | | | | no behavioral changes, just highly overdue cleanup some TODOs for further improvements
| * | | SI-6925 use concrete type in applyOrElse's match's selectorAdriaan Moors2013-01-092-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression introduced in 28483739c3: PartialFunction synthesis was broken so that we'd get: ``` scala> def f[T](xs: Set[T]) = xs collect { case x => x } f: [T](xs: Set[T])scala.collection.immutable.Set[_ <: T] ``` rather than ``` scala> def f[T](xs: Set[T]) = xs collect { case x => x } f: [T](xs: Set[T])scala.collection.immutable.Set[T] ```
* | | | Merge pull request #1876 from adriaanm/ticket-5189-infAdriaan Moors2013-01-143-6/+19
|\ \ \ \ | | | | | | | | | | SI-5189 detect unsoundness when inferring type of match
| * | | | SI-5189 detect unsoundness when inferring type of matchAdriaan Moors2013-01-093-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GADT skolems encode type slack that results from pattern matching on variant type constructors I thought they would not longer be relevant after cases have been typed, and since they caused weird issues with the old pattern matcher, I deskolemized in typedCase however, when we don't have an expected type for the match, we need to keep the skolems around until the skolemized type makes it out of the match and it becomes the result of type inference for that match when you do have an expected type, it will propagate to the case-level and the confrontation will thus already take place when typing individual cases
* | | | | Merge pull request #1872 from kzys/jira-6555-2.10.xAdriaan Moors2013-01-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | SI-6555 Scaladoc's class filter shouldn't drop the last character (2.10.x)
| * | | | | SI-6555 Scaladoc's class filter shouldn't drop the last characterKato Kazuyoshi2013-01-091-1/+1
| | |/ / / | |/| | | | | | | | | | | | | The event handler have to wait "keyup", not "keydown".
* | | | | Merge pull request #1860 from heathermiller/issue/6930Adriaan Moors2013-01-141-0/+14
|\ \ \ \ \ | | | | | | | | | | | | SI-6930 adds documentation to reduceLeft in TraversableOnce
| * | | | | SI-6930 adds documentation to reduceLeft in TraversableOnceHeather Miller2013-01-081-0/+14
| | |/ / / | |/| | |
* | | | | Merge pull request #1838 from viktorklang/wip-6905-√Adriaan Moors2013-01-142-4/+28
|\ \ \ \ \ | | | | | | | | | | | | SI-6594 - Switch to sneakyThrows instead of Unsafe.throwException as per...
| * | | | | SI-6905 - Switch to sneakyThrows instead of Unsafe.throwException as per new ↵Viktor Klang2013-01-142-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | jsr166y to avoid issues with Android
* | | | | | Merge pull request #1891 from retronym/ticket/6126Adriaan Moors2013-01-141-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6126 Test case for varargs of tagged primitives.
| * | | | | | SI-6126 Test case for varargs of tagged primitives.Jason Zaugg2013-01-131-0/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This started working after the merge fe1110f. I didn't track down precisely which commit was responsible beyond that.
* | | | | | Merge pull request #1875 from heathermiller/issue/6946Adriaan Moors2013-01-141-15/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6946, SI-6924 Greatly improves IsTraversableLike docs
| * | | | | | SI-6946, SI-6924 Greatly improves IsTraversableLike docsHeather Miller2013-01-091-15/+86
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1882 from JamesIry/SI-5954_2.10.xAdriaan Moors2013-01-1411-0/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-5954 Adds implementation restriction preventing companions in package...
| * | | | | | SI-5954 Implementation restriction preventing companions in package objsJames Iry2013-01-1311-0/+97
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Companion objects (and thus also case classes) in package objects caused an assert about an overloaded symbol when everything was compiled twice. It's a hairy problem that doesn't fit in 2.10.1. So this fix adds an implementation restriction. It also has a test to make sure the error messages are clean and reasonably friendly, and does not catch other things defined in package objects. The test includes a commented out test in case somebody thinks they've solved the underlying problem. A handful of tests were falling afoul of the new implementation restriction. I verified that they do in fact fail on second compile so they aren't false casualties. But they do test real things we'd like to work once the re-compile issue is fixed. So I added a -X flag to disable the implementation restriction and made all the tests accidentally clobbered by the restriction use that flag.
* | | | | | Merge pull request #1866 from JamesIry/SI-6521_2.10.xAdriaan Moors2013-01-141-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixes SI-6521, overrides Range#head to be faster
| * | | | | Fixes SI-6521, overrides Range#head to be fasterDavid Hall2013-01-081-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | Backport of 63ba3d64a7002ef67f7f13083a18fe1042a3adba
* | | | | Merge pull request #1859 from retronym/ticket/6912Paul Phillips2013-01-123-0/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | SI-6912 Avoid a typer cycle in overload resolution.
| * | | | SI-6912 Avoid a typer cycle in overload resolution.Jason Zaugg2013-01-083-0/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c800d1fe, and followup commits 1ddc9358 and b10b5821 modified error handling in `Infer#inferExprAlternative`. After these changes, this method could fail to resolve the overloaded alternative if: best != NoSymbol && !competing.isEmpty && !noAlternatives && pt.isErroneous This commit calls `setError` in that case, which prevents the cycle in `adapt`. While I didn't extract a reproduction from the original code base, I've included a test case that exhibits the same symptom. It was actually pretty tough to find an program that got close to this code path, but luckilly we've been pretty close to this bug in SI-5553 / 4f99c2e5, and those test cases formed the basis for this one.
* | | | Merge pull request #1869 from retronym/backport/1826Paul Phillips2013-01-1152-270/+248
|\ \ \ \ | | | | | | | | | | Backport of SI-6846.
| * | | | Backport of SI-6846.Jason Zaugg2013-01-0852-270/+248
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 55806cc0e6177820c12a35a18b4f2a12dc07bb39 Author: Paul Phillips <paulp@improving.org> Date: Wed Dec 19 07:32:19 2012 -0800 SI-6846, regression in type constructor inference. In 658ba1b4e6 some inference was gained and some was lost. In this commit we regain what was lost and gain even more. Dealiasing and widening should be fully handled now, as illustrated by the test case. (cherry picked from commit dbebcd509e4013ce02655a2687b27d0967b3650e) commit e6ef58447d0f4ef6de956fcc03ee283bb9028c02 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 15:11:29 2012 -0800 Cleaning up type alias usage. I determined that many if not most of the calls to .normalize have no intent beyond dealiasing the type. In light of this I went call site to call site knocking on doors and asking why exactly they were calling any of .normalize .widen.normalize .normalize.widen and if I didn't like their answers they found themselves introduced to 'dropAliasesAndSingleTypes', the recursive widener and dealiaser which I concluded is necessary after all. Discovered that the object called 'deAlias' actually depends upon calling 'normalize', not 'dealias'. Decided this was sufficient cause to rename it to 'normalizeAliases'. Created dealiasWiden and dealiasWidenChain. Dropped dropAliasesAndSingleTypes in favor of methods on Type alongside dealias and widen (Type#dealiasWiden). These should reduce the number of "hey, the type alias doesn't work" bugs. (cherry picked from commit 3bf51189f979eb0dd41744ca844fd12dfdaa0dee) Conflicts: src/compiler/scala/tools/nsc/interpreter/CompletionOutput.scala commit c1d8803cea1523f458730103386d8e14324a9446 Author: Paul Phillips <paulp@improving.org> Date: Sat Dec 22 08:13:48 2012 -0800 Shored up a hidden dealiasing dependency. Like the comment says: // This way typedNew always returns a dealiased type. This // used to happen by accident for instantiations without type // arguments due to ad hoc code in typedTypeConstructor, and // annotations depended on it (to the extent that they worked, // which they did not when given a parameterized type alias // which dealiased to an annotation.) typedTypeConstructor // dealiases nothing now, but it makes sense for a "new" to // always be given a dealiased type. PS: Simply running the test suite is becoming more difficult all the time. Running "ant test" includes time consuming activities of niche interest such as all the osgi tests, but test.suite manages to miss the continuations tests. (cherry picked from commit 422f461578ae0547181afe6d2c0c52ea1071d37b) commit da4748502792b260161baa10939554564c488051 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 12:39:02 2012 -0800 Fix and simplify typedTypeConstructor. Investigating the useful output of devWarning (-Xdev people, it's good for you) led back to this comment: "normalize to get rid of type aliases" You may know that this is not all the normalizing does. Normalizing also turns TypeRefs with unapplied arguments (type constructors) into PolyTypes. That means that when typedParentType would call typedTypeConstructor it would find its parent had morphed into a PolyType. Not that it noticed; it would blithely continue and unwittingly discard the type arguments by way of appliedType (which smoothly logged the incident, thank you appliedType.) The simplification of typedTypeConstructor: There was a whole complicated special treatment of AnyRef here which appears to have become unnecessary. Removed special treatment and lit a candle for regularity. Updated lots of tests regarding newly not-so-special AnyRef. (cherry picked from commit 394cc426c1ff1da53146679b4e2995ece52a133e) commit 1f3c77bacb2fbb3ba9e4ad0a8a733e0f9263b234 Author: Paul Phillips <paulp@improving.org> Date: Fri Dec 21 15:06:10 2012 -0800 Removed dead implementation. Another "attractive nuisance" burning off time until I realized it was commented out. (cherry picked from commit ed40f5cbdf35d09b02898e9c0950b9bd34c1f858)
* | | | Merge pull request #1853 from paulp/issue/6928Paul Phillips2013-01-115-44/+75
|\ \ \ \ | | | | | | | | | | SI-6928, VerifyError with self reference to super.
| * | | | SI-6928, VerifyError with self reference to super.Paul Phillips2013-01-075-44/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug in typers mishandled varargs. We should get more aggressive about eliminating all the ad hoc parameter/argument handling code spread everywhere. For varargs especially: any code which tries to make an adjustment based on a repeated parameter is more likely to be wrong than right. In aggregate these reinventions are a huge source of bugs.
* | | | | Merge pull request #1863 from retronym/ticket/6641-2.10.xPaul Phillips2013-01-112-22/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-6641 Deprecate SwingWorker
| * | | | SI-6641 Deprecate SwingWorkerJason Zaugg2013-01-082-22/+4
| | |/ / | |/| | | | | | | | | | See discussion: https://github.com/scala/scala/pull/1862
* | | | Merge pull request #1787 from vigdorchik/si_6803Adriaan Moors2013-01-083-14/+18
|\ \ \ \ | |/ / / |/| | | SI-6803: do not use java.net.URI, even more so incorrectly.
| * | | SI-6803: do not use java.net.URI, even more so incorrectly.Eugene Vigdorchik2013-01-063-14/+18
| | | |
* | | | Merge pull request #1843 from JamesIry/SI-6915_2.10.xAdriaan Moors2013-01-073-3/+3
|\ \ \ \ | |_|/ / |/| | | SI-6915 Updates copyright properties to 2002-2013
| * | | SI-6915 Updates copyright properties to 2002-2013James Iry2013-01-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .scala header files had the right copyright dates but properties used to generate the information in e.g. "scala -version" hadn't been updated. review @adriaanm
* | | | Merge pull request #1842 from adriaanm/backport-1821Paul Phillips2013-01-062-1/+6
|\ \ \ \ | | | | | | | | | | Backport 1821
| * | | | avoid reflect overhead of certain array instantiationsAdriaan Moors2013-01-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the manifests for Any, Object/AnyRef, AnyVal, Null and Nothing now have their `newArray` methods overridden to avoid reflective overhead of array instantiation. (backport of 45ef0514e, part 2)
| * | | | proper elementClass for WrappedArrayAdriaan Moors2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | (backport of 45ef0514e, part 1)
* | | | | Merge pull request #1834 from paulp/issue/6897Paul Phillips2013-01-062-1/+10
|\ \ \ \ \ | | | | | | | | | | | | SI-6897, lubs and varargs star.
| * | | | | SI-6897, lubs and varargs star.Paul Phillips2012-12-312-1/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Don't allow lubs to calculate refinement types which contain a varargs star outside of legal varargs star position.
* | | | | Merge pull request #1835 from paulp/issue/6896Paul Phillips2013-01-063-11/+21
|\ \ \ \ \ | | | | | | | | | | | | SI-6896, spurious warning with overloaded main.
| * | | | | SI-6896, spurious warning with overloaded main.Paul Phillips2012-12-313-11/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | Make sure there's no legit main signature before issuing any warnings about missing main methods.
* | | | | Merge pull request #1840 from paulp/issue/6911Paul Phillips2013-01-064-73/+122
|\ \ \ \ \ | | | | | | | | | | | | SI-6911, regression in generated case class equality.
| * | | | | SI-6911, regression in generated case class equality.Paul Phillips2013-01-034-73/+122
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caught out by the different semantics of isInstanceOf and pattern matching. trait K { case class CC(name: String) } object Foo extends K object Bar extends K Foo.CC("a") == Bar.CC("a") That expression is supposed to be false, and with this commit it is once again.
* | | | | Merge pull request #1841 from adriaanm/rebase-6827-2.10.xAdriaan Moors2013-01-043-2/+49
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix Iterator#copyToArray (fixes SI-6827).
| * | | | Fix Iterator#copyToArray (fixes SI-6827).Erik Osheim2013-01-043-2/+49
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #scala, when using a non-zero start it's possible to get an ArrayIndexOutOfBoundsException due to an incorrect bounds check. This patch fixes this, as well as another potential bounds error, and adds test cases. Incorporates some other suggestions by Som-Snytt to ensure that callers will get useful error messages in cases where the start parameter is wrong (negative or out-of-array-bounds). Review by @som-snytt.
* | | | Merge pull request #1739 from jedesah/Array_optPaul Phillips2013-01-043-0/+29
|\ \ \ \ | |/ / / |/| | | SI-5017 Poor performance of :+ operator on Arrays
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-11 23:10:35 +0000