33 files changed, 110 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 378eac25d3..84c048a73c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-build
+/build/
diff --git a/build.xml b/build.xml
index 854bb9c68b..6906c15a19 100755
--- a/build.xml
+++ b/build.xml
@@ -472,7 +472,7 @@ TODO:
       There must be a variable of the shape @{stage}.@{project}.build.path
       for all @{stage} in locker, quick, strap
       and all @{project} in library, reflect, compiler
-        when stage is quick, @{project} also includes: actors, repl, xml, swing, plugins, scalacheck, interactive, scaladoc, partest, scalap
+        when stage is quick, @{project} also includes: actors, parser-combinators, xml, repl, swing, plugins, scalacheck, interactive, scaladoc, partest, scalap
     -->
 
     <!-- LOCKER -->
@@ -510,6 +510,11 @@ TODO:
       <pathelement location="${build-quick.dir}/classes/actors"/>
     </path>
 
+    <path id="quick.parser-combinators.build.path">
+      <path refid="quick.library.build.path"/>
+      <pathelement location="${build-quick.dir}/classes/parser-combinators"/>
+    </path>
+
     <path id="quick.reflect.build.path">
       <path refid="quick.library.build.path"/>
       <pathelement location="${build-quick.dir}/classes/reflect"/>
@@ -545,6 +550,7 @@ TODO:
     <path id="quick.scalacheck.build.path">
       <pathelement location="${build-quick.dir}/classes/library"/>
       <pathelement location="${build-quick.dir}/classes/actors"/>
+      <pathelement location="${build-quick.dir}/classes/parser-combinators"/>
       <pathelement location="${build-quick.dir}/classes/scalacheck"/>
       <path refid="partest.extras.classpath"/>
     </path>
@@ -566,6 +572,7 @@ TODO:
     <path id="quick.scaladoc.build.path">
       <path refid="quick.xml.build.path"/>
       <path refid="quick.compiler.build.path"/>
+      <path refid="quick.parser-combinators.build.path"/>
       <pathelement location="${build-quick.dir}/classes/partest"/>
       <pathelement location="${build-quick.dir}/classes/scaladoc"/>
     </path>
@@ -577,6 +584,7 @@ TODO:
     </path>
 
     <path id="quick.bin.tool.path">
+      <path refid="quick.parser-combinators.build.path"/>
       <path refid="quick.xml.build.path"/>
       <path refid="quick.repl.build.path"/>
       <path refid="quick.actors.build.path"/>
@@ -596,6 +604,8 @@ TODO:
 
     <path id="pack.bin.tool.path">
       <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
+      <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/>
+      <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
@@ -622,7 +632,8 @@ TODO:
       <fileset dir="${asm-classes}"/>
     </path>
 
-    <path id="pack.xml.files"> <fileset dir="${build-quick.dir}/classes/xml"/> </path>
+    <path id="pack.parser-combinators.files">    <fileset dir="${build-quick.dir}/classes/parser-combinators"/> </path>
+    <path id="pack.xml.files">        <fileset dir="${build-quick.dir}/classes/xml"/> </path>
     <path id="pack.swing.files">      <fileset dir="${build-quick.dir}/classes/swing"/> </path>
     <path id="pack.reflect.files">    <fileset dir="${build-quick.dir}/classes/reflect"/> </path>
     <path id="pack.plugins.files">    <fileset dir="${build-quick.dir}/classes/continuations-plugin"/> </path>
@@ -663,6 +674,7 @@ TODO:
     <!-- MISC -->
     <path id="docs.compiler.path">
       <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
+      <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
@@ -689,6 +701,7 @@ TODO:
 
     <path id="partest.classpath">
       <path refid="pack.compiler.path"/>
+      <pathelement location="${build-pack.dir}/lib/scala-parser-combinators.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-xml.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/>
       <pathelement location="${build-pack.dir}/lib/scalap.jar"/>
@@ -718,6 +731,7 @@ TODO:
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-reflect.jar"/>
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-compiler.jar"/>
       <pathelement location="${build-osgi.dir}/org.scala-lang.scala-actors.jar"/>
+      <pathelement location="${build-osgi.dir}/org.scala-lang.scala-parser-combinators.jar"/>
       <path refid="pax.exam.classpath"/>
       <path refid="forkjoin.classpath"/>
     </path>
