parse_crate_from_source_str takes a parse_sess, not codemap

brson · brson · commit e4da7c5bee6c · 2011-08-03T10:55:59.000-07:00
This was causing problems when reading from stdin for subsequent passes that
needed to generate node ids.
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
@@ -106,7 +106,7 @@ fn parse_input_src(sess: session::session, cfg: &ast::crate_cfg,
     }.read_whole_stream();
     let src = str::unsafe_from_bytes_ivec(srcbytes);
     let crate = parser::parse_crate_from_source_str(infile, src, cfg,
-                                                    sess.get_codemap());
+                                                    sess.get_parse_sess());
     ret {crate: crate, src: src};
 }
 
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
@@ -2317,8 +2317,7 @@ fn parse_crate_from_source_file(input: &str, cfg: &ast::crate_cfg,
 }
 
 fn parse_crate_from_source_str(name: &str, source: &str, cfg: &ast::crate_cfg,
-                               cm: &codemap::codemap) -> @ast::crate {
-    let sess = @{cm: cm, mutable next_id: 0};
+                               sess: &parse_sess) -> @ast::crate {
     let ftype = SOURCE_FILE;
     let filemap = codemap::new_filemap(name, 0u, 0u);
     sess.cm.files += ~[filemap];
diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
@@ -224,11 +224,11 @@ fn check_whole_compiler(code: &str) {
 
 fn parse_and_print(code: &str) -> str {
     let filename = "tmp.rs";
-    let codemap = codemap::new_codemap();
+    let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
     //write_file(filename, code);
     let crate =
-        parser::parse_crate_from_source_str(filename, code, ~[], codemap);
-    ret as_str(bind pprust::print_crate(codemap, crate, filename,
+        parser::parse_crate_from_source_str(filename, code, ~[], sess);
+    ret as_str(bind pprust::print_crate(sess.cm, crate, filename,
                                         ioivec::string_reader(code), _,
                                         pprust::no_ann()));
 }
@@ -336,12 +336,12 @@ fn check_variants(files: &str[]) {
             let s = ioivec::read_whole_file_str(file);
             if content_is_dangerous_to_modify(s) || content_is_confusing(s) { cont; }
             log_err "check_variants: " + file;
-            let codemap = codemap::new_codemap();
-            let crate = parser::parse_crate_from_source_str(file, s, ~[], codemap);
-            log_err as_str(bind pprust::print_crate(codemap, crate, file,
+            let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
+            let crate = parser::parse_crate_from_source_str(file, s, ~[], sess);
+            log_err as_str(bind pprust::print_crate(sess.cm, crate, file,
                                         ioivec::string_reader(s), _,
                                         pprust::no_ann()));
-            check_variants_of_ast(*crate, codemap, file);
+            check_variants_of_ast(*crate, sess.cm, file);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ fn parse_input_src(sess: session::session, cfg: &ast::crate_cfg,`
`106`	`106`	`}.read_whole_stream();`
`107`	`107`	`let src = str::unsafe_from_bytes_ivec(srcbytes);`
`108`	`108`	`let crate = parser::parse_crate_from_source_str(infile, src, cfg,`
`109`		`- sess.get_codemap());`
	`109`	`+ sess.get_parse_sess());`
`110`	`110`	`ret {crate: crate, src: src};`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -2317,8 +2317,7 @@ fn parse_crate_from_source_file(input: &str, cfg: &ast::crate_cfg,`
`2317`	`2317`	`}`
`2318`	`2318`
`2319`	`2319`	`fn parse_crate_from_source_str(name: &str, source: &str, cfg: &ast::crate_cfg,`
`2320`		`- cm: &codemap::codemap) -> @ast::crate {`
`2321`		`- let sess = @{cm: cm, mutable next_id: 0};`
	`2320`	`+ sess: &parse_sess) -> @ast::crate {`
`2322`	`2321`	`let ftype = SOURCE_FILE;`
`2323`	`2322`	`let filemap = codemap::new_filemap(name, 0u, 0u);`
`2324`	`2323`	`sess.cm.files += ~[filemap];`