Adding eclipse meta data.

.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/compiler"/>
+	<classpathentry exported="true" kind="lib" path="build/quick/lib/compiler/"/>
+	<classpathentry exported="true" kind="lib" path="lib/fjbg.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/msil.jar"/>
+	<classpathentry exported="true" 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="output" path="build/quick/lib/compiler"/>
+</classpath>

.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scala</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>ch.epfl.lamp.sdt.core.scalabuilder</name>
+			<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>
+</projectDescription>

META-INF/MANIFEST.MF

@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Scala Compiler
+Bundle-SymbolicName: nsc;singleton:=true
+Bundle-Version: 1.0.0
+Eclipse-LazyStart: true
+Bundle-ClassPath: lib/fjbg.jar,
+ build/quick/lib/library/,
+ build/quick/lib/compiler/
+Export-Package: ch.epfl.lamp.fjbg,
+ scala,
+ scala.collection,
+ scala.runtime,
+ scala.collection.immutable,
+ scala.collection.mutable,
+ scala.collection.jcl,
+ scala.util,
+ scala.tools.nsc,
+ scala.tools.nsc.util,
+ scala.tools.nsc.typechecker,
+ scala.tools.nsc.symtab,
+ scala.tools.nsc.ast,
+ scala.tools.nsc.ast.parser,
+ scala.tools.nsc.reporters
+Require-Bundle: org.apache.ant

src/compiler/scala/tools/nsc/CompilationUnits.scala

@@ -28,7 +28,7 @@ trait CompilationUnits requires Global {
      */
     val depends = new HashSet[Symbol]
 
-    def position(pos: Int) = new OffsetPosition(source, pos)
+    def position(pos: Int) = source.position(pos)
 
     /** The icode representation of classes in this compilation unit.
      *  It is empty up to phase 'icode'.

src/compiler/scala/tools/nsc/CompileServer.scala

@@ -10,7 +10,7 @@ import java.io.{BufferedOutputStream, File, FileOutputStream, PrintStream}
 import java.lang.{Runtime, System, Thread}
 
 import scala.concurrent.ops.spawn
-import scala.tools.nsc.doc.DocGenerator
+import scala.tools.nsc.doc.{DocDriver => DocGenerator}
 import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
 import scala.tools.nsc.util.FakePos //Position
 import scala.tools.util.SocketServer

src/compiler/scala/tools/nsc/ast/parser/Scanners.scala

@@ -426,23 +426,23 @@ trait Scanners {
               val last = in.last
               in.next
               last match {
-                case ' '|'\t'|'\n'|'{'|'('|'>' if xml.Parsing.isNameStart(in.ch) || in.ch == '!' || in.ch == '?' =>
-                  token = XMLSTART
-                case _ =>
-                  // Console.println("found '<', but last is '"+in.last+"'"); // DEBUG
-                  putChar('<')
-                  getOperatorRest
+              case ' '|'\t'|'\n'|'{'|'('|'>' if xml.Parsing.isNameStart(in.ch) || in.ch == '!' || in.ch == '?' =>
+                token = XMLSTART
+              case _ =>
+                // Console.println("found '<', but last is '"+in.last+"'"); // DEBUG
+                putChar('<')
+                getOperatorRest
               }
               return
 
-              case '~' | '!' | '@' | '#' | '%' |
-                   '^' | '*' | '+' | '-' | /*'<' | */
-                   '>' | '?' | ':' | '=' | '&' |
-                   '|' | '\\' =>
-                putChar(in.ch)
-                in.next
-                getOperatorRest; // XXX
-                return
+            case '~' | '!' | '@' | '#' | '%' |
+                 '^' | '*' | '+' | '-' | /*'<' | */
+                 '>' | '?' | ':' | '=' | '&' |
+                 '|' | '\\' =>
+               putChar(in.ch)
+               in.next
+               getOperatorRest; // XXX
+               return
 
               case '/' if !matchInScanner =>
                 in.next
@@ -878,8 +878,7 @@ trait Scanners {
             case '\'' => putChar('\'')
             case '\\' => putChar('\\')
             case _    =>
-              syntaxError(in.cpos - 1, // Position.encode(in.cline, in.ccol - 1),
-                          "invalid escape character")
+              syntaxError(in.cpos - 1, "invalid escape character")
               putChar(in.ch)
           }
           in.next

src/compiler/scala/tools/nsc/ast/parser/Tokens.scala

@@ -107,4 +107,8 @@ object Tokens {
   final val BACK_QUOTE       = 102
   final val MULTI_QUOTE      = 103
   final val EMPTY_STRING     = 104
+  final val WHITESPACE = 105
+  final val IGNORE = 106
+  final val XML_SINGLEEND = 107
+  final val XML_STARTEND = 108
 }