@@ -1162,6 +1176,9 @@ TODO:
   <target name="quick.actors"     depends="quick.lib">
     <staged-build with="locker"   stage="quick" project="actors"/> </target>
 
+  <target name="quick.parser-combinators"    depends="quick.lib">
+    <staged-build with="locker"   stage="quick" project="parser-combinators"/> </target>
+
   <target name="quick.reflect"    depends="quick.lib">
     <staged-build with="locker"   stage="quick" project="reflect"/> </target>
 
@@ -1171,7 +1188,7 @@ TODO:
   <target name="quick.repl"       depends="quick.comp">
     <staged-build with="locker"   stage="quick" project="repl"/> </target>
 
-  <target name="quick.scalacheck" depends="quick.actors, quick.lib">
+  <target name="quick.scalacheck" depends="quick.actors, quick.parser-combinators, quick.lib">
     <staged-build with="locker"   stage="quick" project="scalacheck" args="-nowarn"/> </target>
 
   <target name="quick.scalap"     depends="quick.repl">
@@ -1180,7 +1197,7 @@ TODO:
   <target name="quick.partest"    depends="quick.scalap, quick.xml, quick.repl, asm.done">
     <staged-build with="locker"   stage="quick" project="partest" version="partest"/> </target>
 
-  <target name="quick.scaladoc"   depends="quick.comp, quick.partest">
+  <target name="quick.scaladoc"   depends="quick.comp, quick.partest, quick.parser-combinators">
     <staged-build with="locker"   stage="quick" project="scaladoc" version="scaladoc"/> </target>
 
   <target name="quick.interactive" depends="quick.comp, quick.scaladoc">
@@ -1225,7 +1242,7 @@ TODO:
     </staged-uptodate>
   </target>
 
-  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalacheck, quick.scalap, quick.interactive, quick.xml, quick.swing, quick.plugins, quick.partest, quick.scaladoc">
+  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalacheck, quick.scalap, quick.interactive, quick.xml, quick.parser-combinators, quick.swing, quick.plugins, quick.partest, quick.scaladoc">
     <staged-bin stage="quick" classpathref="quick.bin.tool.path"/>
   </target>
 
@@ -1240,7 +1257,8 @@ TODO:
     <staged-pack project="library"/></target>
 
   <target name="pack.actors"  depends="quick.lib">                <staged-pack project="actors"/> </target>
-  <target name="pack.xml" depends="quick.xml">    <staged-pack project="xml"/> </target>
+  <target name="pack.xml"     depends="quick.xml">                <staged-pack project="xml"/> </target>
+  <target name="pack.parser-combinators" depends="quick.parser-combinators"> <staged-pack project="parser-combinators"/> </target>
   <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
   <target name="pack.reflect" depends="quick.reflect">            <staged-pack project="reflect"/> </target>
 
@@ -1277,7 +1295,7 @@ TODO:
 
   <target name="pack.scalap"     depends="quick.scalap">     <staged-pack project="scalap"     targetjar="scalap.jar"/> </target>
 
-  <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.partest, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.xml,pack.swing">
+  <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.partest, pack.plugins, pack.reflect, pack.scalacheck, pack.scalap, pack.xml, pack.swing, pack.parser-combinators">
     <staged-bin stage="pack"/>
   </target>
 
@@ -1381,6 +1399,7 @@ TODO:
       <stopwatch name="osgi.bundle.timer"/>
       <make-bundle name="scala-library" version="${osgi.version.number}" />
       <make-bundle name="scala-actors" version="${osgi.version.number}" />
+      <make-bundle name="scala-parser-combinators" version="${osgi.version.number}" />
       <make-bundle name="scala-reflect" version="${osgi.version.number}" />
       <make-bundle name="scala-compiler" version="${osgi.version.number}" />
       <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
@@ -1707,6 +1726,12 @@ TODO:
     </staged-docs>
   </target>
 
+  <target name="docs.parser-combinators" depends="docs.start">
+    <staged-docs project="parser-combinators" title="Scala Parser Combinator Library" docroot="rootdoc.txt">
+      <include name="**/*.scala"/>
+    </staged-docs>
+  </target>
+
   <target name="docs.comp" depends="docs.start">
     <staged-docs project="compiler" title="Scala Compiler" docroot="rootdoc.txt">
       <include name="**/*.scala"/>
@@ -1775,7 +1800,7 @@ TODO:
     </staged-uptodate>
   </target>
 
