about summary refs log tree commit diff
path: root/src/fuzzer
diff options
context:
space:
mode:
authorPaul Stansifer <paul.stansifer@gmail.com>2012-07-27 14:21:15 -0700
committerPaul Stansifer <paul.stansifer@gmail.com>2012-07-30 18:04:19 -0700
commit19922fcd93bfeac123719e319b7166f50660f847 (patch)
tree6eab8aa33d8d72ae8bb02fd4c946010737e28e8f /src/fuzzer
parent4e9c475527b0a4cbf43b14c028370b0f784fd99f (diff)
downloadrust-19922fcd93bfeac123719e319b7166f50660f847.tar.gz
rust-19922fcd93bfeac123719e319b7166f50660f847.zip
Feed the interner to the pretty-printer, in anticipation of pretty-printing token trees.
Diffstat (limited to 'src/fuzzer')
-rw-r--r--src/fuzzer/fuzzer.rs40
1 files changed, 26 insertions, 14 deletions
diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index a75f920cfd8..908dff102f7 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -263,6 +263,9 @@ fn check_variants_T<T: copy>(
                 let str3 =
                     @as_str(|a|pprust::print_crate(
                         codemap,
+                        // Assuming we're not generating any token_trees
+                        @syntax::util::interner::mk::<@~str>(
+                            |x| str::hash(*x), |x,y| str::eq(*x,*y)),
                         diagnostic::mk_span_handler(handler, codemap),
                         crate2,
                         filename,
@@ -420,13 +423,18 @@ fn parse_and_print(code: @~str) -> ~str {
     let crate = parse::parse_crate_from_source_str(
         filename, code, ~[], sess);
     io::with_str_reader(*code, |rdr| {
-        as_str(|a| pprust::print_crate(sess.cm,
-                                       sess.span_diagnostic,
-                                       crate,
-                                       filename,
-                                       rdr, a,
-                                       pprust::no_ann(),
-                                       false) )
+        as_str(|a|
+               pprust::print_crate(
+                   sess.cm,
+                   // Assuming there are no token_trees
+                   @syntax::util::interner::mk::<@~str>(
+                       |x| str::hash(*x), |x,y| str::eq(*x,*y)),
+                   sess.span_diagnostic,
+                   crate,
+                   filename,
+                   rdr, a,
+                   pprust::no_ann(),
+                   false) )
     })
 }
 
@@ -565,13 +573,17 @@ fn check_variants(files: ~[~str], cx: context) {
                 s, ~[], sess);
         io::with_str_reader(*s, |rdr| {
             #error("%s",
-                   as_str(|a| pprust::print_crate(sess.cm,
-                                                  sess.span_diagnostic,
-                                                  crate,
-                                                  file,
-                                                  rdr, a,
-                                                  pprust::no_ann(),
-                                                  false) ))
+                   as_str(|a| pprust::print_crate(
+                       sess.cm,
+                       // Assuming no token_trees
+                       @syntax::util::interner::mk::<@~str>(
+                            |x| str::hash(*x), |x,y| str::eq(*x,*y)),
+                       sess.span_diagnostic,
+                       crate,
+                       file,
+                       rdr, a,
+                       pprust::no_ann(),
+                       false) ))
         });
         check_variants_of_ast(*crate, sess.cm, file, cx);
     }