From 15947f8b193126234b2712beca739bc6c4abbf43 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Mar 2012 17:49:30 -0700
Subject: [PATCH] rustc: Move lexer and token to rustsyntax

---
 src/{rustc/syntax => librustsyntax}/parse/lexer.rs | 2 +-
 src/{rustc/syntax => librustsyntax}/parse/token.rs | 0
 src/librustsyntax/rustsyntax.rc                    | 4 ++++
 src/rustc/rustc.rc                                 | 2 --
 src/rustc/syntax/parse.rs                          | 7 +++++++
 5 files changed, 12 insertions(+), 3 deletions(-)
 rename src/{rustc/syntax => librustsyntax}/parse/lexer.rs (99%)
 rename src/{rustc/syntax => librustsyntax}/parse/token.rs (100%)
 create mode 100644 src/rustc/syntax/parse.rs

diff --git a/src/rustc/syntax/parse/lexer.rs b/src/librustsyntax/parse/lexer.rs
similarity index 99%
rename from src/rustc/syntax/parse/lexer.rs
rename to src/librustsyntax/parse/lexer.rs
index 5613b736d06..a4a5e0e17ac 100644
--- a/src/rustc/syntax/parse/lexer.rs
+++ b/src/librustsyntax/parse/lexer.rs
@@ -1,7 +1,7 @@
 import io::reader_util;
 import util::interner;
 import util::interner::intern;
-import driver::diagnostic;
+import diagnostic;
 
 type reader = @{
     cm: codemap::codemap,
diff --git a/src/rustc/syntax/parse/token.rs b/src/librustsyntax/parse/token.rs
similarity index 100%
rename from src/rustc/syntax/parse/token.rs
rename to src/librustsyntax/parse/token.rs
diff --git a/src/librustsyntax/rustsyntax.rc b/src/librustsyntax/rustsyntax.rc
index 4267eff6c61..081f31f7b00 100644
--- a/src/librustsyntax/rustsyntax.rc
+++ b/src/librustsyntax/rustsyntax.rc
@@ -14,4 +14,8 @@ mod visit;
 mod fold;
 mod util {
     mod interner;
+}
+mod parse {
+    mod token;
+    mod lexer;
 }
\ No newline at end of file
diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc
index bd864d74dcd..d161eeb78db 100644
--- a/src/rustc/rustc.rc
+++ b/src/rustc/rustc.rc
@@ -71,9 +71,7 @@ mod middle {
 
 mod syntax {
     mod parse {
-        mod lexer;
         mod parser;
-        mod token;
         mod eval;
     }
     mod ext {
diff --git a/src/rustc/syntax/parse.rs b/src/rustc/syntax/parse.rs
new file mode 100644
index 00000000000..5fffd171dd7
--- /dev/null
+++ b/src/rustc/syntax/parse.rs
@@ -0,0 +1,7 @@
+import rustsyntax::parse::token;
+export token;
+
+import rustsyntax::parse::lexer;
+export lexer;
+
+export parser;
\ No newline at end of file