diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-24 16:41:53 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-05 16:00:16 -0700 |
commit | 46a4635d3acc0a18869131879e6cde862d6b9776 (patch) | |
tree | abb18a0b1dd886547bd4b036b2702b5f87297df2 /src | |
parent | 4340f799da2c7a7097eb327c353d0d96084197f8 (diff) | |
download | scala-46a4635d3acc0a18869131879e6cde862d6b9776.tar.gz scala-46a4635d3acc0a18869131879e6cde862d6b9776.tar.bz2 scala-46a4635d3acc0a18869131879e6cde862d6b9776.zip |
Spin off parser combinators to scala-parser-combinators.jar.
Diffstat (limited to 'src')
-rw-r--r-- | src/build/bnd/scala-parser-combinators.bnd | 5 | ||||
-rw-r--r-- | src/build/maven/maven-deploy.xml | 1 | ||||
-rw-r--r-- | src/build/maven/scala-parser-combinators-pom.xml | 59 | ||||
-rw-r--r-- | src/build/pack.xml | 5 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/ImplicitConversions.scala (renamed from src/library/scala/util/parsing/combinator/ImplicitConversions.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/JavaTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/JavaTokenParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/PackratParsers.scala (renamed from src/library/scala/util/parsing/combinator/PackratParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/Parsers.scala (renamed from src/library/scala/util/parsing/combinator/Parsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/RegexParsers.scala (renamed from src/library/scala/util/parsing/combinator/RegexParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/Lexical.scala (renamed from src/library/scala/util/parsing/combinator/lexical/Lexical.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/Scanners.scala (renamed from src/library/scala/util/parsing/combinator/lexical/Scanners.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/lexical/StdLexical.scala (renamed from src/library/scala/util/parsing/combinator/lexical/StdLexical.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/syntactical/TokenParsers.scala (renamed from src/library/scala/util/parsing/combinator/syntactical/TokenParsers.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/token/StdTokens.scala (renamed from src/library/scala/util/parsing/combinator/token/StdTokens.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/combinator/token/Tokens.scala (renamed from src/library/scala/util/parsing/combinator/token/Tokens.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/CharArrayReader.scala (renamed from src/library/scala/util/parsing/input/CharArrayReader.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/CharSequenceReader.scala (renamed from src/library/scala/util/parsing/input/CharSequenceReader.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/NoPosition.scala (renamed from src/library/scala/util/parsing/input/NoPosition.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/OffsetPosition.scala (renamed from src/library/scala/util/parsing/input/OffsetPosition.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/PagedSeqReader.scala (renamed from src/library/scala/util/parsing/input/PagedSeqReader.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Position.scala (renamed from src/library/scala/util/parsing/input/Position.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Positional.scala (renamed from src/library/scala/util/parsing/input/Positional.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/Reader.scala (renamed from src/library/scala/util/parsing/input/Reader.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/input/StreamReader.scala (renamed from src/library/scala/util/parsing/input/StreamReader.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/json/JSON.scala (renamed from src/library/scala/util/parsing/json/JSON.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/json/Lexer.scala (renamed from src/library/scala/util/parsing/json/Lexer.scala) | 0 | ||||
-rw-r--r-- | src/parser-combinators/scala/util/parsing/json/Parser.scala (renamed from src/library/scala/util/parsing/json/Parser.scala) | 0 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 3 |
30 files changed, 72 insertions, 1 deletions
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) |