summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve quality of scalacheck range tests input and output.Daniel C. Sobral2011-12-161-26/+55
| | | | | | | Remove some dead code, activate ByOne generator again, add generators for inclusive ranges, add generators that concentrate on the boundaries, and add some print statements next to exceptions that might get eaten by out of memory errors.
* Fix for seq/array varargs crasher.Paul Phillips2011-12-132-1/+14
| | | | Closes SI-4024.
* Faster char2uescape.Paul Phillips2011-12-131-16/+20
| | | | | No StringBuilder, no closure, no toHexString, no string concatenation, no unnecessary math, no call to reverse, only the necessary allocation.
* Test case closes SI-4063.Paul Phillips2011-12-121-0/+39
|
* Test case closes SI-4273.Paul Phillips2011-12-121-0/+8
|
* Merge remote-tracking branch 'repo/develop'Paul Phillips2011-12-125-1/+8
|\
| *---. Merge remote-tracking branches 'kepler/topic/typeparamsfix', ↵Paul Phillips2011-12-125-1/+8
| |\ \ \ | | | | | | | | | | | | | | | 'kepler/ticket/5295' and 'blair/clarify-Map-withDefaultValue' into develop
| | | | * Clarify scala.collection.immutable.Map#withDefaultValue() docs.Blair Zajac2011-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Copy the documentation from Map#withDefault() that get(), contains(), iterator(), and keys() keys are not affected by withDefaultValue().
| | | * | Batch files no longer swallow exit codesEugene Burmako2011-12-093-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usually scripts like scala.bat and scalac.bat correctly propagate exit codes from underlying Java invocations. However, if you run these scripts as follows: "cmd /c scala ...", then errorlevel gets swallowed. This simple patch fixes the aforementioned problem. Fixes SI-5295, no review.
| | * | | 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 'dec10-version-string'Paul Phillips2011-12-121-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: build.xml
| * | | | More build.xml massaging.Paul Phillips2011-12-122-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Backporting auto starr download to 2.8.x and 2.9.x build.xmls. Trying to get build strings consistent.
* | | | | Merge branch 'dec10-checkin'Paul Phillips2011-12-123-13/+139
|\ \ \ \ \
| * | | | | Added cast to ParRange.Paul Phillips2011-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | To get the same benefit as in Range. Review by @prokpec.
| * | | | | Range.foreach optimization.Paul Phillips2011-12-122-12/+138
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes code like 0 to 100 foreach (x += _) as fast as (often faster than, in fact) a while loop. See the comment in Range for the gory details. More investigation should be done regarding total impact on inlining behavior. Review by @odersky.
* | | | | Merge branch 'dec10-version-string'Paul Phillips2011-12-121-4/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Tweaking build string some more.Paul Phillips2011-12-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduced date and an "r" to meet IDE needs. Moved reference commit backward to accomodate 2.8.x. Merging changes into 2.8.x, 2.9.x, and master.
* | | | | Merge branch 'dec10-version-string'Paul Phillips2011-12-120-0/+0
|\| | | | | |/ / / |/| | |
| * | | More on get-scala-revision.Paul Phillips2011-12-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Now that I've resorted to building git 1.5.4, I can stop trying to reverse engineer it through jenkins. This implementation feels winnerish.
| * | | Hardening get-scala-version.Paul Phillips2011-12-091-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplementing without git-describe to harden against old gits and make any kind of reference tag unnecessary. Conflicts: tools/get-scala-revision
* | | | Print out more useful info in ant.Paul Phillips2011-12-091-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decided to stop guessing at what ant was doing. % ant -Dscalac.args="-Xcheckinit" init init: [echo] build time: 9 December 2011, 21:47:22 [echo] java version: Java HotSpot(TM) 64-Bit Server VM 1.6.0_29 [echo] java args: -Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC [echo] javac args: [echo] scalac args: -Xcheckinit [echo] build number: 2.10.0.dev-1340-ga890d60
* | | | More on get-scala-revision.Paul Phillips2011-12-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Now that I've resorted to building git 1.5.4, I can stop trying to reverse engineer it through jenkins. This implementation feels winnerish.
* | | | Hardening get-scala-version.Paul Phillips2011-12-091-12/+15
| | | | | | | | | | | | | | | | | | | | Reimplementing without git-describe to harden against old gits and make any kind of reference tag unnecessary.
* | | | Merge branch 'common-build-script'Paul Phillips2011-12-091-3/+8
|\ \ \ \
| * | | | Making path to settings.xml configurable.Paul Phillips2011-12-091-3/+8
| | | | | | | | | | | | | | | | | | | | Environment variable maven_settings.
* | | | | Merge branch 'common-build-script'Paul Phillips2011-12-091-2/+10
|\| | | |
| * | | | Boiling more logic out of jenkins.Paul Phillips2011-12-091-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Offer explicit settings.xml path for maven if some specific hardcoded path exists, don't otherwise. At least it's in one place where we can keep an eye on it.
* | | | | Added per-file stats to -Dscala.timings.Paul Phillips2011-12-091-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | % pscalac -Dscala.timings ./src/library/scala/util/*.scala phase id ms share ----------------------- -- ---- ----- typer 4 3632 44.73 specialize 13 1175 14.47 erasure 15 800 9.85 jvm 27 504 6.21 icode 22 427 5.26 ... ms path -------- ---------------------------------------------- 1056.667 ./src/library/scala/util/Sorting.scala 1019.369 ./src/library/scala/util/MurmurHash.scala 702.881 ./src/library/scala/util/Properties.scala 435.053 ./src/library/scala/util/Random.scala 429.702 ./src/library/scala/util/MurmurHash3.scala 246.453 ./src/library/scala/util/DynamicVariable.scala 69.755 ./src/library/scala/util/Marshal.scala
* | | | | Disabled another presentation compiler test.Paul Phillips2011-12-093-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It foiled me right on the cusp of a successful windows nightly. https://scala-webapps.epfl.ch/jenkins/job/scala-nightly-windows/1170/consoleText
* | | | | Merge branch 'common-build-script'Paul Phillips2011-12-092-18/+23
|\| | | | | |_|/ / |/| | |
| * | | Swimming with the jenkins current.Paul Phillips2011-12-092-18/+23
| | | | | | | | | | | | | | | | Configuring via environment variables.
* | | | 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