summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2710 from jedesah/repl_load2.9.xAdriaan Moors2013-07-152-11/+16
|\ | | | | SI-4829 the :load command now fails if the command ends with a space
| * Fix minor error with splitLeftJean-Remi Desjardins2013-07-101-1/+1
| |
| * Refactor the code to avoid duplication and separate concernsJean-Remi Desjardins2013-07-061-9/+8
| |
| * SI-4829 the :load command now fails claiming a file does not exist if the ↵Jean-Remi Desjardins2013-07-052-5/+11
|/ | | | | | | command ends with a space The :load command now tries to be smart by detecting the presence of trailing spaces that might be insignificant. On certain file systems, files with trailing whitespaces are permitted which is why we don't naievely trim the argument.
* Merge pull request #2684 from phaller/issue/7616Adriaan Moors2013-07-042-1/+22
|\ | | | | SI-7616 Avoid ClassCastException in scala.concurrent.impl.ExecutionConte...
| * SI-7616 Avoid ClassCastException in scala.concurrent.impl.ExecutionContextImplPhilipp Haller2013-06-272-1/+22
|/ | | | Adds test to scala-concurrent-tck
* Merge pull request #2587 from soc/SI-7497-2.9Adriaan Moors2013-05-231-1/+3
|\ | | | | [backport] SI-7497 Use `osName startsWith "Mac OS X"` ...
| * [backport] SI-7497 Use `osName startsWith "Mac OS X"` ...Simon Ochsenreither2013-05-231-1/+3
|/ | | | | | | ... instead of `osName contains "OS X"` See http://mail.openjdk.java.net/pipermail/macosx-port-dev/2012-November/005148.html for the reason why we don't follow developer.apple.com/library/mac/#technotes/tn2002/tn2110.
* Merge pull request #2560 from soc/SI-7497-2.9Adriaan Moors2013-05-221-7/+7
|\ | | | | [backport] SI-7497 Fix scala.util.Properties.isMac
| * [backport] SI-7497 Fix scala.util.Properties.isMacSimon Ochsenreither2013-05-181-7/+7
|/ | | | | | It returned wrong values because it used the java.vendor property instead of os.name, as specified in developer.apple.com/library/mac/#technotes/tn2002/tn2110.
* Merge pull request #2413 from soc/SI-7391-2.9Adriaan Moors2013-05-031-4/+1
|\ | | | | [backport] SI-7391 Always use ForkJoin in Scala actors
| * [backport] SI-7391 Use ForkJoin in Scala actorsSimon Ochsenreither2013-05-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | ... on Java 6 and above, but keep honoring the actors.enableForkJoin system property. Like SI-7236 and SI-7237, the logic in scala.actors.scheduler.ThreadPoolConfig.useForkJoin (which resulted in a different thread pool implementation being chosen) was causing random hangs in the test concurrent-stream.scala when running on Avian.
* | Merge pull request #2412 from soc/SI-7237-2.9Adriaan Moors2013-05-021-5/+2
|\ \ | |/ |/| [backport] SI-7237 Always choose ForkJoinTaskSupport
| * [backport] SI-7237 Always choose ForkJoinTaskSupportSimon Ochsenreither2013-04-191-5/+2
|/ | | | | | | | | | | | ... on Java 6 and above. ForkJoinTaskSupport works on Hotspot, Avian and J9, while ThreadPoolTaskSupport causes the test test/files/scalacheck/parallel-collections to reliably hang on all three. We keep ThreadPoolTaskSupport around to keep the hope alive that we still have a glimpse of 1.5 support.
* Merge pull request #1972 from soc/SI-6969-2.9.xAdriaan Moors2013-02-013-7/+47
|\ | | | | [backport] SI-6969, mishandling of SoftReferences in method cache.
| * [backport] SI-6969, mishandling of SoftReferences in method cache.Simon Ochsenreither2013-01-253-7/+47
| | | | | | | | | | | | | | | | | | More interesting to test than it was to fix. The soft reference is now dereferenced once, the locally stored underlying value ascertained to be non-null, and the remainder of the references to the value use the local var. The enclosed test reliably NPEs without this patch.
* | Merge pull request #1962 from phaller/issue/6932-2.9.xv2.9.3-RC2v2.9.3Adriaan Moors2013-01-274-3/+128
|\ \ | |/ |/| Backport of SI-6932 to 2.9.x
| * SI-6932 Remove Batchable trait, minor clean-ups, update buildPhilipp Haller2013-01-242-18/+10
| |
| * Fix SI-6932 by enabling linearization of callback execution for the ↵Viktor Klang2013-01-223-3/+136
|/ | | | internal execution context of Future
* Merge pull request #1867 from huitseeker/backport/1721Grzegorz Kossakowski2013-01-097-2/+47
|\ | | | | SI-6766 Create a continuations project in eclipse ( backports https://github.com/scala/scala/pull/1721)
| * SI-6766 Create a continuations project in eclipseJames Iry2013-01-086-2/+45
| | | | | | | | | | | | | | | | | | We're missing a continuations dependency when we try to build reflect in eclipse which causes things to die horribly. This commit adds an eclipse project for the library portion of continuations, makes projects that depend on the scala-library also depend on continuations-library, and adds another bullet to the eclipse readme to turn on the continuations plugin.
| * SI-6766 Makes the -Pcontinuations:enable flag a project specific preferenceJames Iry2013-01-081-0/+2
|/ | | | | | | | | | | Make the continuations plugin flag specific to the continuations library. Remove the documentation about adding the continuation plugin from the eclipse README.md. One consequence of this change is that if a programmer has prefs for the continuations eclipse project then there will be a merge conflict. That's unavoidable without having a more sophisticated way to build the eclipse projects.
* Merge pull request #1777 from adriaanm/mailmap-2.9.xAdriaan Moors2012-12-171-0/+25
|\ | | | | update mailmap
| * update mailmapAdriaan Moors2012-12-141-0/+25
|/
* Merge pull request #1774 from adriaanm/bc-2.9.3v2.9.3-RC1Adriaan Moors2012-12-134-32/+22
|\ | | | | binary compatibility compensation
| * binary compatibility compensationAdriaan Moors2012-12-134-32/+22
|/ | | | | | | - change mima configuration to compare to 2.9.2 - compensate 53130d2143: keep tailMap$1/tailFlatMap$1 around - revert introduction of accessString in de82f9a04a: accessString appeared in library but only called once for a diagnostic message
* Merge pull request #1770 from JamesIry/SI-6536_2.9.xAdriaan Moors2012-12-135-6/+362
|\ | | | | SI-6536 Generates super accessors X.super[Y].blah when Y is a class
| * SI-6536 Cleanup code around determining accessor requirementJames Iry2012-12-132-12/+26
| | | | | | | | | | | | | | | | | | Moves the logic for the condition on requiring an accessor into a local method with a match to make thing cleaner. Also determines the mix type using a pattern match that logs but does not fail if the symbol isn't of the expected type. Finally fixes a typo in an assertion in GenICode. review @paulp
| * SI-6536 Generates super accessors X.super[Y].blah when Y is a classJames Iry2012-12-135-5/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The main change here is to add another case for generating super accessors - the case in X.super[Y].blah when X isn't the current class and Y is a class. The change is deliberately kept as minimal as possible to reduce the chance of breaking something in the 2.9.x line. Additionally GenICode now detects the case when we're trying to emit byte code that would be nonsense and warns about it. That can safely be made an assert for 2.11. Finally a related assert in RefChecks is beefed up to output a bit more useful information.
* | Merge pull request #1764 from adriaanm/backport/sip14Adriaan Moors2012-12-1332-15/+4925
|\ \ | | | | | | SIP-14 backport to 2.9.x
| * | use consistent scalac args in quick&strapAdriaan Moors2012-12-131-9/+8
| | |
| * | SIP-14 backport to 2.9.xphaller2012-12-1226-9/+4898
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other than adding the new APIs, a few changes are required: 1. Build. The Java sources in "scala/concurrent/impl" need forkjoin.jar on the classpath. Thus, I replaced the "classpath" attribute in the respective `javac` ant tasks (locker.lib, quick.lib, and strap.lib) with a "classpathref" attribute pointing to a classpath which includes also the forkjoin.jar. In the locker.lib target, exclude the duration package and everything that depends on it. In the docs.lib target, enable dependent method types, since they're used in the `scala.concurrent.duration` package. Also, the library is built with -Ydependent-method-types (for both quick & strap -- use consistent options for stability) 2. Dependent method types and SI-5958. The `duration` package relies on dependent method types, and requires a backport of SI-5958.
| * | SI-6188 backport (ICodeReader wrongly ignored exception handlers)Miguel Garcia2012-12-123-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | A backport of https://github.com/scala/scala/commit/61cc8ff61c81a1276a921ad5288ee3bebea1c96e The original fix (above) includes a test case that relies on scala.util.Success which as of this writing isn't there in 2.9.x. The test case requires a previously compiled classfile (where bytecode for an @inline method with exception handlers can be found). Ticket SI-6188 contains a self-contained example (not dependent on scala.util.Success) with _1 and _2 .scala files . Alternatively that test case could be used instead. The backported fix (this commit) is safe in the sense that it prevents methods read by ICodeReader containing exception handlers from being inlined, even if marked @inline. Alternatively, the same effect can be achieved by annotating a method as @noinline.
| * | SI-5958 This deserves a stable type - backport to 2.9.xAdriaan Moors2012-12-103-0/+18
| |/ | | | | | | | | | | | | | | | | `this` (or the self variable) passed as an actual argument to a method should receive a singleton type when computing the method's resultType this is necessary if the method's type depends on that argument adapts the test so that it runs on 2.9.x
* | Merge pull request #1761 from adriaanm/ticket-6692-2.9.xAdriaan Moors2012-12-132-5/+3
|\ \ | |/ |/| SI-6692 pickle one more flag bit: EXISTENTIAL
| * SI-6692 pickle one more flag bit: EXISTENTIALAdriaan Moors2012-12-122-5/+3
|/ | | | | | | | | | | | | | | | | | before, PickledFlags & EXISTENTIAL == 0, so that an existential symbol would lose the EXISTENTIAL bit when pickled, causing spurious incremental recompiles, as pickled information and type-checking-from-source-based information differed pickling this additional bit should be a compatible change, as older versions (pre-2.9.3) will simply mask out the extra flag bits pickled as of now (2.9.3) so that their behavior is not affected -- newer versions will see more flags, which might cause regressions, but it's also the only way to fix SI-6692 this obviates the need to set the existential flag when unpickling an existential type's params this is the smallest backport of a9b85dbaad and 3e2c31fbeb that I could think of as 2.9 is in maintenance mode, I don't want to invest in testing infrastructure to test the pickler, however, the fix is tested by the incremental compiler test 'inc-pickled-existential' in sbt
* Merge pull request #1651 from adriaanm/eclipse-project-2.9.xAdriaan Moors2012-12-0612-13/+268
|\ | | | | eclipse project files are now in src/eclipse
| * eclipse project files are now in src/eclipseAdriaan Moors2012-11-2012-13/+268
| | | | | | | | | | | | | | | | | | To use these project files you need to define the Eclipse 'path variable' SCALA_BASEDIR, in General/Workspace/Linked Resources. see src/eclipse/README.md for more info backport to 2.9.x of fd6573a2ce ceb095362b 98a5714fed 49169e2123 64f05974c7 27aaaa4fce
* | Merge pull request #1594 from adriaanm/guidelines-2.9.xAdriaan Moors2012-11-251-0/+66
|\ \ | |/ |/| show developer guidelines on opening pull request
| * show developer guidelines on opening pull requestAdriaan Moors2012-11-081-0/+66
|/ | | | | Includes "Improvements and typo fixes to CONTRIBUTING.md" by @heathercmiller as well as feedback from @retronym.
* Merge pull request #1560 from phaller/backport/cps-issue-1681Adriaan Moors2012-11-0521-31/+388
|\ | | | | Backport of #994 (SI-5314 - CPS transform of return statement fails)
| * Improve doc comment on adaptTypeOfReturn in CPSAnnotationCheckerphaller2012-11-021-3/+7
| |
| * Simplify the adaptation of types of return expressionsphaller2012-11-028-11/+86
| | | | | | | | | | | | | | | | | | | | Add `adaptTypeOfReturn` hook to `AnnotationCheckers`. Move adaptation of types of return expressions from `addAnnotations` to `typedReturn` via `adaptTypeOfReturn` hook. This resolves an inconsistency where previously types could have a plus marker without additional CPS annotations. This also adds additional test cases.
| * Revert "Add missing cases in tail return transform"phaller2012-11-024-26/+8
| | | | | | | | This reverts commit 8d020fab9758ced93eb18fa51c906b95ec104aed.
| * Add missing cases in tail return transformphaller2012-11-024-8/+26
| | | | | | | | | | Disabled warnings that no longer apply because of tail returns. Add several test cases.
| * Replace CheckCPSMethodTraverser with additional parameter on transformer methodsphaller2012-11-025-68/+29
| | | | | | | | | | | | | | Other fixes: - remove CPSUtils.allCPSMethods - add clarifying comment about adding a plus marker to a return expression
| * SI-5314 - CPS transform of return statement failsphaller2012-11-0219-15/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable return expressions in CPS code if they are in tail position. Note that tail returns are only removed in methods that do not call `shift` or `reset` (otherwise, an error is reported). Addresses the issues pointed out in a previous pull request: https://github.com/scala/scala/pull/720 - Addresses all issues mentioned here: https://github.com/scala/scala/pull/720#issuecomment-6429705 - Move transformation methods to SelectiveANFTransform.scala: https://github.com/scala/scala/pull/720#commitcomment-1477497 - Do not keep a list of tail returns. Tests: - continuations-neg/t5314-missing-result-type.scala - continuations-neg/t5314-type-error.scala - continuations-neg/t5314-npe.scala - continuations-neg/t5314-return-reset.scala - continuations-run/t5314.scala - continuations-run/t5314-2.scala - continuations-run/t5314-3.scala
* | Merge pull request #1334 from phaller/issue/cps-try-catch-2.9.xAdriaan Moors2012-11-053-2/+38
|\ \ | |/ |/| SI-6384 - avoid crash due to optimization in 2.10 CPS plugin
| * SI-6384 - avoid setting owner of function argument explicitlyphaller2012-11-021-4/+4
| |
| * SI-6384 - correct owner of function argumentphaller2012-10-301-2/+2
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-09 14:19:38 +0000