---

yaml
---
r: 148314
b: refs/heads/try2
c: f98f76e
h: refs/heads/master
v: v3

Author: derekchiang

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: e6a27424adba041d64d29c4339edc5015536f285
+refs/heads/try2: f98f76e3a75b4d75d809601ce1d6fa62d3eca428
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

@@ -371,9 +371,6 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
 LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
                 interpreter instrumentation
 
-# Only build these LLVM tools
-LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
-
 define DEF_LLVM_VARS
 # The configure script defines these variables with the target triples
 # separated by Z. This defines new ones with the expected format.

branches/try2/doc/index.md

@@ -4,54 +4,52 @@
 <style type="text/css">
 #TOC { display: none; }
 .header-section-number { display: none; }
-li {list-style-type: none; }
 </style>
 
-* [The Rust tutorial](tutorial.html)  (* [PDF](tutorial.pdf))
-* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))
+[The Rust tutorial](tutorial.html)  ([PDF](tutorial.pdf))  
+[The Rust reference manual](rust.html) ([PDF](rust.pdf))  
 
 # Guides
 
-* [Pointers](guide-pointers.html)
-* [References and Lifetimes](guide-lifetimes.html)
-* [Containers and Iterators](guide-container.html)
-* [Tasks and Communication](guide-tasks.html)
-* [Foreign Function Interface](guide-ffi.html)
-* [Macros](guide-macros.html)
-* [Packaging](guide-rustpkg.html)
-* [Testing](guide-testing.html)
-* [Conditions](guide-conditions.html)
-* [Rust's Runtime](guide-runtime.html)
+[Pointers](guide-pointers.html)  
+[References and Lifetimes](guide-lifetimes.html)  
+[Containers and Iterators](guide-container.html)  
+[Tasks and Communication](guide-tasks.html)  
+[Foreign Function Interface](guide-ffi.html)  
+[Macros](guide-macros.html)  
+[Packaging](guide-rustpkg.html)  
+[Testing](guide-testing.html)  
+[Conditions](guide-conditions.html)  
+[Rust's Runtime](guide-runtime.html)
 
 # Libraries
 
-* [The standard library, `libstd`](std/index.html)
-* [The extra library, `libextra`](extra/index.html)
+[The standard library, `libstd`](std/index.html)  
+[The extra library, `libextra`](extra/index.html)
 
-* [The M:N runtime library, `libgreen`](green/index.html)
-* [The 1:1 runtime library, `libnative`](native/index.html)
+[The M:N runtime library, `libgreen`](green/index.html)  
+[The 1:1 runtime library, `libnative`](native/index.html)
 
-* [The Rust libuv library, `librustuv`](rustuv/index.html)
-* [The Rust packaging library, `librustpkg`](rustpkg/index.html)
+[The Rust libuv library, `librustuv`](rustuv/index.html)  
+[The Rust packaging library, `librustpkg`](rustpkg/index.html)
 
-* [The Rust parser, `libsyntax`](syntax/index.html)
-* [The Rust compiler, `librustc`](rustc/index.html)
+[The Rust parser, `libsyntax`](syntax/index.html)  
+[The Rust compiler, `librustc`](rustc/index.html)
 
 # Tooling
 
-* [The `rustdoc` manual](rustdoc.html)
-* [The `rustpkg` manual](rustpkg.html)
+[The `rustpkg` manual](rustpkg.html)
 
 # FAQs
 
-* [Language FAQ](complement-lang-faq.html)
-* [Project FAQ](complement-project-faq.html)
-* [Usage FAQ](complement-usage-faq.html)
-* [Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"  
-* [How to submit a bug report](complement-bugreport.html)
+[Language FAQ](complement-lang-faq.html)  
+[Project FAQ](complement-project-faq.html)  
+[Usage FAQ](complement-usage-faq.html)  
+[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"  
+[How to submit a bug report](complement-bugreport.html)
 
 # External resources
 
-* The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org  
-* The Rust community on [Reddit](http://reddit.com/r/rust)
-* The Rust [wiki](http://github.com/mozilla/rust/wiki)
+The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org  
+The Rust community on [Reddit](http://reddit.com/r/rust)  
+The Rust [wiki](http://github.com/mozilla/rust/wiki)

branches/try2/mk/llvm.mk

@@ -28,7 +28,7 @@ LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
 
 $$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS) $$(LLVM_STAMP_$(1))
 	@$$(call E, make: llvm)
-	$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1)) ONLY_TOOLS="$$(LLVM_TOOLS)"
+	$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1))
 	$$(Q)touch $$(LLVM_CONFIG_$(1))
 endif
 

branches/try2/src/libnative/bookeeping.rs renamed to branches/try2/src/libnative/bookkeeping.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! 1:1 Task bookeeping
+//! 1:1 Task bookkeeping
 //!
 //! This module keeps track of the number of running 1:1 tasks so that entry
 //! points with libnative know when it's possible to exit the program (once all
 //! tasks have exited).
 //!
-//! The green counterpart for this is bookeeping on sched pools.
+//! The green counterpart for this is bookkeeping on sched pools.
 
 use std::sync::atomics;
 use std::unstable::mutex::{Mutex, MUTEX_INIT};

branches/try2/src/libnative/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -29,7 +29,7 @@
 use std::os;
 use std::rt;
 
-mod bookeeping;
+mod bookkeeping;
 pub mod io;
 pub mod task;
 
@@ -75,6 +75,6 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
 /// number of arguments.
 pub fn run(main: proc()) -> int {
     main();
-    bookeeping::wait_for_other_tasks();
+    bookkeeping::wait_for_other_tasks();
     os::get_exit_status()
 }

branches/try2/src/libnative/task.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -27,7 +27,7 @@ use std::unstable::stack;
 
 use io;
 use task;
-use bookeeping;
+use bookkeeping;
 
 /// Creates a new Task which is ready to execute as a 1:1 task.
 pub fn new(stack_bounds: (uint, uint)) -> ~Task {
@@ -82,7 +82,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc()) {
     // Note that this increment must happen *before* the spawn in order to
     // guarantee that if this task exits it will always end up waiting for the
     // spawned task to exit.
-    bookeeping::increment();
+    bookkeeping::increment();
 
     // Spawning a new OS thread guarantees that __morestack will never get
     // triggered, but we must manually set up the actual stack bounds once this
@@ -104,7 +104,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc()) {
         let mut task = task;
         task.put_runtime(ops as ~rt::Runtime);
         task.run(|| { f.take_unwrap()() });
-        bookeeping::decrement();
+        bookkeeping::decrement();
     })
 }
 

branches/try2/src/libstd/path/windows.rs

@@ -261,13 +261,8 @@ impl GenericPathUnsafe for Path {
             let mut s = str::with_capacity(me.repr.len() + 1 + pathlen);
             s.push_str(me.repr);
             let plen = me.prefix_len();
-            // if me is "C:" we don't want to add a path separator
-            match me.prefix {
-                Some(DiskPrefix) if me.repr.len() == plen => (),
-                _ if !(me.repr.len() > plen && me.repr[me.repr.len()-1] == sep as u8) => {
-                    s.push_char(sep);
-                }
-                _ => ()
+            if !(me.repr.len() > plen && me.repr[me.repr.len()-1] == sep as u8) {
+                s.push_char(sep);
             }
             match path_ {
                 None => s.push_str(path),
@@ -1554,8 +1549,6 @@ mod tests {
         t!(s: "C:a\\b\\c", "C:d", "C:a\\b\\c\\d");
         t!(s: "C:a\\b", "..\\..\\..\\c", "C:..\\c");
         t!(s: "C:\\a\\b", "..\\..\\..\\c", "C:\\c");
-        t!(s: "C:", r"a\b\c", r"C:a\b\c");
-        t!(s: "C:", r"..\a", r"C:..\a");
         t!(s: "\\\\server\\share\\foo", "bar", "\\\\server\\share\\foo\\bar");
         t!(s: "\\\\server\\share\\foo", "..\\..\\bar", "\\\\server\\share\\bar");
         t!(s: "\\\\server\\share\\foo", "C:baz", "C:baz");

branches/try2/src/libsyntax/codemap.rs

@@ -191,6 +191,15 @@ pub struct FileLines
     lines: ~[uint]
 }
 
+// represents the origin of a file:
+pub enum FileSubstr {
+    // indicates that this is a normal standalone file:
+    FssNone,
+    // indicates that this "file" is actually a substring
+    // of another file that appears earlier in the codemap
+    FssInternal(Span),
+}
+
 /// Identifies an offset of a multi-byte character in a FileMap
 pub struct MultiByteChar {
     /// The absolute offset of the character in the CodeMap
@@ -205,6 +214,8 @@ pub struct FileMap {
     /// originate from files has names between angle brackets by convention,
     /// e.g. `<anon>`
     name: FileName,
+    /// Extra information used by qquote
+    substr: FileSubstr,
     /// The complete source code
     src: @str,
     /// The start position of this source in the CodeMap
@@ -267,7 +278,16 @@ impl CodeMap {
         }
     }
 
+    /// Add a new FileMap to the CodeMap and return it
     pub fn new_filemap(&self, filename: FileName, src: @str) -> @FileMap {
+        return self.new_filemap_w_substr(filename, FssNone, src);
+    }
+
+    pub fn new_filemap_w_substr(&self,
+                                filename: FileName,
+                                substr: FileSubstr,
+                                src: @str)
+                                -> @FileMap {
         let mut files = self.files.borrow_mut();
         let start_pos = if files.get().len() == 0 {
             0
@@ -278,8 +298,7 @@ impl CodeMap {
         };
 
         let filemap = @FileMap {
-            name: filename,
-            src: src,
+            name: filename, substr: substr, src: src,
             start_pos: Pos::from_uint(start_pos),
             lines: RefCell::new(~[]),
             multibyte_chars: RefCell::new(~[]),
@@ -303,16 +322,31 @@ impl CodeMap {
 
     pub fn lookup_char_pos_adj(&self, pos: BytePos) -> LocWithOpt {
         let loc = self.lookup_char_pos(pos);
-        LocWithOpt {
-            filename: loc.file.name,
-            line: loc.line,
-            col: loc.col,
-            file: Some(loc.file)
+        match (loc.file.substr) {
+            FssNone =>
+            LocWithOpt {
+                filename: loc.file.name,
+                line: loc.line,
+                col: loc.col,
+                file: Some(loc.file)},
+            FssInternal(sp) =>
+            self.lookup_char_pos_adj(
+                sp.lo + (pos - loc.file.start_pos)),
         }
     }
 
     pub fn adjust_span(&self, sp: Span) -> Span {
-        sp
+        let line = self.lookup_line(sp.lo);
+        match (line.fm.substr) {
+            FssNone => sp,
+            FssInternal(s) => {
+                self.adjust_span(Span {
+                    lo: s.lo + (sp.lo - line.fm.start_pos),
+                    hi: s.lo + (sp.hi - line.fm.start_pos),
+                    expn_info: sp.expn_info
+                })
+            }
+        }
     }
 
     pub fn span_to_str(&self, sp: Span) -> ~str {

branches/try2/src/libsyntax/parse/mod.rs

@@ -12,7 +12,7 @@
 
 
 use ast;
-use codemap::{Span, CodeMap, FileMap};
+use codemap::{Span, CodeMap, FileMap, FileSubstr};
 use codemap;
 use diagnostic::{SpanHandler, mk_span_handler, mk_handler, Emitter};
 use parse::attr::ParserAttr;
@@ -180,6 +180,27 @@ pub fn parse_tts_from_source_str(
     maybe_aborted(p.parse_all_token_trees(),p)
 }
 
+// given a function and parsing information (source str,
+// filename, crate cfg, and sess), create a parser,
+// apply the function, and check that the parser
+// consumed all of the input before returning the function's
+// result.
+pub fn parse_from_source_str<T>(
+                             f: |&mut Parser| -> T,
+                             name: @str,
+                             ss: codemap::FileSubstr,
+                             source: @str,
+                             cfg: ast::CrateConfig,
+                             sess: @ParseSess)
+                             -> T {
+    let mut p = new_parser_from_source_substr(sess, cfg, name, ss, source);
+    let r = f(&mut p);
+    if !p.reader.is_eof() {
+        p.reader.fatal(~"expected end-of-string");
+    }
+    maybe_aborted(r,p)
+}
+
 // Create a new parser from a source string
 pub fn new_parser_from_source_str(sess: @ParseSess,
                                   cfg: ast::CrateConfig,
@@ -189,6 +210,17 @@ pub fn new_parser_from_source_str(sess: @ParseSess,
     filemap_to_parser(sess,string_to_filemap(sess,source,name),cfg)
 }
 
+// Create a new parser from a source string where the origin
+// is specified as a substring of another file.
+pub fn new_parser_from_source_substr(sess: @ParseSess,
+                                  cfg: ast::CrateConfig,
+                                  name: @str,
+                                  ss: codemap::FileSubstr,
+                                  source: @str)
+                               -> Parser {
+    filemap_to_parser(sess,substring_to_filemap(sess,source,name,ss),cfg)
+}
+
 /// Create a new parser, handling errors as appropriate
 /// if the file doesn't exist
 pub fn new_parser_from_file(
@@ -265,6 +297,13 @@ pub fn string_to_filemap(sess: @ParseSess, source: @str, path: @str)
     sess.cm.new_filemap(path, source)
 }
 
+// given a session and a string and a path and a FileSubStr, add
+// the string to the CodeMap and return the new FileMap
+pub fn substring_to_filemap(sess: @ParseSess, source: @str, path: @str,
+                           filesubstr: FileSubstr) -> @FileMap {
+    sess.cm.new_filemap_w_substr(path,filesubstr,source)
+}
+
 // given a filemap, produce a sequence of token-trees
 pub fn filemap_to_tts(sess: @ParseSess, filemap: @FileMap)
     -> ~[ast::TokenTree] {