-  <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.xml, docs.scalap, docs.partest, docs.continuations-plugin"/>
+  <target name="docs.done" depends="docs.jline, docs.comp, docs.man, docs.lib, docs.xml, docs.parser-combinators, docs.scalap, docs.partest, docs.continuations-plugin"/>
 
 <!-- ===========================================================================
                                   DISTRIBUTION
@@ -1823,6 +1848,7 @@ TODO:
     <copy-bundle name="scala-xml"/>
     <copy-bundle name="scala-swing"/>
     <copy-bundle name="scala-actors"/>
+    <copy-bundle name="scala-parser-combinators"/>
     <copy-bundle name="scala-compiler"/>
     <copy toDir="${dist.dir}/bin">
       <fileset dir="${build-pack.dir}/bin"/>
@@ -1882,6 +1908,7 @@ TODO:
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-xml-src.jar" basedir="${src.dir}/xml"/>
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-swing-src.jar"    basedir="${src.dir}/swing"/>
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-reflect-src.jar"  basedir="${src.dir}/reflect"/>
+    <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-parser-combinators-src.jar"  basedir="${src.dir}/parser-combinators"/>
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scalap-src.jar"         basedir="${src.dir}/scalap"/>
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scala-partest-src.jar"  basedir="${src.dir}/partest"/>
   </target>
@@ -1933,6 +1960,7 @@ TODO:
       <fileset dir="${src.dir}/xml"/>
       <fileset dir="${src.dir}/swing"/>
       <fileset dir="${src.dir}/actors"/>
+      <fileset dir="${src.dir}/parser-combinators"/>
       <fileset dir="${src.dir}/forkjoin"/>
     </jar>
     <jar whenmanifestonly="fail" destfile="${lib.dir}/scala-reflect-src.jar" basedir="${src.dir}/reflect"/>
diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd
new file mode 100644
index 0000000000..d712a4ba2a
--- /dev/null
+++ b/src/build/bnd/scala-parser-combinators.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Scala Parser Combinators Library
+Bundle-SymbolicName: org.scala-lang.scala-parser-combinators
+ver: @VERSION@
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index a51562103c..7df9a8ec9a 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -109,6 +109,7 @@
         <deploy-one                name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
         <deploy-one                name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
         <deploy-one                name="scala-xml"      version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+        <deploy-one                name="scala-parser-combinators"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
         <deploy-one                name="scala-partest"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
         <deploy-one                name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
         <deploy-one                name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
diff --git a/src/build/maven/scala-parser-combinators-pom.xml b/src/build/maven/scala-parser-combinators-pom.xml
new file mode 100644
index 0000000000..cddff269c8
--- /dev/null
+++ b/src/build/maven/scala-parser-combinators-pom.xml
@@ -0,0 +1,59 @@
+<project
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.scala-lang</groupId>
+	<artifactId>scala-parser-combinators</artifactId>
+	<packaging>jar</packaging>
+	<version>@VERSION@</version>
+  <name>Scala Parser Combinators</name>
+  <description>Parser Combinator Library for the Scala Programming Language</description>
+	<url>http://www.scala-lang.org/</url>
+   <inceptionYear>2002</inceptionYear>
+   <organization>
+      <name>LAMP/EPFL</name>
+      <url>http://lamp.epfl.ch/</url>
+   </organization>
+   <licenses>
+      <license>
+         <name>BSD-like</name>
+         <url>http://www.scala-lang.org/downloads/license.html
+         </url>
+         <distribution>repo</distribution>
+      </license>
+   </licenses>
+   <scm>
+      <connection>scm:git:git://github.com/scala/scala.git</connection>
+      <url>https://github.com/scala/scala.git</url>
+   </scm>
+   <issueManagement>
+      <system>JIRA</system>
+      <url>https://issues.scala-lang.org/</url>
+   </issueManagement>
+   <properties>
+       <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+   </properties>
+   <dependencies>
+   </dependencies>
+   <distributionManagement>
+      <repository>
+         <id>scala-tools.org</id>
+         <url>@RELEASE_REPOSITORY@</url>
+      </repository>
+      <snapshotRepository>
+         <id>scala-tools.org</id>
+         <url>@SNAPSHOT_REPOSITORY@</url>
+         <uniqueVersion>false</uniqueVersion>
+      </snapshotRepository>
+  </distributionManagement>
+  <developers>
+    <developer>
+      <id>lamp</id>
+      <name>EPFL LAMP</name>
+    </developer>
+    <developer>
+      <id>Typesafe</id>
+      <name>Typesafe, Inc.</name>
+    </developer>
+  </developers>
+</project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 44198adb1e..aac121f828 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -154,6 +154,7 @@ MAIN DISTRIBUTION PACKAGING
     <mvn-copy-lib mvn.artifact.name="jline"/>
     <mvn-copy-lib mvn.artifact.name="scala-library"/>
     <mvn-copy-lib mvn.artifact.name="scala-xml"/>
