summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* First cut at a release notes tool to help generate them.Josh Suereth2012-03-191-0/+49
|
* Fixed versioning scheme when running on a tag.Josh Suereth2012-03-194-53/+12
| | | | git describe is useless in that situation, afaict.
* Merge branch 'mar17-colorize'Paul Phillips2012-03-187-0/+1275
|\
| * Library for ansi color management.Paul Phillips2012-03-187-0/+1275
| | | | | | | | | | | | | | | | | | Having now experienced the unbelievable difference it makes to have one's voluminous debugging output effectively color-coded, I had to librarize the ansi codes in order to use them. This could all go in the standard library, or as soon as I can easily make use of compiler dependencies, a separate library altogether. For now it hides away in scala.tools.util.color.
* | Merge remote-tracking branches 'axel22/feature/checkinit-transient' and ↵Paul Phillips2012-03-1884-533/+1718
|\ \ | | | | | | | | | 'jsuereth/mirrored-seq-extractors' into develop
| * | Added +: and :+ extractors to mirror append/prepend.Josh Suereth2012-03-164-0/+34
| |/ | | | | | | | | | | | | | | * +: does head/tail decomposition on any Seq * :+ does init/last decomposition on any Seq * Both preserve specific Seq types. Review by @odersky
| * Eliminating warnings in Cleanup.Paul Phillips2012-03-163-74/+67
| | | | | | | | | | | | | | | | And un-overabstracting it a bit. When a method takes four parameters in two parameter lists, one of which is a closure acting on a tuple, and it turns out there are a total of three call sites and they all pass identical values for the first three parameters, it may be time to brush up on your YAGNI.
| * Testing compiler asSeenFrom directly.Paul Phillips2012-03-167-18/+498
| | | | | | | | | | | | | | It's more of a "dump what it says to a file so we'll know if any of this ever changes" than a "test" per se. It could use some wheat/chaff/nonsense/sense sorting. Still, it would be great to have more stuff like this.
| * Added alternate test for SI-5545.Paul Phillips2012-03-162-0/+8
| |
| *---------. Merge remote-tracking branches 'VladUreche/feature/inheritdoc-clean', ↵Paul Phillips2012-03-1661-382/+1085
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'acruise/t1118', 'hubertp/issue/5572', 'hubertp/topic/nightly-checkinit', 'axel22/feature/pc-ctrie', 'jsuereth/master-version-fixin' and 'axel22/feature/checkinit-transient' into develop
| | | | | | | * Fixing merge conflicts for trunk.Josh Suereth2012-03-162-18/+5
| | | | | | | |
| | | | | | | * Fixed sha to not have the 'g' for git.Josh Suereth2012-03-162-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swapped 'r' to 'v' now that I've had more coffee and sleep.
| | | | | | | * Fixed maven deployment issues for new versioning scheme.Josh Suereth2012-03-162-15/+20
| | | | | | | |
| | | | | | | * Finished migrating to new versioning schemeJosh Suereth2012-03-169-50/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.xml tools/get-scala-revision.bat
| | | | | | | * properties loading is now maven/osgi version aware. yippie.Josh Suereth2012-03-161-14/+13
| | | | | | | |
| | | | | | | * Modified build for new versioning scheme.Josh Suereth2012-03-163-3/+10
| | | | | | | |
| | | | | | | * Moved to Mirco's versioning idea.Josh Suereth2012-03-162-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.xml
| | | | | | | * Fixes to build numbering system for 2.9.x releaseJosh Suereth2012-03-164-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.number build.xml
| | | | | | * | Renamed concurrent trie source files.Aleksandar Prokopec2012-03-162-0/+0
| | | | | | | |
| | | | | | * | Renaming Ctrie to ConcurrentTrieMap.Aleksandar Prokopec2012-03-1611-144/+144
| | | | | | | |
| | | | | * | | Remove confusing nightly.checkinit target that was setting checkinit in ↵Hubert Plociniczak2012-03-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optimise params
| | | | * | | | Remove assert given the test. Fixes #SI-5572.Hubert Plociniczak2012-03-163-1/+34
| | | | |/ / /
| | | * | | | Fixed broken testsAlex Cruise2012-03-156-18/+19
| | | | | | |
| | | * | | | Tweaked deprecation annotations to avoid warningAlex Cruise2012-03-152-2/+2
| | | | | | |
| | | * | | | Re-fixed 2.10-style literals. Oh, silly Windows and your line endings.Alex Cruise2012-03-151-1/+1
| | | | | | |
| | | * | | | SI-1118:Alex Cruise2012-03-155-493/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use new-style deprecation annotations * Slightly less cutesy test text * Move t1118.scala to the right directory
| | | * | | | Cleaned up failed manual patchAlex Cruise2012-03-151-459/+459
| | | | | | |
| | | * | | | SI-1118 WIPAlex Cruise2012-03-1523-68/+168
| | | | | | |
| | | * | | | SI-1118 WIPAlex Cruise2012-03-152-0/+0
| | | | | | |
| | * | | | | Merged and cleaned the 'feature/inheritdoc' branchVlad Ureche2012-03-169-89/+503
| | | | | | |
| * | | | | | Revert "More uniformity for the parser."Paul Phillips2012-03-163-51/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f987afe55e6d4f71c7e9ad10d1ca9f6120dc1132. Looks like somebody misread the grammar. Look for it to return in one of paulp's exclusive branches for today's discriminating hacker.
| * | | | | Merge pull request #281 from VladUreche/hack/verify-scriptJosh Suereth2012-03-161-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Adapted tools/verify-jar-cache to run on Ubuntu
| | * | | | | Adapted tools/verify-jar-cache for UbuntuVlad Ureche2012-03-161-5/+5
| | | |_|_|/ | | |/| | |
| * / | | | Finish fixing range positions.Paul Phillips2012-03-165-3/+7
| |/ / / / | | | | | | | | | | | | | | | At least, I think so.
* / / / / Simplify check for transient fields in mixin.Aleksandar Prokopec2012-03-161-1/+1
|/ / / /
* | | | More uniformity for the parser.Paul Phillips2012-03-163-14/+51
| | | | | | | | | | | | | | | | | | | | Type application and operator notation could not formerly be mixed. Now they can, as the grammar has always suggested.
* | | | New option -Ypos-debug, and fixed range position breakage.Paul Phillips2012-03-1517-75/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Looks like there is more range position breakage yet, but this gets the outermost layer.) Channeling my struggles into a slightly easier future. % scalac -Ypos-debug -d /tmp ./src/library/scala/Predef.scala ./src/library/scala/Predef.scala:222: warning: Positioned tree has unpositioned child in phase extmethods def x = __resultOfEnsuring ^ parent: #7109 line 222 Select // (value __resultOfEnsuring in class Ensuring) child: #7108 Ident // (value $this) ./src/library/scala/Predef.scala:258: warning: Positioned tree has unpositioned child in phase extmethods def x = __leftOfArrow ^ parent: #7280 line 258 Select // (value __leftOfArrow in class ArrowAssoc) child: #7279 Ident // (value $this) two warnings found Or try this to really see some output: % scalac -Yrangepos -Ypos-debug
* | | | Merge remote-tracking branches 'axel22/feature/checkinit-transient' and ↵Paul Phillips2012-03-15224-873/+2224
|\ \ \ \ | | | | | | | | | | | | | | | 'lrytz/relativeLinks' into develop
| * | | | create relative symlinks in ant scriptsLukas Rytz2012-03-152-2/+2
| | |/ / | |/| |
| * | | Whitespace and a couple checkfile updates.Paul Phillips2012-03-146-34/+34
| | | |
| * | | Merge branch 'master' into merge-inlinePaul Phillips2012-03-141-1/+0
| |\ \ \
| | * | | Eliminate build-breaking import.Paul Phillips2012-03-141-1/+0
| | | | | | | | | | | | | | | | | | | | ...from m. odersky's private collection of mysterious imports.
| * | | | The rest of the inline classes.Paul Phillips2012-03-1413-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have you often thought that programming is just like the movie 'Hackers', only with less rollerblading? Now that we have @inline skates, that last caveat can be retired. It's just like the movie 'Hackers'. Signed-off-by: Zero Cool
| * | | | Merge remote-tracking branch 'odersky/topic/inline' into merge-inlinePaul Phillips2012-03-14162-649/+1568
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/scala-compiler.jar.desired.sha1 lib/scala-library-src.jar.desired.sha1 lib/scala-library.jar.desired.sha1 src/compiler/scala/reflect/internal/Definitions.scala src/compiler/scala/reflect/internal/Symbols.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/transform/Erasure.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/RefChecks.scala src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala src/library/scala/Function0.scala src/library/scala/Function1.scala src/library/scala/Function10.scala src/library/scala/Function11.scala src/library/scala/Function12.scala src/library/scala/Function13.scala src/library/scala/Function14.scala src/library/scala/Function15.scala src/library/scala/Function16.scala src/library/scala/Function17.scala src/library/scala/Function18.scala src/library/scala/Function19.scala src/library/scala/Function2.scala src/library/scala/Function20.scala src/library/scala/Function21.scala src/library/scala/Function22.scala src/library/scala/Function3.scala src/library/scala/Function4.scala src/library/scala/Function5.scala src/library/scala/Function6.scala src/library/scala/Function7.scala src/library/scala/Function8.scala src/library/scala/Function9.scala test/files/codelib/code.jar.desired.sha1 test/files/neg/anyval-children-2.check test/files/run/programmatic-main.check
| | * | | Allows case classes as value classesMartin Odersky2012-03-075-12/+138
| | | | |
| | * | | New starr which has java.io.Serializable as a universal traitMartin Odersky2012-03-067-7/+7
| | | | |
| | * | | Make scala.io.Serializable a universal trait.Martin Odersky2012-03-061-2/+3
| | | | |
| | * | | Fixes to value classes: Flags now double definitions, private constructors ↵Martin Odersky2012-03-0675-168/+199
| | | | | | | | | | | | | | | | | | | | as errors. Fixed erasure scheme.
| | * | | Added check that primary constructor of a value class must be public.Martin Odersky2012-03-052-6/+15
| | | | |
| | * | | new and updated test cases for value classes.Martin Odersky2012-03-054-2/+39
| | | | |