---

yaml
---
r: 104700
b: refs/heads/snap-stage3
c: a38e148
h: refs/heads/master
v: v3

Author: rcxdude

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cad7d24a23fec68c93a0aaefc974ab18a386c6b5
+refs/heads/snap-stage3: a38e14871a38319249497680737033230249cffa
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/crates.mk

@@ -51,7 +51,7 @@
 
 TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time
-HOST_CRATES := syntax rustc rustdoc fourcc
+HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
@@ -76,6 +76,7 @@ DEPS_sync := std
 DEPS_getopts := std
 DEPS_collections := std
 DEPS_fourcc := syntax std
+DEPS_hexfloat := syntax std
 DEPS_num := std
 DEPS_test := std extra collections getopts serialize term
 DEPS_time := std serialize

branches/snap-stage3/src/libhexfloat/lib.rs

@@ -0,0 +1,178 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+/*!
+Syntax extension to create floating point literals from hexadecimal strings
+
+Once loaded, hexfloat!() is called with a string containing the hexadecimal
+floating-point literal, and an optional type (f32 or f64).
+If the type is omitted, the literal is treated the same as a normal unsuffixed
+literal.
+
+# Examples
+
+To load the extension and use it:
+
+```rust,ignore
+#[phase(syntax)]
+extern crate hexfloat;
+
+fn main() {
+    let val = hexfloat!("0x1.ffffb4", f32);
+}
+ ```
+
+# References
+
+* [ExploringBinary: hexadecimal floating point constants]
+  (http://www.exploringbinary.com/hexadecimal-floating-point-constants/)
+
+*/
+
+#[crate_id = "hexfloat#0.10-pre"];
+#[crate_type = "rlib"];
+#[crate_type = "dylib"];
+#[license = "MIT/ASL2"];
+
+#[feature(macro_registrar, managed_boxes)];
+
+extern crate syntax;
+
+use syntax::ast;
+use syntax::ast::Name;
+use syntax::codemap::{Span, mk_sp};
+use syntax::ext::base;
+use syntax::ext::base::{SyntaxExtension, BasicMacroExpander, NormalTT, ExtCtxt, MRExpr};
+use syntax::ext::build::AstBuilder;
+use syntax::parse;
+use syntax::parse::token;
+
+#[macro_registrar]
+pub fn macro_registrar(register: |Name, SyntaxExtension|) {
+    register(token::intern("hexfloat"),
+        NormalTT(~BasicMacroExpander {
+            expander: expand_syntax_ext,
+            span: None,
+        },
+        None));
+}
+
+//Check if the literal is valid (as LLVM expects),
+//and return a descriptive error if not.
+fn hex_float_lit_err(s: &str) -> Option<(uint, ~str)> {
+    let mut chars = s.chars().peekable();
+    let mut i = 0;
+    if chars.peek() == Some(&'-') { chars.next(); i+= 1 }
+    if chars.next() != Some('0') { return Some((i, ~"Expected '0'")); } i+=1;
+    if chars.next() != Some('x') { return Some((i, ~"Expected 'x'")); } i+=1;
+    let mut d_len = 0;
+    for _ in chars.take_while(|c| c.is_digit_radix(16)) { chars.next(); i+=1; d_len += 1;}
+    if chars.next() != Some('.') { return Some((i, ~"Expected '.'")); } i+=1;
+    let mut f_len = 0;
+    for _ in chars.take_while(|c| c.is_digit_radix(16)) { chars.next(); i+=1; f_len += 1;}
+    if d_len == 0 && f_len == 0 {
+        return Some((i, ~"Expected digits before or after decimal point"));
+    }
+    if chars.next() != Some('p') { return Some((i, ~"Expected 'p'")); } i+=1;
+    if chars.peek() == Some(&'-') { chars.next(); i+= 1 }
+    let mut e_len = 0;
+    for _ in chars.take_while(|c| c.is_digit()) { chars.next(); i+=1; e_len += 1}
+    if e_len == 0 {
+        return Some((i, ~"Expected exponent digits"));
+    }
+    match chars.next() {
+        None => None,
+        Some(_) => Some((i, ~"Expected end of string"))
+    }
+}
+
+pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult {
+    let (expr, ty_lit) = parse_tts(cx, tts);
+
+    let ty = match ty_lit {
+        None => None,
+        Some(Ident{ident, span}) => match token::get_ident(ident).get() {
+            "f32" => Some(ast::TyF32),
+            "f64" => Some(ast::TyF64),
+            _ => {
+                cx.span_err(span, "invalid floating point type in hexfloat!");
+                None
+            }
+        }
+    };
+
+    let s = match expr.node {
+        // expression is a literal
+        ast::ExprLit(lit) => match lit.node {
+            // string literal
+            ast::LitStr(ref s, _) => {
+                s.clone()
+            }
+            _ => {
+                cx.span_err(expr.span, "unsupported literal in hexfloat!");
+                return base::MacResult::dummy_expr(sp);
+            }
+        },
+        _ => {
+            cx.span_err(expr.span, "non-literal in hexfloat!");
+            return base::MacResult::dummy_expr(sp);
+        }
+    };
+
+    {
+        let err = hex_float_lit_err(s.get());
+        match err {
+            Some((err_pos, err_str)) => {
+                let pos = expr.span.lo + syntax::codemap::Pos::from_uint(err_pos + 1);
+                let span = syntax::codemap::mk_sp(pos,pos);
+                cx.span_err(span, format!("invalid hex float literal in hexfloat!: {}", err_str));
+                return base::MacResult::dummy_expr(sp);
+            }
+            _ => ()
+        }
+    }
+
+    let lit = match ty {
+        None => ast::LitFloatUnsuffixed(s),
+        Some (ty) => ast::LitFloat(s, ty)
+    };
+    MRExpr(cx.expr_lit(sp, lit))
+}
+
+struct Ident {
+    ident: ast::Ident,
+    span: Span
+}
+
+fn parse_tts(cx: &ExtCtxt, tts: &[ast::TokenTree]) -> (@ast::Expr, Option<Ident>) {
+    let p = &mut parse::new_parser_from_tts(cx.parse_sess(),
+                                            cx.cfg(),
+                                            tts.iter()
+                                               .map(|x| (*x).clone())
+                                               .collect());
+    let ex = p.parse_expr();
+    let id = if p.token == token::EOF {
+        None
+    } else {
+        p.expect(&token::COMMA);
+        let lo = p.span.lo;
+        let ident = p.parse_ident();
+        let hi = p.last_span.hi;
+        Some(Ident{ident: ident, span: mk_sp(lo, hi)})
+    };
+    if p.token != token::EOF {
+        p.unexpected();
+    }
+    (ex, id)
+}
+
+// FIXME (10872): This is required to prevent an LLVM assert on Windows
+#[test]
+fn dummy_test() { }

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -94,22 +94,7 @@ pub fn gather_assignment(bccx: &BorrowckCtxt,
                              assignee_loan_path,
                              assignment_id,
                              assignment_span,
-                             assignee_id,
-                             false);
-}
-
-pub fn gather_move_and_assignment(bccx: &BorrowckCtxt,
-                                  move_data: &MoveData,
-                                  assignment_id: ast::NodeId,
-                                  assignment_span: Span,
-                                  assignee_loan_path: @LoanPath,
-                                  assignee_id: ast::NodeId) {
-    move_data.add_assignment(bccx.tcx,
-                             assignee_loan_path,
-                             assignment_id,
-                             assignment_span,
-                             assignee_id,
-                             true);
+                             assignee_id);
 }
 
 fn check_is_legal_to_move_from(bccx: &BorrowckCtxt,

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -214,19 +214,20 @@ fn gather_loans_in_expr(this: &mut GatherLoanCtxt,
         visit::walk_expr(this, ex, ());
       }
 
-      ast::ExprAssign(l, _) => {
-          with_assignee_loan_path(
-              this.bccx, l,
-              |lp| gather_moves::gather_assignment(this.bccx, &this.move_data,
-                                                   ex.id, ex.span, lp, l.id));
-          visit::walk_expr(this, ex, ());
-      }
-
-      ast::ExprAssignOp(_, l, _) => {
-          with_assignee_loan_path(
-              this.bccx, l,
-              |lp| gather_moves::gather_move_and_assignment(this.bccx, &this.move_data,
-                                                            ex.id, ex.span, lp, l.id));
+      ast::ExprAssign(l, _) | ast::ExprAssignOp(_, l, _) => {
+          let l_cmt = this.bccx.cat_expr(l);
+          match opt_loan_path(l_cmt) {
+              Some(l_lp) => {
+                  gather_moves::gather_assignment(this.bccx, &this.move_data,
+                                                  ex.id, ex.span,
+                                                  l_lp, l.id);
+              }
+              None => {
+                  // This can occur with e.g. `*foo() = 5`.  In such
+                  // cases, there is no need to check for conflicts
+                  // with moves etc, just ignore.
+              }
+          }
           visit::walk_expr(this, ex, ());
       }
 
@@ -287,10 +288,17 @@ fn gather_loans_in_expr(this: &mut GatherLoanCtxt,
 
       ast::ExprInlineAsm(ref ia) => {
           for &(_, out) in ia.outputs.iter() {
-              with_assignee_loan_path(
-                  this.bccx, out,
-                  |lp| gather_moves::gather_assignment(this.bccx, &this.move_data,
-                                                       ex.id, ex.span, lp, out.id));
+              let out_cmt = this.bccx.cat_expr(out);
+              match opt_loan_path(out_cmt) {
+                  Some(out_lp) => {
+                      gather_moves::gather_assignment(this.bccx, &this.move_data,
+                                                      ex.id, ex.span,
+                                                      out_lp, out.id);
+                  }
+                  None => {
+                      // See the comment for ExprAssign.
+                  }
+              }
           }
           visit::walk_expr(this, ex, ());
       }
@@ -301,18 +309,6 @@ fn gather_loans_in_expr(this: &mut GatherLoanCtxt,
     }
 }
 
-fn with_assignee_loan_path(bccx: &BorrowckCtxt, expr: &ast::Expr, op: |@LoanPath|) {
-    let cmt = bccx.cat_expr(expr);
-    match opt_loan_path(cmt) {
-        Some(lp) => op(lp),
-        None => {
-            // This can occur with e.g. `*foo() = 5`.  In such
-            // cases, there is no need to check for conflicts
-            // with moves etc, just ignore.
-        }
-    }
-}
-
 impl<'a> GatherLoanCtxt<'a> {
     pub fn tcx(&self) -> ty::ctxt { self.bccx.tcx }
 

branches/snap-stage3/src/librustc/middle/borrowck/mod.rs

@@ -535,7 +535,7 @@ impl BorrowckCtxt {
             move_data::Declared => {
                 self.tcx.sess.span_err(
                     use_span,
-                    format!("{} of possibly uninitialized variable: `{}`",
+                    format!("{} of possibly uninitialized value: `{}`",
                          verb,
                          self.loan_path_to_str(lp)));
             }

branches/snap-stage3/src/librustc/middle/borrowck/move_data.rs

@@ -33,25 +33,23 @@ use util::ppaux::Repr;
 
 pub struct MoveData {
     /// Move paths. See section "Move paths" in `doc.rs`.
-    paths: RefCell<Vec<MovePath>>,
+    paths: RefCell<Vec<MovePath> >,
 
     /// Cache of loan path to move path index, for easy lookup.
     path_map: RefCell<HashMap<@LoanPath, MovePathIndex>>,
 
     /// Each move or uninitialized variable gets an entry here.
-    moves: RefCell<Vec<Move>>,
+    moves: RefCell<Vec<Move> >,
 
     /// Assignments to a variable, like `x = foo`. These are assigned
     /// bits for dataflow, since we must track them to ensure that
     /// immutable variables are assigned at most once along each path.
-    var_assignments: RefCell<Vec<Assignment>>,
+    var_assignments: RefCell<Vec<Assignment> >,
 
     /// Assignments to a path, like `x.f = foo`. These are not
     /// assigned dataflow bits, but we track them because they still
     /// kill move bits.
-    path_assignments: RefCell<Vec<Assignment>>,
-
-    /// Assignments to a variable or path, like `x = foo`, but not `x += foo`.
+    path_assignments: RefCell<Vec<Assignment> >,
     assignee_ids: RefCell<HashSet<ast::NodeId>>,
 }
 
@@ -394,8 +392,7 @@ impl MoveData {
                           lp: @LoanPath,
                           assign_id: ast::NodeId,
                           span: Span,
-                          assignee_id: ast::NodeId,
-                          is_also_move: bool) {
+                          assignee_id: ast::NodeId) {
         /*!
          * Adds a new record for an assignment to `lp` that occurs at
          * location `id` with the given `span`.
@@ -406,7 +403,7 @@ impl MoveData {
 
         let path_index = self.move_path(tcx, lp);
 
-        if !is_also_move {
+        {
             let mut assignee_ids = self.assignee_ids.borrow_mut();
             assignee_ids.get().insert(assignee_id);
         }