diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2008-05-13 15:32:22 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2008-05-13 15:32:22 +0000 |
| commit | ad903380ca09444fa11ae274e9569a46f3c66f9b (patch) | |
| tree | 6a8deee57b12b9fbde25c6828b6ab3b414090827 | |
| parent | 1f8b79f1b3db85eb3a8098c702e6a68b6881379e (diff) | |
| download | scala-ad903380ca09444fa11ae274e9569a46f3c66f9b.tar.gz scala-ad903380ca09444fa11ae274e9569a46f3c66f9b.tar.bz2 scala-ad903380ca09444fa11ae274e9569a46f3c66f9b.zip | |
Rolled back unintented committed files.
| -rw-r--r-- | .classpath | 14 | ||||
| -rw-r--r-- | .project | 11 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/Members.scala | 1 |
3 files changed, 17 insertions, 9 deletions
diff --git a/.classpath b/.classpath index 04e4f3d37e..36151c95b9 100644 --- a/.classpath +++ b/.classpath @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/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="build/quick/lib/compiler/"/> <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="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"/> + <classpathentry kind="output" path="build/quick/lib/compiler"/> </classpath> @@ -10,8 +10,19 @@ <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 7302a641d5..5dcebe7ecf 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala @@ -168,7 +168,6 @@ 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 |