summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added updated ForkJoinPool, w/ necessary updates to Scala Actors.Heather Miller2012-02-2511-3442/+4810
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes Doug Lea's updates to ForkJoinPool, as of January 25th, 2012. Details of the changes and performance improvements available at: http://markmail.org/message/323vxzn6irkk5yrg. The ForkJoinPool used in this commit comes from the most recent JSR166y. Additionally, also included are minimal changes to parts of the Scala Actors library which interface with the ForkJoinPool, as the ForkJoinPool's interface has changed (prior to the release of Java 7) since we last updated it for the Scala 2.8 release. Of note- this is part of the planned overhaul of scala.concurrent, and corresponds to ticket SI-5523. For testing this was built on JDK 1.6, and passes all tests on both JDK 1.5 and 1.6. A new forkjoin.jar is necessary prior to applying these changes. Using this source, the new jar can be built by running: ant newforkjoin forkjoin.done This creates a new forkjoin.jar in build/libs/. It must replace lib/forkjoin.jar.
* Better fix for memory leaks in the presentation compiler. Switched to ↵Iulian Dragos2012-02-242-1/+2
| | | | perRunCaches and call clearAll from the presentation compiler
* -Xplugin value passed by the Eclipse IDE are incorrectly parsed when itMirco Dotta2012-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | contains whitespaces. Assume -Xplugin is given the value C:\Programs Files\plugins\Aplugin.jar C:\Programs Files\plugins\Bplugin.jar Calling ``tryToSetFromPropertyValue`` with the above value will always result in a total mess, no matter what, because it will split the string at whitespaces. The proposed solution is to change the implementation of ``tryToSetFromPropertyValue`` to use `,` (comma) as the splitting character Further, I'm quite convinced that the current implementation of ``MultiStringSetting.tryToSetFromPropertyValue`` has never worked, that is why I did not create an overload of ``tryToSetFromPropertyValue`` where the splitting character (or string) can be passed as argument. There is also an Eclipse Scala IDE associated to this issue: http://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1000917
* Fleshed out the @elidable documentation.Paul Phillips2012-02-231-15/+43
|
* Merge remote-tracking branch 'szabolcsberecz/SI-5215' into developPaul Phillips2012-02-231-4/+7
|\
| * update api docs for @elidable to match the behaviour more closely.Szabolcs Berecz2012-02-231-4/+7
| |
* | Followed up on two aged todos.Paul Phillips2012-02-231-65/+60
| | | | | | | | | | | | | | | | | | | | | | | | // to avoid infinite expansions. todo: not sure whether this is needed Survey says: if it's needed, more evidence is needed. // TODO: this should be simplified; in the stable case, one can probably // just use an Ident to the tree.symbol. Why an existential in the non-stable case? My answers are in comment form herein. I simplified as much as I was able.
* | Merge pull request #234 from jsuereth/fix-annoying-task-dependencyJosh Suereth2012-02-231-1/+1
|\ \ | |/ |/| Fix to nightly build.
| * Fix to nightly build.Josh Suereth2012-02-231-1/+1
|/ | | | | | | You see shelling to other ant builds doesn't let us declare dependencies on the primary build, so to ensure all tasks are run when needed, and that we don't slow everyone down with javadocs, we wind up with a bit of spaghetti.
* Moved and edited tests.Paul Phillips2012-02-2311-5/+80
| | | | | | Remove obsolete, move passing pending -> files, update those-kinds-are-high with some new info, added a couple new ones to pending.
* Make partest not fail over code.jar's placement.Paul Phillips2012-02-231-3/+5
|
* Merge remote-tracking branch 'adriaanm/ticket/errortests'Paul Phillips2012-02-236-1/+26
|\
| * test for DependentMethodTpeConversionToFunctionErrorAdriaan Moors2012-02-232-0/+9
| |
| * test for TooManyArgsPatternErrorAdriaan Moors2012-02-232-0/+9
| |
| * test for OverloadedUnapplyErrorAdriaan Moors2012-02-232-1/+8
| |
* | One more to derive trees.Paul Phillips2012-02-2316-66/+99
| | | | | | | | | | | | ClassDefs, CaseDefs, and LabelDefs. Dotting eyes, crossing tees. Point of diminishing returns is reached, declare victory and withdraw.
| |
| \
| \
| \
| \
| \
| \
| \
*-------. \ Merge remote-tracking branches 'namin/add-test-for-finitary-error', ↵Paul Phillips2012-02-2312-4/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'namin/add-test-for-parent-inherited-twice-error', 'namin/add-test-for-constructor-prefix-error', 'namin/add-tests-for-qualifying-class-error', 'namin/add-test-for-abstraction-from-volatile-type-error' and 'axel22/issue/5293' into develop
| | | | | * | Change time constants in test to avoid failures.Aleksandar Prokopec2012-02-232-4/+4
| | | | | | |
| | | | * | | Add test for AbstractionFromVolatileTypeError.Nada Amin2012-02-232-0/+15
| | | | | |/ | | | | |/|
| | | * / | Add tests for QualifyingClassError.Nada Amin2012-02-234-0/+21
| | | |/ /
| | * / / Add test for ConstructorPrefixError.Nada Amin2012-02-232-0/+11
| | |/ /
| * / / Add test case for ParentInheritedTwiceError.Nada Amin2012-02-232-0/+9
| |/ /
* / / Added test case for FinitaryError.Nada Amin2012-02-232-0/+7
|/ /
* / Methods to derive ValDefs and Templates.Paul Phillips2012-02-2315-64/+97
|/ | | | | | It's a lot like the last one. I also found trees being duplicated before being sent to the tree copier. Looks like xerox has gotten a mole in here. Trust no one.
* Methods to derive new DefDefs.Paul Phillips2012-02-2313-109/+116
| | | | | | | | | | | I guess I'd seen DefDef(mods, name, tparams, vparamss, tpt, rhs) one too many times and went a little crazy. What do you prefer: - val DefDef(mods, name, tparams, vparamss, tpt, rhs) = tree1 - treeCopy.DefDef(tree1, mods, name, tparams, vparamss, tpt, transform(rhs)) + deriveDefDef(tree1)(transform) Me too.
* One last nudge for elidable.Paul Phillips2012-02-227-38/+8
| | | | | A method with return type Nothing elides into a call to ??? . It's the role ??? was born for.
* Reworked and restored elidable.Paul Phillips2012-02-2210-118/+323
| | | | | | | | | | | | Found a better elidable implementation which is robust against other parts of the compiler doing their things. Calls to elidable methods are replaced with zero of the same type. Elidable methods themselves remain in place, but with their body replaced with a zero of the method return type. Thus is everything to be found where it is expected to be found, but nothing will be found where nothing ought to be found. Nothing of course will never be found.
* Revert recent elidable commits.Paul Phillips2012-02-228-152/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | On epfl jenkins, elidable.scala fails with: [partest] java.lang.VerifyError: (class: Test$, method: main signature: ([Ljava/lang/String;)V) Unable to pop operand off an empty stack [partest] [partest] at Test.main(elidable.scala) Strangely it is fine for me on OSX with either apple's jvm or openjdk. Since tests were not running for a while I don't know which of the recent elidable commits is responsible, so given present time demands all I can do is revert them all. Revert "Fix for SI-5215: scalac crash when @elidable used in trait" This reverts commit 5e52ce9a13f12ef159e25ac80c6be2803ec48950. Revert "Fix for SI-5215 part 2: generate return value when eliding method calls" This reverts commit 61c9b4f01d99a81e15391b270bd1b5a895f65ffd. Revert "Eliminating duplication in zero creation." This reverts commit fbb7865e137e83660257fdc79d19d29ff39c775b. Revert "Disallow eliding when Nothing is expected" This reverts commit f26a47c4e8bda2f6c689b4e9b0bb5c64ccf4c699.
* Disabled one failing test.Paul Phillips2012-02-225-0/+0
| | | | | One to go (which doesn't fail for me, which is interesting because it's a VerifyError.)
* More use of perRunCaches.Paul Phillips2012-02-226-18/+14
| | | | | | | In SpecializeTypes and beyond. It is hard for me to say with confidence what might affect the IDE for the worse, but this is all intended for the IDE's benefit (if only in terms of insurance) and hopefully intention matches reality.
*-. Merge remote-tracking branches 'axel22/feature/benchmarks' and ↵Paul Phillips2012-02-223-0/+113
|\ \ | | | | | | | | | 'hubertp/topic/refinedbm'
| | * Deprecate Refined Build Manager.Hubert Plociniczak2012-02-221-0/+1
| | | | | | | | | | | | It contains bugs that we are no longer planning to work on, sbt is a recommended approach (see integration with scala-ide)
| * | Add 2 benchmarks for Ctries.Aleksandar Prokopec2012-02-222-0/+112
| | |
* | | Don't populate the concreteSpecMethod set in presentation compiler runs. ↵Iulian Dragos2012-02-221-1/+1
| |/ |/| | | | | | | | | | | This is safe because the presentation compiler never runs the tree transformer (where this map is needed). This is a source of serious memory leaks in the IDE, but it wasn't visible before because the IDE didn't run the info transformers far enough. Interestingly, this is not a leak in batch runs: each element of the set is removed when the tree is transformed. For a nice graph of the effect of this change, see: http://i41.tinypic.com/xe0k7o.jpg
* | Merge remote-tracking branch 'soc/SI-5034' into developPaul Phillips2012-02-211-20/+0
|\ \
| * | Removed dead code in RefChecks.Simon Ochsenreither2012-02-201-20/+0
| | | | | | | | | | | | Closes SI-5034.
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge remote-tracking branches 'som-snytt/elide-nothing', ↵Paul Phillips2012-02-218-1/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 'szabolcsberecz/SI-5316' and 'szabolcsberecz/SI-5171' into develop
| | | * | | Test for SI-5171Szabolcs Berecz2012-02-212-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running the test produces the following error in 2.9.1: java.lang.VerifyError: class com.restphone.IsList$ overrides final method canEqual. Works fine in 2.10.0-M2
| | * | | | Test for SI-5316Szabolcs Berecz2012-02-212-1/+20
| | |/ / / | | | | | | | | | | | | | | | Compiler NPE on 2.9.1 when implicit parameter not found
| * / / / Disallow eliding when Nothing is expectedSom Snytt2012-02-214-0/+37
| |/ / /
* / / / Added the SYNTHETIC flag for BRIDGE methods. The Eclipse Java compiler ↵Iulian Dragos2012-02-211-1/+1
|/ / / | | | | | | | | | complains about duplicate methods otherwise.
* | | Eliminating duplication in zero creation.Paul Phillips2012-02-204-31/+26
| | |
* | | Merge remote-tracking branches 'jsuereth/2.10.0-milestones' and ↵Paul Phillips2012-02-203-2/+54
|\ \ \ | | | | | | | | | | | | 'szabolcsberecz/SI-5215' into develop
| * | | Fix for SI-5215 part 2: generate return value when eliding method callsSzabolcs Berecz2012-02-203-2/+54
| |/ /
* | | Speed up deployment using combined deploy settings.Josh Suereth2012-02-201-36/+10
| | |
* | | Fixed POM for sonatypes standards.v2.10.0-M2Josh Suereth2012-02-208-0/+96
| | |
* | | Added the ability to publish signed artifacts.Josh Suereth2012-02-201-2/+102
| | |
* | | Javadoc + Source jar generation is now complete for maven deployment.Josh Suereth2012-02-203-48/+166
|/ /
* | A better error message for inheritance conflict.Paul Phillips2012-02-195-1/+66
| | | | | | | | | | | | And some tests for pending. Closes SI-5358.
* | Streamlining skolemization, specialization.Paul Phillips2012-02-196-58/+75
| | | | | | | | | | | | Skolemization code doesn't belong in Typers. I carved out a little place for it. Also simplifications in specialization.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-10 18:49:00 +0000