summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-7494 Tests for status quoSom Snytt2013-05-1963-143/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exploit SI-6446 fix to move old pending tests for plugins to the active pool. Also, nuance the partest runner to allow the compiler to crash with a FatalError if a check file is present. Some of the plugin tests make phase assembly throw. One of the legacy tests was moved back to pending: There seems to be a race for who shall be deemed truly dependent. Back to pending for you! apm@mara:~/projects/snytt/test$ ./partest files/neg/t7494-cyclic-dependency/ Selected 1 tests drawn from specified tests > starting 1 test in neg ok 1 - neg/t7494-cyclic-dependency 1/1 passed (elapsed time: 00:00:04) Test Run PASSED apm@mara:~/projects/snytt/test$ ./partest files/neg/t7494-cyclic-dependency/ Selected 1 tests drawn from specified tests > starting 1 test in neg !! 1 - neg/t7494-cyclic-dependency [output differs] > 0/1 passed, 1 failed in neg >>>>> Transcripts from failed tests >>>>> > partest files/neg/t7494-cyclic-dependency % scalac t7494-cyclic-dependency/ThePlugin.scala % scalac t7494-cyclic-dependency/sample_2.scala error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice! % diff files/neg/t7494-cyclic-dependency-neg.log files/neg/t7494-cyclic-dependency.check @@ -1 +1 @@ -error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice! +error: Cycle in compiler phase dependencies detected, phase cyclicdependency2 reacted twice! 0/1 passed, 1 failed (elapsed time: 00:00:04) Test Run FAILED
* SI-7494 Each plugin must only be instantiated once.Som Snytt2013-05-181-7/+4
| | | | | | | | | | | | | | | | | | | | | The old behavior was that Plugin.loadAllFrom took a distinct list of plugin locations. The broken behavior incorrectly punted to the pruning algorithm in Plugins.loadPlugins$pick. The new behavior is to distinctify the list of class names to load. This is more robust; under the old scheme, specifying the continuations.jar under two file names would fail as described in the ticket. Pruning a plugin by disabling (-Xplugin-disable) or because it steps on someone else's phase name suffers the same defect. There is no way to tell the plugin it has been benched. And you know that global I gave you? Can I have it back?
* Merge pull request #2552 from retronym/topic/restore-murmurJason Zaugg2013-05-173-2/+211
|\ | | | | Revert deprecations that break SBT
| * Unprivatize methods in SyncVar.Jason Zaugg2013-05-171-2/+4
| | | | | | | | | | | | These are still used in SBT 0.13.0-M2. This is a partial revert of ac990c1bc.
| * Revert "SI-7469 Remove @deprecated MurmurHash elements"Jason Zaugg2013-05-172-0/+207
| | | | | | | | | | | | | | This reverts commit 7e9c21ffd38711c23f89b5650cc5a32cafe4cd20. This is still used by SBT; we'll give it a touch longer to switch to Murmur3.
* | Merge pull request #2545 from paulp/issue/7482aPaul Phillips2013-05-173-1/+23
|\ \ | |/ |/| SI-7482 Don't cook raw types after erasure.
| * SI-7482 Don't cook raw types after erasure.Paul Phillips2013-05-163-1/+23
| |
* | Merge pull request #2454 from vigdorchik/scaladoc_fixesJason Zaugg2013-05-1712-135/+99
|\ \ | | | | | | This is a cleanup of scaladoc code.
| * | No longer cache all subclass templates.Eugene Vigdorchik2013-05-173-40/+32
| | | | | | | | | | | | | | | Instead only cache direct subclasses and compute all known subclasses as a transitive closure.
| * | Remove self types check suppression usage from scaladoc.Eugene Vigdorchik2013-05-173-7/+0
| | | | | | | | | | | | Also remove private setting not used anymore.
| * | Improve code style in the Scaladoc implementation.Eugene Vigdorchik2013-05-167-88/+67
| | | | | | | | | | | | | | | | | | | | | | | | It fixes the following inefficiences or code style violations: - Explicit asInstanceOf calls. - Boxing symbols instead of using plain NoSymbol. - Matching `this` instead of late-binding.
* | | Merge pull request #2374 from adriaanm/ticket-6815Jason Zaugg2013-05-1719-77/+224
|\ \ \ | |_|/ |/| | SI-6815 untangle isStable and hasVolatileType
| * | remove unused methods: checkStable, isStableExceptVolatileAdriaan Moors2013-05-161-23/+0
| | |
| * | SI-6815 untangle isStable and hasVolatileTypeAdriaan Moors2013-05-1617-54/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Symbol::isStable` is now independent of `Symbol::hasVolatileType`, so that we can allow stable identifiers that are volatile in ident patterns. This split is validated by SI-6815 and the old logic in RefChecks, which seems to assume this independence, and thus I don't think ever worked: ``` if (member.isStable && !otherTp.isVolatile) { if (memberTp.isVolatile) overrideError("has a volatile type; cannot override a member with non-volatile type") ``` Introduces `admitsTypeSelection` and `isStableIdentifierPattern` in treeInfo, and uses them instead of duplicating that logic all over the place. Since volatility only matters in the context of type application, `isStableIdentifierPattern` is used to check patterns (resulting in `==` checks) and imports.
| * | make treeInfo more globally visibleAdriaan Moors2013-05-163-0/+9
| | |
* | | Merge pull request #2519 from som-snytt/issue/regex-revertAdriaan Moors2013-05-162-5/+18
|\ \ \ | | | | | | | | SI-6406 Restore deprecated API
| * | | SI-6406 Restore deprecated APISom Snytt2013-05-122-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original patch for SI-6406 was intended for 2.10 but during those volatile weeks of early autumn, it missed the boat. A deprecated method was incorrectly tagged at 2.10 and later removed; this restores the method and its test, and resets the deprecation clock to 2.11. The deprecation tool should confirm that changes occur on the git timeline as claimed.
* | | | Merge pull request #2534 from retronym/ticket/3943Adriaan Moors2013-05-162-0/+21
|\ \ \ \ | | | | | | | | | | SI-3943 Test case for already-fixed Java interop bug
| * | | | SI-3943 Test case for already-fixed Java interop bugJason Zaugg2013-05-152-0/+21
| | | | | | | | | | | | | | | | | | | | Confirmed that this was fixed in edee27f59.
* | | | | Merge pull request #2543 from soc/SI-7469-loggingAdriaan Moors2013-05-169-94/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-7469 Remove @deprecated scala.util.logging
| * | | | SI-7469 Remove @deprecated scala.util.loggingSimon Ochsenreither2013-05-169-94/+19
|/ / / /
* | | | Merge pull request #2527 from soc/SI-7476Jason Zaugg2013-05-161-4/+50
|\ \ \ \ | | | | | | | | | | SI-7476 Add documentation to GenericTraversableTemplate
| * | | | SI-7476 Add documentation to GenericTraversableTemplateSimon Ochsenreither2013-05-131-4/+50
| | |/ / | |/| |
* | | | Merge pull request #2526 from dcsobral/doc/patMatAdriaan Moors2013-05-151-2/+6
|\ \ \ \ | | | | | | | | | | Fix formatting for couple of scaladocs in the compiler
| * | | | Fix formatting for couple of docs in the compilerDaniel C. Sobral2013-05-131-2/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Source code on scaladoc for the virtual pattern matcher was not being correctly identified as such. Also, I had to use an html code tag instead of backticks when referring to the __match identifier, otherwise the double underscore would be treated as start-of-underline wiki markup.
* | | | Merge pull request #2520 from soc/SI-7469-concurrentJason Zaugg2013-05-155-6/+6
|\ \ \ \ | | | | | | | | | | SI-7469 Make @deprecated elems in scala.concurrent private[scala]
| * | | | SI-7469 Make @deprecated elems in scala.concurrent private[scala]Simon Ochsenreither2013-05-125-6/+6
| |/ / / | | | | | | | | | | | | They can't be removed yet because scala.actors depends on it.
* | | | Merge pull request #2521 from soc/SI-7469-combinatorJason Zaugg2013-05-153-79/+0
|\ \ \ \ | | | | | | | | | | SI-7469 Remove deprecated elements in s.u.parsing.combinator
| * | | | SI-7469 Remove deprecated elements in s.u.parsing.combinatorSimon Ochsenreither2013-05-123-79/+0
| |/ / /
* | | | Merge pull request #2523 from soc/SI-7469-hashingJason Zaugg2013-05-152-206/+0
|\ \ \ \ | | | | | | | | | | SI-7469 Remove @deprecated MurmurHash elements
| * | | | SI-7469 Remove @deprecated MurmurHash elementsSimon Ochsenreither2013-05-122-206/+0
| |/ / /
* | | | Merge pull request #2514 from scalamacros/topic/5923-masterJason Zaugg2013-05-1528-64/+228
|\ \ \ \ | | | | | | | | | | makes sense of implicit macros! now in master
| * | | | removes duplication in inferImplicitValueEugene Burmako2013-05-123-30/+18
| | | | | | | | | | | | | | | | | | | | This is a port of https://github.com/scala/scala/commit/4e64a2731d from 2.10.x.
| * | | | SI-7047 fixes silent for c.inferImplicitXXXEugene Burmako2013-05-125-9/+32
| | | | | | | | | | | | | | | | | | | | This is a port of https://github.com/scala/scala/commit/b4da864247 from 2.10.x.
| * | | | SI-7167 implicit macros decide what is divergenceEugene Burmako2013-05-1215-25/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a port of https://github.com/scala/scala/commit/8168f118c9 from 2.10.x, with an additional change to the `enclosingImplicits` and `openImplicits` APIs, which encapsulates tuples of `pt` and `tree` into `ImplicitCandidate`.
| * | | | macroExpandAll is now triggered in all invocations of typedEugene Burmako2013-05-122-0/+4
| | | | | | | | | | | | | | | | | | | | This is a port of https://github.com/scala/scala/commit/bb73b9669a from 2.10.x.
| * | | | SI-5923 instantiates targs in deferred macro applicationsEugene Burmako2013-05-127-10/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In January I submitted a pull request that, as I thought back then, fixes SI-5923: https://github.com/scala/scala/commit/fe60284769. The pull request was merged, and everyone was happy that the bug got fixed. Unfortunately, the fix was: a) incomplete, b) broke something else, as noticed by Miles in https://groups.google.com/d/topic/scala-internals/7pA9CiiD3u8/discussion. Now we got a real fix in 2.10.x (https://github.com/scala/scala/commit/90ac5c4e13), and it's my pleasure to port it to master.
* | | | | Merge pull request #2503 from paulp/issue/6039Jason Zaugg2013-05-153-2/+26
|\ \ \ \ \ | | | | | | | | | | | | SI-6039 Harden against irrelevant filesystem details
| * | | | | SI-6039 Harden against irrelevant filesystem detailsPaul Phillips2013-05-083-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbol loader need not create and populate package symbols merely because there is a directory somewhere. Every package created based on the existence of a directory should contain a classfile, either directly or indirectly.
* | | | | | Merge pull request #2498 from rladstaetter/patch-1Jason Zaugg2013-05-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo in comment
| * | | | | | fix typo in commentRobert Ladstätter2013-05-061-1/+1
| | | | | | |
* | | | | | | Merge pull request #2399 from rjolly/scripting8Jason Zaugg2013-05-151-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | AbstractFile.getDirectory does not return null when outDir is "."
| * | | | | | AbstractFile.getDirectory does not return null when outDir is "."Raphael Jolly2013-04-221-1/+1
| | | | | | |
* | | | | | | Merge pull request #2525 from soc/SI-7469-astPaul Phillips2013-05-132-381/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | SI-7469 Remove @deprecated scala.util.parsing.ast
| * | | | | | SI-7469 Remove @deprecated scala.util.parsing.astSimon Ochsenreither2013-05-132-381/+0
|/ / / / / /
* | | | | | Merge pull request #2501 from paulp/pr/tailcalls-tostringPaul Phillips2013-05-122-7/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Limit unnecessary calls to Type#toString.
| * | | | | Limit unnecessary calls to Type#toString.Paul Phillips2013-05-082-7/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging revealed a few thousand calls to the often expensive Type#toString emerging from tailcalls. The error message was being generated for all methods even though it was only issued in rare cases (and for the particular tailrec failure which made the call, extremely rare.) The remaining boatload of unnecessary Type#toString calls are much harder to fix due to the design of "AbsTypeError" and the fact that the compiler approaches mutability like a cat approaches a loaded gun. See SI-6149.
* | | | | Merge pull request #2470 from ihji/masterPaul Phillips2013-05-112-2/+13
|\ \ \ \ \ | | | | | | | | | | | | SI-7432 Range.min should throw NoSuchElementException on empty range
| * | | | | SI-7432 add testcasesHeejong Lee2013-04-301-0/+11
| | | | | |
| * | | | | SI-7432 Range.min should throw NoSuchElementException on empty rangeHeejong Lee2013-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency, range.max and range.min should throw NoSuchElementException on an empty range.