summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #271 from jsuereth/2.9.x-version-fixinv2.9.2-RC1Josh Suereth2012-03-1611-55/+206
|\ | | | | 2.9.x version fixin
| * 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-52/+155
| |
| * properties loading is now maven/osgi version aware. yippie.Josh Suereth2012-03-141-14/+13
| |
| * Modified build for new versioning scheme.Josh Suereth2012-03-143-3/+10
| |
| * Moved to Mirco's versioning idea.Josh Suereth2012-03-142-6/+19
| |
| * Fixes to build numbering system for 2.9.x releaseJosh Suereth2012-03-144-9/+32
| |
* | Fix for a bug in CharArrayReader which made tri...Paul Phillips2012-03-144-5/+35
| | | | | | | | | | | | | | | | | | Fix for a bug in CharArrayReader which made triple quoted strings fail to parse sometimes. Note: when the temptation strikes to adjust for special cases by letting the regular case happen and subsequently attempting to fix the ball of mutation by selectively applying what seems like the inverse operation, please consider the possibility that this is not the optimal approach. Closes SI-4785, no review.
* | Merge pull request #253 from rjmac/backport/4835Josh Suereth2012-03-143-2/+53
|\ \ | |/ |/| Backport/4835
| * Remove source-compatibility-breaking parenthesesRobert J. Macomber2012-03-141-1/+1
| |
| * Add test case for SI-4835 (https://issues.scala-lang.org/browse/SI-4835)Kota Mizushima2012-03-022-0/+45
| | | | | | | | | | | | This test case only confirm that StreamIterator's lazyiness is not broken. Test case about memory consumption could be created. However, such a test cause a greatly increased time of test.
| * * Fixed SI-4835 (https://issues.scala-lang.org/browse/SI-4835).Kota Mizushima2012-03-021-3/+9
| | | | | | | | | | | | | | Conflicts: src/library/scala/collection/immutable/Stream.scala - removed inheritance from AbstractIterator
* | Fix for checkfile difference.Paul Phillips2012-03-081-1/+2
| |
* | Revert attempt to limit private types in lubs.Paul Phillips2012-03-084-1/+84
| | | | | | | | | | | | | | | | | | | | Has to be somewhere more directly tied to structural refinements. See run/lub-visibility.scala before/after output for motivation. Closes SI-5534. Conflicts: src/compiler/scala/tools/nsc/symtab/Types.scala
* | Fix deadlocks occurring during presentation compiler shutdown.Iulian Dragos2012-03-062-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | During shutdown, other threads can still post work items on the work queue. They will never be serviced, leading to clients waiting forever. The fix is to replace the implementation of the queue with a 'always fail' implementation during shutdown. Review by @odersky.(cherry picked from commit 53fb61cba9f02c176f1aae80f0b270491fbbf91c) (removed the test because there are no presentation compiler tests in 2.9.x and it depends on test infrastructure that is not in place). Conflicts: src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
| |
| \
*-. \ Merge remote-tracking branches ↵Paul Phillips2012-03-053-5/+19
|\ \ \ | | | | | | | | | | | | 'szabolcsberecz/backports/fix-specialized-tests' and 'szabolcsberecz/backports/SI-5380' into develop-2.9.x
| | * | Fixes SI-5380: non-local return of try expressionSzabolcs Berecz2012-03-032-3/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 02e260a8e67e2b2b6f876aafe76cd61248a89374) Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala Lift only *non-local* returns of try expressions. (cherry picked from commit edf3ae0b8c3688b5cacbe2f7e2ae826f5fbb7644) Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala
| * / Fixed instrumented.jar and scalacheck.jar locationSzabolcs Berecz2012-03-031-2/+5
| |/ | | | | | | | | | | | | | | | | | | Depending on the file order in the directory, PathSettings.srcSpecLib could end up as "instrumented.jar.desired.sha1" instead of "instrumented.jar" which would cause all the specialized tests to fail. The same goes for scalacheck.jar (cherry picked from commit 35934129f2593816c3d9a0a5d5786737868fed6c)
* | Merge pull request #258 from dragos/2.9.xJosh Suereth2012-03-036-15/+81
|\ \ | | | | | | Fix for cps regression.
| * | Fix for cps regression. Closes 5538. Closes 5445.Tiark Rompf2012-03-036-15/+81
|/ / | | | | | | (cherry picked from commit 9f5767dd31395cac0bc64c86c2cacf247b1924fa)
* / Fixed type in maven deployJosh Suereth2012-03-031-1/+1
|/
* Fixes NPE using iterator with an XML attribute ...Paul Phillips2012-03-015-4/+32
| | | | | | | | Fixes NPE using iterator with an XML attribute being null or None ) (SI-5052 Also fixes incorrect size method (SI-5115 ) Contributed by Jordi Salvat i Alabart. Closes SI-5052, SI-5115, no review.
* Fixing missing , because I'm an idiotJosh Suereth2012-03-011-1/+1
|
* Fixed nightly target to include all documentationJosh Suereth2012-03-011-1/+1
|
* Yanked lubList from master.Paul Phillips2012-02-291-33/+79
| | | | | | neg/t3399.scala hangs in a lubbing loop; rather than try to piece out where the earlier cherry-pick went wrong, I took the current function and adapted it to the 2.9.x source.
* Created simple infrastructure for creating muta...Paul Phillips2012-02-249-22/+54
| | | | | | | | | | | | | | | | | | | | | Created simple infrastructure for creating mutable sets and maps which are automatically cleared after each compilation run. Since I am not too familiar with the mechanics of the presentation compiler I'm not sure this addresses the problem, or that it doesn't clear something which shouldn't be cleared. Also, this is only a sampling of possible mutable sets and maps: let me know if it does the job and I can expand it. Review by dragos. Conflicts: src/compiler/scala/reflect/internal/SymbolTable.scala src/compiler/scala/tools/nsc/backend/icode/ICodes.scala Merge note: Oops, perRunCaches wasn't in 2.9.1. This is way more involved than I'd intended, I jumped to the conclusion it was already in there based on a note in 0c2f493804db6b which said it should go into 2.9.2. I think it's OK though.
* slight improvement to lubList so that the simpl...Adriaan Moors2012-02-242-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slight improvement to lubList so that the simple case of lubbing type constructors works. review by extempore the strategy is to detect when the ts in lub(ts) are actually type constructors and remember their type parameters the BTS of a type constructor is a list of proper types (the type constructors have been applied to their dummy arguments, which are simply type refs to the original type parameters) in lubList, we undo this damage by stripping these dummy arguments (they refer to type parameters that are meant to be bound) a better fix would be to actually bind those type parameters that appear free in error, but that would require major changes to the BTS infrastructure example that only kindasorta works now... given: trait Container[+T] trait Template[+CC[X] <: Container[X]] class C1[T] extends Template[Container] with Container[T] C1's BTS contains Template[Container] with Container[T], but that should really be [T] => Template[Container] with Container[T] instead of wrapping it in a polytype, the current approach uses elimHOTparams to patch up this type so that it looks more like a type ctor: Template[Container] with Container, but this is ill-kinded as Template[Container] is a proper type, whereas Container is not the performance impact should be minimal, but caveat reviewer
* Better fix for memory leaks in the presentation compiler. Switched to ↵Iulian Dragos2012-02-241-0/+1
| | | | perRunCaches and call clearAll from the presentation compiler
* More use of perRunCaches.Paul Phillips2012-02-246-14/+11
| | | | | | | 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 pull request #236 from jsuereth/fix-snapshot-version-numberJosh Suereth2012-02-241-1/+3
|\ | | | | Fix snapshot version number
| * Fix version.number setting for snapshotsJosh Suereth2012-02-241-1/+3
| |
* | -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
* changed repo id to denote new credentials for new serer.Josh Suereth2012-02-231-1/+1
|
* Modified repository deployments to point to OSSRHJosh Suereth2012-02-231-5/+2
|
* Removed not-binary-compatible methods.Paul Phillips2012-02-221-2/+4
| | | | Which daniel snuck by me when I was snoozing.
* Fix various InnerClasses bugs.Grzegorz Kossakowski2012-02-222-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two major problems: 1. InnerClasses table missed entries that would close the chain between nested and top-level class. 2. In some situations, classes corresponding to objects would be not be reported in the InnerClasses table. For details it's the best to check SI-4819, SI-4820 and SI-4983. First problem mentioned above was straightforward to fix so I won't be going into details. The second one deserves more attention. From now, classes corresponding to objects are properly reported as inner classes. Also, members (classes, objects) of objects are reported as inner classes of classes corresponding to objects. There's one caveat though: top level objects get two classes (regular and mirror). Members of top-level objects are declared as inner classes of *mirror* class and not regular one. The reason for that is to allow importing them from Java. For example: object A { class B } will be compiled into following classes: A, A$, A$B. If we declared A$B as inner class of A$ (regular class for objects) then it would be impossible to import B using "import A.B" or "import A$.B" constructs. The reason for that is that Java compiler seems to blindly put dollars instead of looking at InnerClasses attribute. Since non-top-level objects don't have a mirror class it's impossible to use the same solution. Thus, in case like this: object A { object B { class C } } it's impossible to import C from Java. That's the tradeoff for fixing other (more serious) problems. It's never been possible to do that in a clean way so we are not making situation worse. As a nice consequence of this change, we get better way to refer to inner members of top-level objects. It's been reflected in one of test-cases that is updated by this change. Fixes SI-4789 SI-4819 SI-4820 SI-4983 and possibly some other tickets related to reflection. Review by extempore, dragos. Conflicts: src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala test/files/pos/javaReadsSigs/fromjava.java
* Merge remote-tracking branch 'jsuereth/deploy-fix-2.9.x' into 2.9.xPaul Phillips2012-02-2211-48/+332
|\
| * Speed up deployment using combined deploy settings.Josh Suereth2012-02-211-36/+10
| |
| * Fixed POM for sonatypes standards.Josh Suereth2012-02-218-0/+96
| |
| * Added the ability to publish signed artifacts.Josh Suereth2012-02-211-2/+102
| |
| * Merged doc fixes from 2.10.x into 2.9.xJosh Suereth2012-02-213-46/+160
| |
* | Merge remote-tracking branch 'szeiger/backport/cps-if-then-else-91dbfb2' ↵Paul Phillips2012-02-225-28/+101
|\ \ | | | | | | | | | into 2.9.x
| * | improve cps handling of if-then-else. no review.Tiark Rompf2012-02-225-28/+101
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 91dbfb2a8f466cf30f7b02cbc6f3e89376d31c59) Conflicts: src/continuations/plugin/scala/tools/selectivecps/SelectiveANFTransform.scala
* | | Merge remote-tracking branch 'dcsobral/backport/5439' into 2.9.xPaul Phillips2012-02-226-163/+625
|\ \ \ | |/ / |/| |
| * | Move code to a better place.Daniel C. Sobral2012-02-221-2/+3
| | |
| * | Major rewrite of sys.process documentation.Daniel C. Sobral2012-02-226-158/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the stream closing requisite on ProcessIO, document a few stream closing semantics on BasicIO, and then take advantage of my newly-found knowledge and go on a rampage all over sys.process. Also make two methods that were implemented but not present in the public API visible. Conflicts: src/library/scala/sys/process/ProcessBuilder.scala
| * | Close file descriptor leak in sys.process.Daniel C. Sobral2012-02-221-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes most file descriptor leaks in sys.process through the simple expedient of making sure every InputStream being read by BasicIO is closed once there's nothing more to read. A single file descriptor leak would remain for the OutputStream (that is, that process stdin) of each Process, which is closed after the InputStream being read to feed it is closed. Special care is taken not to close the calling process stdin. Fix an additional non-reported by where sending data to a process that had already terminated would result in an exception being thrown. File descriptors can still leak in some conditions that must be handled by user code. Documentation to that effect will follow. Closes SI-5439.
* | | fixes SI-5506. better cps type propagation for polymorphic and ↵Tiark Rompf2012-02-214-7/+112
| | | | | | | | | | | | | | | | | | | | | | | | multi-argument list methods. Conflicts: src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
* | | Added the SYNTHETIC flag for BRIDGE methods. The Eclipse Java compiler ↵Iulian Dragos2012-02-211-1/+1
| | | | | | | | | | | | complains about duplicate methods otherwise.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 23:03:32 +0000