---

yaml
---
r: 144958
b: refs/heads/try2
c: 73bb4de
h: refs/heads/master
v: v3

Author: anasazi

[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: 49eb7bd2716f59e0cd47c427a4c60f49e8ce6e50
+refs/heads/try2: 73bb4de556b3dabc1ba5db397fc1bed28e0537a9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rust.md

@@ -2459,12 +2459,25 @@ do k(3) |j| {
 ### For expressions
 
 ~~~~~~~~{.ebnf .gram}
-for_expr : "for" pat "in" expr '{' block '}' ;
+for_expr : "for" expr [ '|' ident_list '|' ] ? '{' block '}' ;
 ~~~~~~~~
 
-A `for` expression is a syntactic construct for looping
-over elements provided by an implementation of
-`std::iterator::Iterator`.
+A _for expression_ is similar to a [`do` expression](#do-expressions),
+in that it provides a special block-form of lambda expression,
+suited to passing the `block` function to a higher-order function implementing a loop.
+
+In contrast to a `do` expression, a `for` expression is designed to work
+with methods such as `each` and `times`, that require the body block to
+return a boolean. The `for` expression accommodates this by implicitly
+returning `true` at the end of each block, unless a `break` expression
+is evaluated.
+
+In addition, [`break`](#break-expressions) and [`loop`](#loop-expressions) expressions
+are rewritten inside `for` expressions in the same way that `return` expressions are,
+with a combination of local flag variables,
+and early boolean-valued returns from the `block` function,
+such that the meaning of `break` and `loop` is preserved in a primitive loop
+when rewritten as a `for` loop controlled by a higher order function.
 
 An example of a for loop over the contents of a vector:
 

branches/try2/src/libextra/num/bigint.rs

@@ -23,7 +23,6 @@ use std::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use std::int;
 use std::num;
 use std::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};
-use std::rand::{Rng, RngUtil};
 use std::str;
 use std::uint;
 use std::vec;
@@ -1089,53 +1088,6 @@ impl FromStrRadix for BigInt {
     }
 }
 
-trait RandBigInt {
-    /// Generate a random BigUint of the given bit size.
-    fn gen_biguint(&mut self, bit_size: uint) -> BigUint;
-
-    /// Generate a random BigInt of the given bit size.
-    fn gen_bigint(&mut self, bit_size: uint) -> BigInt;
-}
-
-impl<R: Rng> RandBigInt for R {
-    /// Generate a random BigUint of the given bit size.
-    fn gen_biguint(&mut self, bit_size: uint) -> BigUint {
-        let (digits, rem) = bit_size.div_rem(&BigDigit::bits);
-        let mut data = vec::with_capacity(digits+1);
-        for _ in range(0, digits) {
-            data.push(self.gen());
-        }
-        if rem > 0 {
-            let final_digit: BigDigit = self.gen();
-            data.push(final_digit >> (BigDigit::bits - rem));
-        }
-        return BigUint::new(data);
-    }
-
-    /// Generate a random BigInt of the given bit size.
-    fn gen_bigint(&mut self, bit_size: uint) -> BigInt {
-        // Generate a random BigUint...
-        let biguint = self.gen_biguint(bit_size);
-        // ...and then randomly assign it a Sign...
-        let sign = if biguint.is_zero() {
-            // ...except that if the BigUint is zero, we need to try
-            // again with probability 0.5. This is because otherwise,
-            // the probability of generating a zero BigInt would be
-            // double that of any other number.
-            if self.gen() {
-                return self.gen_bigint(bit_size);
-            } else {
-                Zero
-            }
-        } else if self.gen() {
-            Plus
-        } else {
-            Minus
-        };
-        return BigInt::from_biguint(sign, biguint);
-    }
-}
-
 impl BigInt {
     /// Creates and initializes an BigInt.
     #[inline]
@@ -1197,7 +1149,6 @@ mod biguint_tests {
     use std::cmp::{Less, Equal, Greater};
     use std::int;
     use std::num::{IntConvertible, Zero, One, FromStrRadix};
-    use std::rand::{task_rng};
     use std::str;
     use std::uint;
     use std::vec;
@@ -1705,13 +1656,6 @@ mod biguint_tests {
         check(20, "2432902008176640000");
         check(30, "265252859812191058636308480000000");
     }
-
-    #[test]
-    fn test_rand() {
-        let mut rng = task_rng();
-        let _n: BigUint = rng.gen_biguint(137);
-        assert!(rng.gen_biguint(0).is_zero());
-    }
 }
 
 #[cfg(test)]
@@ -1721,7 +1665,6 @@ mod bigint_tests {
     use std::cmp::{Less, Equal, Greater};
     use std::int;
     use std::num::{IntConvertible, Zero, One, FromStrRadix};
-    use std::rand::{task_rng};
     use std::uint;
 
     #[test]
@@ -2142,13 +2085,6 @@ mod bigint_tests {
         let zero: BigInt = Zero::zero();
         assert_eq!(-zero, zero);
     }
-
-    #[test]
-    fn test_rand() {
-        let mut rng = task_rng();
-        let _n: BigInt = rng.gen_bigint(137);
-        assert!(rng.gen_bigint(0).is_zero());
-    }
 }
 
 #[cfg(test)]

branches/try2/src/librustc/lib/llvm.rs

@@ -2109,14 +2109,6 @@ pub mod llvm {
             ArgNo: c_uint)
             -> ValueRef;
 
-        #[fast_ffi]
-        pub fn LLVMDIBuilderCreateNameSpace(Builder: DIBuilderRef,
-                                            Scope: ValueRef,
-                                            Name: *c_char,
-                                            File: ValueRef,
-                                            LineNo: c_uint)
-                                            -> ValueRef;
-
         #[fast_ffi]
         pub fn LLVMIsAArgument(value_ref: ValueRef) -> ValueRef;
 

branches/try2/src/librustc/middle/cfg/construct.rs

@@ -488,7 +488,7 @@ impl CFGBuilder {
 
     fn find_scope(&self,
                   expr: @ast::Expr,
-                  label: Option<ast::Name>) -> LoopScope {
+                  label: Option<ast::Ident>) -> LoopScope {
         match label {
             None => {
                 return *self.loop_scopes.last();

branches/try2/src/librustc/middle/dataflow.rs

@@ -867,7 +867,7 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
 
     fn find_scope<'a>(&self,
                       expr: @ast::Expr,
-                      label: Option<ast::Name>,
+                      label: Option<ast::Ident>,
                       loop_scopes: &'a mut ~[LoopScope]) -> &'a mut LoopScope {
         let index = match label {
             None => {

branches/try2/src/librustc/middle/effect.rs

@@ -102,10 +102,8 @@ impl Visitor<()> for EffectCheckVisitor {
     fn visit_block(&mut self, block:&Block, _:()) {
 
             let old_unsafe_context = self.context.unsafe_context;
-            let is_unsafe = match block.rules {
-                ast::UnsafeBlock(*) => true, ast::DefaultBlock => false
-            };
-            if is_unsafe && self.context.unsafe_context == SafeContext {
+            if block.rules == ast::UnsafeBlock &&
+                    self.context.unsafe_context == SafeContext {
                 self.context.unsafe_context = UnsafeBlock(block.id)
             }
 

branches/try2/src/librustc/middle/lint.rs

@@ -1131,11 +1131,8 @@ impl Visitor<@mut Context> for UnusedUnsafeLintVisitor {
     fn visit_expr(&mut self, e:@ast::Expr, cx:@mut Context) {
 
             match e.node {
-                // Don't warn about generated blocks, that'll just pollute the
-                // output.
-                ast::ExprBlock(ref blk) => {
-                    if blk.rules == ast::UnsafeBlock(ast::UserProvided) &&
-                       !cx.tcx.used_unsafe.contains(&blk.id) {
+                ast::ExprBlock(ref blk) if blk.rules == ast::UnsafeBlock => {
+                    if !cx.tcx.used_unsafe.contains(&blk.id) {
                         cx.span_lint(unused_unsafe, blk.span,
                                      "unnecessary `unsafe` block");
                     }

branches/try2/src/librustc/middle/liveness.rs

@@ -756,7 +756,7 @@ impl Liveness {
     }
 
     pub fn find_loop_scope(&self,
-                           opt_label: Option<Name>,
+                           opt_label: Option<Ident>,
                            id: NodeId,
                            sp: Span)
                            -> NodeId {

branches/try2/src/librustc/middle/resolve.rs

@@ -5157,13 +5157,15 @@ impl Resolver {
             ExprForLoop(*) => fail!("non-desugared expr_for_loop"),
 
             ExprBreak(Some(label)) | ExprAgain(Some(label)) => {
-                match self.search_ribs(self.label_ribs, label, expr.span,
+                let name = label.name;
+                match self.search_ribs(self.label_ribs, name, expr.span,
                                        DontAllowCapturingSelf) {
                     None =>
                         self.resolve_error(expr.span,
                                               fmt!("use of undeclared label \
                                                    `%s`",
-                                                   interner_get(label))),
+                                                   self.session.str_of(
+                                                       label))),
                     Some(DlDef(def @ DefLabel(_))) => {
                         self.record_def(expr.id, def)
                     }

branches/try2/src/librustc/middle/trans/base.rs

@@ -76,7 +76,7 @@ use std::vec;
 use std::local_data;
 use extra::time;
 use extra::sort;
-use syntax::ast::Name;
+use syntax::ast::Ident;
 use syntax::ast_map::{path, path_elt_to_str, path_name, path_pretty_name};
 use syntax::ast_util::{local_def};
 use syntax::attr;
@@ -1189,7 +1189,7 @@ pub fn scope_block(bcx: @mut Block,
 
 pub fn loop_scope_block(bcx: @mut Block,
                         loop_break: @mut Block,
-                        loop_label: Option<Name>,
+                        loop_label: Option<Ident>,
                         n: &str,
                         opt_node_info: Option<NodeInfo>) -> @mut Block {
     return new_block(bcx.fcx, Some(bcx), Some(@mut ScopeInfo {
@@ -3021,10 +3021,6 @@ pub fn trans_crate(sess: session::Session,
                                      link_meta,
                                      analysis.reachable);
 
-    if ccx.sess.opts.debuginfo {
-        debuginfo::initialize(ccx, crate);
-    }
-
     {
         let _icx = push_ctxt("text");
         trans_mod(ccx, &crate.module);

branches/try2/src/librustc/middle/trans/common.rs

@@ -38,7 +38,7 @@ use std::cast;
 use std::hashmap::{HashMap};
 use std::libc::{c_uint, c_longlong, c_ulonglong, c_char};
 use std::vec;
-use syntax::ast::{Name,Ident};
+use syntax::ast::Ident;
 use syntax::ast_map::{path, path_elt, path_pretty_name};
 use syntax::codemap::Span;
 use syntax::parse::token;
@@ -463,7 +463,7 @@ pub fn block_cleanups(bcx: @mut Block) -> ~[cleanup] {
 pub struct ScopeInfo {
     parent: Option<@mut ScopeInfo>,
     loop_break: Option<@mut Block>,
-    loop_label: Option<Name>,
+    loop_label: Option<Ident>,
     // A list of functions that must be run at when leaving this
     // block, cleaning up any variables that were introduced in the
     // block.

branches/try2/src/librustc/middle/trans/controlflow.rs

@@ -22,7 +22,7 @@ use util::ppaux;
 use middle::trans::type_::Type;
 
 use syntax::ast;
-use syntax::ast::Name;
+use syntax::ast::Ident;
 use syntax::ast_util;
 use syntax::codemap::Span;
 
@@ -188,7 +188,7 @@ pub fn trans_while(bcx: @mut Block, cond: @ast::Expr, body: &ast::Block) -> @mut
 
 pub fn trans_loop(bcx:@mut Block,
                   body: &ast::Block,
-                  opt_label: Option<Name>)
+                  opt_label: Option<Ident>)
                -> @mut Block {
     let _icx = push_ctxt("trans_loop");
     let next_bcx = sub_block(bcx, "next");
@@ -201,7 +201,7 @@ pub fn trans_loop(bcx:@mut Block,
 }
 
 pub fn trans_break_cont(bcx: @mut Block,
-                        opt_label: Option<Name>,
+                        opt_label: Option<Ident>,
                         to_end: bool)
                      -> @mut Block {
     let _icx = push_ctxt("trans_break_cont");
@@ -254,11 +254,11 @@ pub fn trans_break_cont(bcx: @mut Block,
     return bcx;
 }
 
-pub fn trans_break(bcx: @mut Block, label_opt: Option<Name>) -> @mut Block {
+pub fn trans_break(bcx: @mut Block, label_opt: Option<Ident>) -> @mut Block {
     return trans_break_cont(bcx, label_opt, true);
 }
 
-pub fn trans_cont(bcx: @mut Block, label_opt: Option<Name>) -> @mut Block {
+pub fn trans_cont(bcx: @mut Block, label_opt: Option<Ident>) -> @mut Block {
     return trans_break_cont(bcx, label_opt, false);
 }