+    <mvn-copy-lib mvn.artifact.name="scala-parser-combinators"/>
     <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
     <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
     <mvn-copy-lib mvn.artifact.name="scala-swing"/>
@@ -208,6 +209,10 @@ MAIN DISTRIBUTION PACKAGING
          basedir="${build-docs.dir}/xml">
       <include name="**/*"/>
     </jar>
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-parser-combinators/scala-parser-combinators-docs.jar"
+         basedir="${build-docs.dir}/parser-combinators">
+      <include name="**/*"/>
+    </jar>
     <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
          basedir="${build-docs.dir}/compiler">
       <include name="**/*"/>
diff --git a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala b/src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala
index 0683ea927d..0683ea927d 100644
--- a/src/library/scala/util/parsing/combinator/ImplicitConversions.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala
diff --git a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala
index 01288a182e..01288a182e 100644
--- a/src/library/scala/util/parsing/combinator/JavaTokenParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/PackratParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala
index a11dd18e62..a11dd18e62 100644
--- a/src/library/scala/util/parsing/combinator/PackratParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/parser-combinators/scala/util/parsing/combinator/Parsers.scala
index 16754646fd..16754646fd 100644
--- a/src/library/scala/util/parsing/combinator/Parsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/Parsers.scala
diff --git a/src/library/scala/util/parsing/combinator/RegexParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala
index 8ebbc573ad..8ebbc573ad 100644
--- a/src/library/scala/util/parsing/combinator/RegexParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala
index d8029d068f..d8029d068f 100644
--- a/src/library/scala/util/parsing/combinator/lexical/Lexical.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala
diff --git a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala
index 2e12915bb8..2e12915bb8 100644
--- a/src/library/scala/util/parsing/combinator/lexical/Scanners.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala
diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala
index 32d7502cda..32d7502cda 100644
--- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala
diff --git a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala
index 5b9d14c9a7..5b9d14c9a7 100644
--- a/src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala
index adcf85da7a..adcf85da7a 100644
--- a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala b/src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala
index b06babcd7e..b06babcd7e 100644
--- a/src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala
diff --git a/src/library/scala/util/parsing/combinator/token/StdTokens.scala b/src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala
index a102d1541e..a102d1541e 100644
--- a/src/library/scala/util/parsing/combinator/token/StdTokens.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala
diff --git a/src/library/scala/util/parsing/combinator/token/Tokens.scala b/src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala
index 5c3f1f95b5..5c3f1f95b5 100644
--- a/src/library/scala/util/parsing/combinator/token/Tokens.scala
+++ b/src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala
diff --git a/src/library/scala/util/parsing/input/CharArrayReader.scala b/src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala
index 22530cb9aa..22530cb9aa 100644
--- a/src/library/scala/util/parsing/input/CharArrayReader.scala
+++ b/src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala
diff --git a/src/library/scala/util/parsing/input/CharSequenceReader.scala b/src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala
index 8e7751cc82..8e7751cc82 100644
--- a/src/library/scala/util/parsing/input/CharSequenceReader.scala
+++ b/src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala
diff --git a/src/library/scala/util/parsing/input/NoPosition.scala b/src/parser-combinators/scala/util/parsing/input/NoPosition.scala
index 4a32264b79..4a32264b79 100644
--- a/src/library/scala/util/parsing/input/NoPosition.scala
+++ b/src/parser-combinators/scala/util/parsing/input/NoPosition.scala
diff --git a/src/library/scala/util/parsing/input/OffsetPosition.scala b/src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala
index 23f79c74d1..23f79c74d1 100644
--- a/src/library/scala/util/parsing/input/OffsetPosition.scala
+++ b/src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala
diff --git a/src/library/scala/util/parsing/input/PagedSeqReader.scala b/src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala
index 468f1f9a5f..468f1f9a5f 100644
--- a/src/library/scala/util/parsing/input/PagedSeqReader.scala
+++ b/src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala
diff --git a/src/library/scala/util/parsing/input/Position.scala b/src/parser-combinators/scala/util/parsing/input/Position.scala
index b7995a6471..b7995a6471 100644
--- a/src/library/scala/util/parsing/input/Position.scala
+++ b/src/parser-combinators/scala/util/parsing/input/Position.scala
diff --git a/src/library/scala/util/parsing/input/Positional.scala b/src/parser-combinators/scala/util/parsing/input/Positional.scala
index cfde67cadd..cfde67cadd 100644
--- a/src/library/scala/util/parsing/input/Positional.scala
+++ b/src/parser-combinators/scala/util/parsing/input/Positional.scala
diff --git a/src/library/scala/util/parsing/input/Reader.scala b/src/parser-combinators/scala/util/parsing/input/Reader.scala
index 9dbf08a7ca..9dbf08a7ca 100644
--- a/src/library/scala/util/parsing/input/Reader.scala
+++ b/src/parser-combinators/scala/util/parsing/input/Reader.scala
diff --git a/src/library/scala/util/parsing/input/StreamReader.scala b/src/parser-combinators/scala/util/parsing/input/StreamReader.scala
index 30eb097fd7..30eb097fd7 100644
--- a/src/library/scala/util/parsing/input/StreamReader.scala
+++ b/src/parser-combinators/scala/util/parsing/input/StreamReader.scala
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/parser-combinators/scala/util/parsing/json/JSON.scala
index b06dddf532..b06dddf532 100644
--- a/src/library/scala/util/parsing/json/JSON.scala
+++ b/src/parser-combinators/scala/util/parsing/json/JSON.scala
diff --git a/src/library/scala/util/parsing/json/Lexer.scala b/src/parser-combinators/scala/util/parsing/json/Lexer.scala
index 7fc4e0bab6..7fc4e0bab6 100644
--- a/src/library/scala/util/parsing/json/Lexer.scala
+++ b/src/parser-combinators/scala/util/parsing/json/Lexer.scala
diff --git a/src/library/scala/util/parsing/json/Parser.scala b/src/parser-combinators/scala/util/parsing/json/Parser.scala
index 521dfc6612..521dfc6612 100644
--- a/src/library/scala/util/parsing/json/Parser.scala
+++ b/src/parser-combinators/scala/util/parsing/json/Parser.scala
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index ee24c0b9c1..7bfa8c6e77 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -68,13 +68,14 @@ trait FileManager extends FileUtil {
     else
       (SFile(LATEST_LIB).parent.parent / "classes" / what).toAbsolute.path
   }
