diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-11 10:33:09 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-11 12:59:06 -0800 |
| commit | 1480b28944e13780498304e32141e30302f9aaef (patch) | |
| tree | 9fc203d79a669dd8a73cd5b503c08fe579bee99e /src/eclipse/continuations-library/.project | |
| parent | 107afdc95e902a42851603ad7aab2dd5b9d319dc (diff) | |
| parent | 0fd2d80e0129c7fa7d2b081cc35b06ca5651c3a5 (diff) | |
| download | scala-1480b28944e13780498304e32141e30302f9aaef.tar.gz scala-1480b28944e13780498304e32141e30302f9aaef.tar.bz2 scala-1480b28944e13780498304e32141e30302f9aaef.zip | |
Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master
* merge-wip-into-2.10.x: (44 commits)
Cleanups of reifyBoundTerm and reifyBoundType
SI-5841 reification of renamed imports
Share the empty LinkedList between first0/last0.
SI-4922 Show default in Scaladoc for generic methods.
SI-6614 Test case for fixed ArrayStack misconduct.
SI-6690 Release reference to last dequeued element.
SI-5789 Use the ReplTest framework in the test
SI-5789 Checks in the right version of the test
SI-5789 Removes assertion about implclass flag in Mixin.scala
SI-6766 Makes the -Pcontinuations:enable flag a project specific preference
more ListOfNil => Nil
DummyTree => CannotHaveAttrs
evicts assert(false) from the compiler
introduces global.pendingSuperCall
refactors handling of parent types
unifies approaches to call analysis in TreeInfo
TypeApply + Select and their type-level twins
SI-6696 removes "helper" tree factory methods
SI-6766 Create a continuations project in eclipse
Now the test suite runs MIMA for compatibility testing.
...
Conflicts:
src/compiler/scala/reflect/reify/codegen/GenUtils.scala
src/compiler/scala/tools/nsc/ast/Trees.scala
src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/eclipse/scala-compiler/.classpath
src/eclipse/scalap/.classpath
src/reflect/scala/reflect/internal/StdNames.scala
src/reflect/scala/reflect/internal/TreeInfo.scala
Diffstat (limited to 'src/eclipse/continuations-library/.project')
| -rw-r--r-- | src/eclipse/continuations-library/.project | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/eclipse/continuations-library/.project b/src/eclipse/continuations-library/.project new file mode 100644 index 0000000000..f3a53a3d97 --- /dev/null +++ b/src/eclipse/continuations-library/.project @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>continuations-library</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.scala-ide.sdt.core.scalabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.scala-ide.sdt.core.scalanature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> + <linkedResources> + <link> + <name>build-quick-continuations-library</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/build/quick/classes/continuations/library</locationURI> + </link> + <link> + <name>library</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/src/continuations/library</locationURI> + </link> + </linkedResources> +</projectDescription> |