diff options
| -rw-r--r-- | .classpath | 14 | ||||
| -rw-r--r-- | .project | 11 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/Members.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/Iterator.scala | 2 |
4 files changed, 10 insertions, 18 deletions
diff --git a/.classpath b/.classpath index 36151c95b9..04e4f3d37e 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/compiler"/> - <classpathentry kind="lib" path="build/quick/lib/compiler/"/> + <classpathentry kind="lib" path="lib/ant/ant-contrib.jar"/> + <classpathentry kind="lib" path="lib/ant/vizant.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/fjbg.jar"/> <classpathentry kind="lib" path="lib/msil.jar"/> - <classpathentry kind="lib" path="lib/ant-contrib.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="build/quick/lib/library" sourcepath="src/library"/> <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry kind="output" path="build/quick/lib/compiler"/> + <classpathentry kind="lib" path="lib/sabbus.jar"/> + <classpathentry kind="lib" path="lib/scala-library.jar"/> + <classpathentry kind="lib" path="lib/scala-compiler.jar"/> + <classpathentry kind="lib" path="/usr/share/ant/lib/ant.jar"/> + <classpathentry kind="output" path="build/quick/classes/compiler"/> </classpath> @@ -10,19 +10,8 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.pde.PluginNature</nature> <nature>ch.epfl.lamp.sdt.core.scalanature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala index 5dcebe7ecf..7302a641d5 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala @@ -168,6 +168,7 @@ trait Members { self: ICodes => var returnType: TypeKind = _ var recursive: Boolean = false + var callsInlineMethods: Boolean = false /** local variables and method parameters */ var locals: List[Local] = Nil diff --git a/src/library/scala/Iterator.scala b/src/library/scala/Iterator.scala index 638f837478..84c17b9953 100644 --- a/src/library/scala/Iterator.scala +++ b/src/library/scala/Iterator.scala @@ -219,7 +219,7 @@ trait Iterator[+A] { * @return the new iterator */ @throws(classOf[NoSuchElementException]) - def take(n: Int) = new Iterator[A] { + def take(n: Int): Iterator[A] = new Iterator[A] { var remaining = n def hasNext = remaining > 0 && Iterator.this.hasNext def next(): A = |