+  def latestParserCBLib = relativeToLibrary("parser-combinators")
   def latestXmlLib      = relativeToLibrary("xml")
   def latestScaladoc    = relativeToLibrary("scaladoc")
   def latestInteractive = relativeToLibrary("interactive")
   def latestScalapFile  = relativeToLibrary("scalap")
   def latestPaths       = List(
         LATEST_LIB, LATEST_REFLECT, LATEST_COMP, LATEST_PARTEST, LATEST_ACTORS,
-        latestXmlLib, latestScalapFile, latestScaladoc, latestInteractive
+        latestParserCBLib, latestXmlLib, latestScalapFile, latestScaladoc, latestInteractive
   )
   def latestFiles       = latestPaths map (p => new java.io.File(p))
   def latestUrls        = latestFiles map (_.toURI.toURL)
diff --git a/test/partest b/test/partest
index d72c1026f3..0259cdb791 100755
--- a/test/partest
+++ b/test/partest
@@ -64,7 +64,7 @@ if [ -z "$EXT_CLASSPATH" ] ; then
             fi
         done
     elif [ -f "$SCALA_HOME/build/pack/lib/scala-partest.jar" ] ; then
-        for lib in `echo "scala-partest scala-library scala-xml scala-reflect scala-compiler diffutils"`; do
+        for lib in `echo "scala-partest scala-library scala-parser-combinators scala-xml scala-reflect scala-compiler diffutils"`; do
             ext="$SCALA_HOME/build/pack/lib/$lib.jar"
             if [ -z "$EXT_CLASSPATH" ] ; then
                 EXT_CLASSPATH="$ext"