summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* typeParams now performs one more completionEugene Burmako2011-12-121-0/+4
| | | | | | | | | | | | | | | When tracking a problem in type inference during reflective compilation, Martin and I have discovered that under certain circumstances typeParams does not fully load the type. During a debugging session we found out that info first had the type of TopLevelCompleter, and after the load it was still not completed, having the type of UnPickler$something$LazyTypeRef. After that discovery it became apparent that typeParams need to behave similarly to the info getter - allow for two completions, not just one. Review by @odersky, @adriaanm.
* Merge branch 'common-build-script'Paul Phillips2011-12-092-0/+60
|\
| * Separated build and publish scripts.Paul Phillips2011-12-093-35/+60
| | | | | | | | Unified further with build options.
| * Unified 2.8.x and 2.9.x build scripts.Paul Phillips2011-12-091-8/+13
| |
| * Moved jenkins build script.Paul Phillips2011-12-091-0/+30
| | | | | | | | Out of jenkins and into version control.
* | Merge remote-tracking branch 'jsuereth/dont_resolve_non_lib_dirs'Paul Phillips2011-12-081-2/+2
|\ \
| * | Binary resolution limited.Josh Suereth2011-12-081-2/+2
| | | | | | | | | | | | | | | | | | Binary library pull/push is limited to: - test/files - lib
* | | Deleted the sbt 0.7 project.Paul Phillips2011-12-0819-1878/+0
| | | | | | | | | | | | | | | Pretty sure nobody's using this? Let's make some space for our upcoming friend the 0.11 project.
* | | Merge remote-tracking branches 'VladUreche/issue/5054' and ↵Paul Phillips2011-12-0848-203/+163
|\ \ \ | | | | | | | | | | | | 'jsuereth/dont_resolve_releases'
| * | | Ensure sha files don't go to productionJosh Suereth2011-12-081-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit filters out the sha files that have been going into the docs area of a distribution. Really, I think examples might belong in a separate project moreso than in the distro, but for now just preventing the build information from leaking into the distro is helpful. Review by: @soundrabbit
| | |
| | \
| | \
| | \
| *---. \ Merge remote-tracking branches 'soc/SI-4990', ↵Paul Phillips2011-12-0733-155/+88
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 'fedgehog/docs_fix_for_scala.Either.cond___SI-5113' and 'kepler/ticket/5266' into develop
| | | | * | Fix reflective toolbox producing invalid bytecodeEugene Burmako2011-12-076-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrapper method for AST undergoing a reflective compilation has been incorrectly marked as static. This was off the radars until one day the code being compiled declared a top-level method. During flatten that method got hoisted into the wrapper module, and its invocation got translated into an instance call upon the module. This led to static wrapper method trying to call an instance method, and that blew up the bytecode verifier. More info: https://issues.scala-lang.org/browse/SI-5266. Fixes SI-5266, review by @odersky.
| | | * | | Fix documentation errorfedgehog2011-12-071-4/+4
| | | |/ /
| | * / / Migration message and version cleanupSimon Ochsenreither2011-12-0726-138/+77
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The @migration annotation can now be used like @deprecation. Old syntax is still supported, but deprecated. Improve wording and consistency of migration messages, migration warnings also print the version in which the change occurred now. Partially fixes SI-4990.
| * | | Merge remote-tracking branch 'kepler/topic/reflectivecompiler' into developPaul Phillips2011-12-071-0/+6
| |\ \ \
| | * | | Reflective compiler now crashes properlyEugene Burmako2011-12-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust toolbox to escalate errors reported during reflective compilation. Without this functionality, errors get swallowed and lead to weirdness like https://issues.scala-lang.org/browse/SI-5274. The only meaningful part of the output in the bug report linked above is the first line. Subsequent stack trace is at best useless and at worst misleading. Now the error report is much more sane: https://gist.github.com/1443232 Review by @odersky.
| * | | | Restructed Enumeration a little.Paul Phillips2011-12-071-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nobody should be deprecating methods without ensuring that the implementation doesn't rely on their existence (and the documentation doesn't still suggest using them.) Made it more internally consistent.
| * | | | More warnings eliminations.Paul Phillips2011-12-0711-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Deprecation warnings, unchecked warnings, "that's not the value you think it is" warnings. Also eliminated a warning by fixing a warning bug.
| * | | | Changed shadowed constructor parameter names.Paul Phillips2011-12-072-6/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of my more recent warnings tells us this a bunch of places if we compile with -Xlint, one example: scala/actors/ReplyReactorTask.scala:26: warning: private[this] value reactor in class ReplyReactorTask shadows mutable reactor inherited from class ReactorTask. Changes to reactor will not be visible within class ReplyReactorTask - you may want to give them distinct names. In some cases (like that one) I was not confident whether the shadowing was intentional, in which case I left the semantics but changed the name anyway because it will be eternally confusing otherwise. Review by @phaller.
* / | | Fixed #5054, #5287Vlad Ureche2011-12-0811-23/+186
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documents with use cases should be restructured like: /** * The full definition, either used with an implicit value or with an explicit one. * * Some more explanation on implicits... * * @param lost a lost parameter * @return some integer * * @usecase def test(): Int * * This takes the implicit value in scope. * * Example: `test()` * * @usecase def test(explicit: Int): Int * * This takes the explicit value passed. * * Example: `test(3)` */ def test(implicit lost: Int): Int
* | | Merge remote-tracking branch 'soc/scaladoc-spacing' into developPaul Phillips2011-12-062-11/+10
|\ \ \
| * | | Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-062-11/+10
| | | |
* | | | Merge branch 'master' of /scala/trunk into developPaul Phillips2011-12-061-0/+5
|\ \ \ \
| * | | | Gave Option its own nonEmpty.Paul Phillips2011-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | A bit further down Option's slippery slope of collections methods, but those sudden implicit conversions to Iterable are legitimately annoying.
* | | | | Merge remote-tracking branches 'blair/documentation-typo-fix' and ↵Paul Phillips2011-12-0622-25/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'blair/remove-documentation-stutters' into develop
| * | | | | Fix documentation stutters.Blair Zajac2011-12-0622-25/+25
| |/ / / /
* / / / / Fix documentation typo.Blair Zajac2011-12-061-1/+1
|/ / / /
* | / / Update scaladoc links to collections overview.Josh Marcus2011-12-0628-38/+34
| |/ / |/| | | | | | | | | | | | | | Change scaladoc links in collection classes to point at re-formatted Collections Overview on docs.scala-lang.org. Fix minor typo: s/Ummutable/Immutable
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'kepler/topic/dumpclasses' and ↵Paul Phillips2011-12-0530-3/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'joshmarcus/collections_docs' into develop Closes SI-5280.
| | * | | Enhanced scaladoc of collection classes with links to the relevant pages of ↵Josh Marcus2011-12-0527-0/+68
| | | | | | | | | | | | | | | | | | | | "The Scala 2.8 Collections API" overview.
| * | | | -Ydump-classes: the option to dump the generated bytecodeluajalla2011-12-053-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Ydump-classes option is intended to dump the compiler generated bytecode to the .class files in given directory. It can be pretty useful for reflective compilation that utilizes in-memory classloaders, for example to check the files if compiler produces invalid bytecode. In this case the dump helps to understand what exactly is wrong with the emitted class. The option format is -Ydump-classes <dir>.
* | | | | Disabled non-deterministic tests.Paul Phillips2011-12-0561-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everyone's favorite "will they or won't they" tests, akka and timeofday. They will be welcomed back into the fold once they can stick to a decision on whether to pass or fail.
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge remote-tracking branches 'kepler/topic/reifycopypaste' and ↵Paul Phillips2011-12-0560-1/+1201
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | 'kepler/topic/reifytests' into develop
| | * | | | Another test pack for reflectionEugene Burmako2011-12-0559-0/+1200
| | | | | | | | | | | | | | | | | | | | | | | | Also see https://github.com/scala/scala/pull/25.
| * | | | | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty modifiers are now correctly printed out as "Modifiers()" instead of annoyingly verbose "Modifiers(Set(), newTermName(""), List())". No review.
* | | | | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Dropped redundant parents during bytecode generation to ease trouble on android. Closes SI-5278.
* | | | | Merge remote-tracking branch 'szeiger/fix/scala-script-on-mingw'Paul Phillips2011-12-051-5/+17
|\ \ \ \ \
| * | | | | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| |/ / / /
* | | | | Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools/get-scala-revision.bat should have the same logic as tools/get-scala-revision, but I'm afraid to try to implement an if/then/else in a windows batch file. Contributions welcome.
| * | | | | Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| |/ / / / | | | | | | | | | | | | | | | a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat.
* / / / / Tweaks to get-scala-revision.Paul Phillips2011-12-052-3/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference to git head is supposed to be HEAD, not head. Also apparently [[ <test> ]] is a bashism so it's [ <test> ]. Made name generation robust against the absence of the dev tag; it will generate a similar name even if it's not there, minus the part it can't determine without it.
* | | | Use git-describe to create build string.Paul Phillips2011-12-043-51/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created dev tag which is the merge-base of master and 2.9.1 (merge-base is the last common commit), and told ant to generate build strings based on that. So distributions look like scala-2.10.0.dev-1289-gbba3918 Where the 1289 means you are 1289 commits ahead of "dev" and the last segment (minus the g) is the sha-1 hash. This no doubt breaks windows even further. Help getting it back on its feet greatly appreciated.
* | | | Merge remote-tracking branch 'kepler/topic/reifytests'Paul Phillips2011-12-0428-0/+352
|\ \ \ \
| * | | | Test pack for various flavors of reflection.Eugene Burmako2011-12-0528-0/+352
| | | | |
* | | | | Enabled continuations plugin by default.Paul Phillips2011-12-043-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not buying anything with it off by default. Added a -P:continuations:disable option to disable. -P:continuations:enable lives on as a no-op. Review by @odersky.
* | | | | Merge remote-tracking branch 'origin/develop'Paul Phillips2011-12-040-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.xml
| * | | | | Revert "Fixes the annoying spaces between name, type params and params in ↵Paul Phillips2011-12-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScalaDoc." This reverts commit 086b558f2d025323c86226b2560578c50ee48b84. It causes two scaladoc tests to fail; the scaladoc tests are almost completely opaque and I have no time to reverse engineer them.
| | | | | |
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-----. \ \ \ \ Merge remote-tracking branches 'dcsobral/parser/NoSuccessMessages', ↵Paul Phillips2011-12-0212-15/+295
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'dcsobral/parserFilter', 'soc/library-range-sum', 'szeiger/feature/enumeration-valueset', 'szeiger/issue/5117' and 'jsuereth/pull-binary-error-message' into develop
| | | | | * | | | | Added better warning message if you've forgotten to run pull-binary-libs.sh ↵Josh Suereth2011-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after initial checkout.
| | * | | | | | | | Add filter/withFilter method to Parser, to complement map and flatMap when usedDaniel Capo Sobral2011-12-025-0/+51
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in for comprehensions. This is required when pattern matching is used on the result of the generators. It is implemented through a new filterWithError method on ParseResult. Contributed by: Daniel C. Sobral
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 03:58:00 +0000