---

yaml
---
r: 139409
b: refs/heads/try2
c: e2ba58c
h: refs/heads/master
i:
  139407: 4b1b540
v: v3

Author: brson

[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: 5a97c484b1b5af479e34b7d5c454c7c97d9b31fb
+refs/heads/try2: e2ba58cd50c5ea96cb2babc66b694476a9c93dab
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/RELEASES.txt

@@ -1,4 +1,4 @@
-Version 0.6 (March 2013)
+Version 0.6 (April 2013)
 ---------------------------
 
    * ~2100 changes, numerous bugfixes

branches/try2/configure

@@ -533,7 +533,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-	(3.2svn|3.2|3.1svn|3.1|3.0svn|3.0)
+	(3.1svn|3.1|3.0svn|3.0)
 	    msg "found ok version of LLVM: $LLVM_VERSION"
 	    ;;
 	(*)

branches/try2/src/libcore/str.rs

@@ -726,8 +726,7 @@ pub fn each_split_within<'a>(ss: &'a str,
 
             (B, Cr, UnderLim) => { B }
             (B, Cr, OverLim)  if (i - last_start + 1) > lim
-                              => fail!(fmt!("word starting with %? longer than limit!",
-                                            self::slice(ss, last_start, i + 1))),
+                              => { fail!(~"word longer than limit!") }
             (B, Cr, OverLim)  => { slice(); slice_start = last_start; B }
             (B, Ws, UnderLim) => { last_end = i; C }
             (B, Ws, OverLim)  => { last_end = i; slice(); A }

branches/try2/src/libcore/unstable/extfmt.rs

@@ -470,6 +470,9 @@ pub mod ct {
 // decisions made a runtime. If it proves worthwhile then some of these
 // conditions can be evaluated at compile-time. For now though it's cleaner to
 // implement it this way, I think.
+#[cfg(stage1)]
+#[cfg(stage2)]
+#[cfg(stage3)]
 #[doc(hidden)]
 pub mod rt {
     use float;
@@ -673,6 +676,192 @@ pub mod rt {
     }
 }
 
+// XXX: remove after a snapshot of the above changes have gone in
+#[cfg(stage0)]
+#[doc(hidden)]
+pub mod rt {
+    use float;
+    use str;
+    use sys;
+    use uint;
+    use vec;
+
+    pub static flag_none : u32 = 0u32;
+    pub static flag_left_justify   : u32 = 0b00000000000001u32;
+    pub static flag_left_zero_pad  : u32 = 0b00000000000010u32;
+    pub static flag_space_for_sign : u32 = 0b00000000000100u32;
+    pub static flag_sign_always    : u32 = 0b00000000001000u32;
+    pub static flag_alternate      : u32 = 0b00000000010000u32;
+
+    pub enum Count { CountIs(uint), CountImplied, }
+
+    pub enum Ty { TyDefault, TyBits, TyHexUpper, TyHexLower, TyOctal, }
+
+    pub struct Conv {
+        flags: u32,
+        width: Count,
+        precision: Count,
+        ty: Ty,
+    }
+
+    pub fn conv_int(cv: Conv, i: int) -> ~str {
+        let radix = 10;
+        let prec = get_int_precision(cv);
+        let mut s : ~str = int_to_str_prec(i, radix, prec);
+        if 0 <= i {
+            if have_flag(cv.flags, flag_sign_always) {
+                unsafe { str::unshift_char(&mut s, '+') };
+            } else if have_flag(cv.flags, flag_space_for_sign) {
+                unsafe { str::unshift_char(&mut s, ' ') };
+            }
+        }
+        return unsafe { pad(cv, s, PadSigned) };
+    }
+    pub fn conv_uint(cv: Conv, u: uint) -> ~str {
+        let prec = get_int_precision(cv);
+        let mut rs =
+            match cv.ty {
+              TyDefault => uint_to_str_prec(u, 10, prec),
+              TyHexLower => uint_to_str_prec(u, 16, prec),
+              TyHexUpper => str::to_upper(uint_to_str_prec(u, 16, prec)),
+              TyBits => uint_to_str_prec(u, 2, prec),
+              TyOctal => uint_to_str_prec(u, 8, prec)
+            };
+        return unsafe { pad(cv, rs, PadUnsigned) };
+    }
+    pub fn conv_bool(cv: Conv, b: bool) -> ~str {
+        let s = if b { ~"true" } else { ~"false" };
+        // run the boolean conversion through the string conversion logic,
+        // giving it the same rules for precision, etc.
+        return conv_str(cv, s);
+    }
+    pub fn conv_char(cv: Conv, c: char) -> ~str {
+        let mut s = str::from_char(c);
+        return unsafe { pad(cv, s, PadNozero) };
+    }
+    pub fn conv_str(cv: Conv, s: &str) -> ~str {
+        // For strings, precision is the maximum characters
+        // displayed
+        let mut unpadded = match cv.precision {
+          CountImplied => s.to_owned(),
+          CountIs(max) => if (max as uint) < str::char_len(s) {
+            str::substr(s, 0, max as uint).to_owned()
+          } else {
+            s.to_owned()
+          }
+        };
+        return unsafe { pad(cv, unpadded, PadNozero) };
+    }
+    pub fn conv_float(cv: Conv, f: float) -> ~str {
+        let (to_str, digits) = match cv.precision {
+              CountIs(c) => (float::to_str_exact, c as uint),
+              CountImplied => (float::to_str_digits, 6u)
+        };
+        let mut s = unsafe { to_str(f, digits) };
+        if 0.0 <= f {
+            if have_flag(cv.flags, flag_sign_always) {
+                s = ~"+" + s;
+            } else if have_flag(cv.flags, flag_space_for_sign) {
+                s = ~" " + s;
+            }
+        }
+        return unsafe { pad(cv, s, PadFloat) };
+    }
+    pub fn conv_poly<T>(cv: Conv, v: &T) -> ~str {
+        let s = sys::log_str(v);
+        return conv_str(cv, s);
+    }
+
+    // Convert an int to string with minimum number of digits. If precision is
+    // 0 and num is 0 then the result is the empty string.
+    pub fn int_to_str_prec(num: int, radix: uint, prec: uint) -> ~str {
+        return if num < 0 {
+                ~"-" + uint_to_str_prec(-num as uint, radix, prec)
+            } else { uint_to_str_prec(num as uint, radix, prec) };
+    }
+
+    // Convert a uint to string with a minimum number of digits.  If precision
+    // is 0 and num is 0 then the result is the empty string. Could move this
+    // to uint: but it doesn't seem all that useful.
+    pub fn uint_to_str_prec(num: uint, radix: uint,
+                                 prec: uint) -> ~str {
+        return if prec == 0u && num == 0u {
+                ~""
+            } else {
+                let s = uint::to_str_radix(num, radix);
+                let len = str::char_len(s);
+                if len < prec {
+                    let diff = prec - len;
+                    let pad = str::from_chars(vec::from_elem(diff, '0'));
+                    pad + s
+                } else { s }
+            };
+    }
+    pub fn get_int_precision(cv: Conv) -> uint {
+        return match cv.precision {
+              CountIs(c) => c as uint,
+              CountImplied => 1u
+            };
+    }
+
+    #[deriving(Eq)]
+    pub enum PadMode { PadSigned, PadUnsigned, PadNozero, PadFloat }
+
+    pub fn pad(cv: Conv, s: ~str, mode: PadMode) -> ~str {
+        let mut s = s; // sadtimes
+        let uwidth : uint = match cv.width {
+          CountImplied => return (s),
+          CountIs(width) => { width as uint }
+        };
+        let strlen = str::char_len(s);
+        if uwidth <= strlen { return (s); }
+        let mut padchar = ' ';
+        let diff = uwidth - strlen;
+        if have_flag(cv.flags, flag_left_justify) {
+            let padstr = str::from_chars(vec::from_elem(diff, padchar));
+            return s + padstr;
+        }
+        let (might_zero_pad, signed) = match mode {
+          PadNozero   => (false, true),
+          PadSigned   => (true, true),
+          PadFloat    => (true, true),
+          PadUnsigned => (true, false)
+        };
+        fn have_precision(cv: Conv) -> bool {
+            return match cv.precision { CountImplied => false, _ => true };
+        }
+        let zero_padding = {
+            if might_zero_pad && have_flag(cv.flags, flag_left_zero_pad) &&
+                (!have_precision(cv) || mode == PadFloat) {
+                padchar = '0';
+                true
+            } else {
+                false
+            }
+        };
+        let padstr = str::from_chars(vec::from_elem(diff, padchar));
+        // This is completely heinous. If we have a signed value then
+        // potentially rip apart the intermediate result and insert some
+        // zeros. It may make sense to convert zero padding to a precision
+        // instead.
+
+        if signed && zero_padding && s.len() > 0 {
+            let head = str::shift_char(&mut s);
+            if head == '+' || head == '-' || head == ' ' {
+                let headstr = str::from_chars(vec::from_elem(1u, head));
+                return headstr + padstr + s;
+            }
+            else {
+                str::unshift_char(&mut s, head);
+            }
+        }
+        return padstr + s;
+    }
+    pub fn have_flag(flags: u32, f: u32) -> bool {
+        flags & f != 0
+    }
+}
+
 // Bulk of the tests are in src/test/run-pass/syntax-extension-fmt.rs
 #[cfg(test)]
 mod test {

branches/try2/src/librustc/driver/driver.rs

@@ -762,7 +762,8 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
   optflag(~"", ~"test", ~"Build a test harness"),
   optopt(~"", ~"target",
                         ~"Target triple cpu-manufacturer-kernel[-os]
-                          to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/
+                          to compile for (see
+         http://sources.redhat.com/autobook/autobook/autobook_17.html
                           for detail)", ~"TRIPLE"),
   optopt(~"", ~"android-cross-path",
          ~"The path to the Android NDK", "PATH"),

branches/try2/src/librustc/metadata/encoder.rs

@@ -286,7 +286,8 @@ fn encode_enum_variant_info(ecx: @EncodeContext, ebml_w: writer::Encoder,
                     if args.len() > 0 && generics.ty_params.len() == 0 => {
                 encode_symbol(ecx, ebml_w, variant.node.id);
             }
-            ast::tuple_variant_kind(_) | ast::struct_variant_kind(_) => {}
+            ast::tuple_variant_kind(_) | ast::struct_variant_kind(_) |
+            ast::enum_variant_kind(_) => {}
         }
         encode_discriminant(ecx, ebml_w, variant.node.id);
         if vi[i].disr_val != disr_val {

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

@@ -37,7 +37,7 @@ use syntax::ast::{expr_binary, expr_break, expr_cast, expr_field};
 use syntax::ast::{expr_fn_block, expr_index, expr_method_call, expr_path};
 use syntax::ast::{def_prim_ty, def_region, def_self, def_ty, def_ty_param};
 use syntax::ast::{def_upvar, def_use, def_variant, div, eq};
-use syntax::ast::{expr, expr_again, expr_assign_op};
+use syntax::ast::{enum_variant_kind, expr, expr_again, expr_assign_op};
 use syntax::ast::{expr_index, expr_loop};
 use syntax::ast::{expr_path, expr_struct, expr_unary, fn_decl};
 use syntax::ast::{foreign_item, foreign_item_const, foreign_item_fn, ge};
@@ -1383,6 +1383,16 @@ pub impl Resolver {
                                   variant.span);
                 self.structs.insert(local_def(variant.node.id));
             }
+            enum_variant_kind(ref enum_definition) => {
+                child.define_type(privacy,
+                                  def_ty(local_def(variant.node.id)),
+                                  variant.span);
+                for (*enum_definition).variants.each |variant| {
+                    self.build_reduced_graph_for_variant(*variant, item_id,
+                                                         parent_privacy,
+                                                         parent, visitor);
+                }
+            }
         }
     }
 

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

@@ -2051,6 +2051,14 @@ pub fn trans_enum_def(ccx: @CrateContext, enum_definition: ast::enum_def,
                 trans_struct_def(ccx, struct_def, path,
                                  variant.node.id);
             }
+            ast::enum_variant_kind(ref enum_definition) => {
+                trans_enum_def(ccx,
+                               *enum_definition,
+                               id,
+                               path,
+                               vi,
+                               &mut *i);
+            }
         }
     }
 }
@@ -2505,6 +2513,9 @@ pub fn get_item_val(ccx: @CrateContext, id: ast::node_id) -> ValueRef {
                 ast::struct_variant_kind(_) => {
                     fail!(~"struct variant kind unexpected in get_item_val")
                 }
+                ast::enum_variant_kind(_) => {
+                    fail!(~"enum variant kind unexpected in get_item_val")
+                }
             }
             set_inline_hint(llfn);
             llfn

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

@@ -204,6 +204,8 @@ pub fn monomorphic_fn(ccx: @CrateContext,
             }
             ast::struct_variant_kind(_) =>
                 ccx.tcx.sess.bug(~"can't monomorphize struct variants"),
+            ast::enum_variant_kind(_) =>
+                ccx.tcx.sess.bug(~"can't monomorphize enum variants")
         }
         d
       }

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

@@ -3873,6 +3873,9 @@ pub fn enum_variants(cx: ctxt, id: ast::def_id) -> @~[VariantInfo] {
                     ast::struct_variant_kind(_) => {
                         fail!(~"struct variant kinds unimpl in enum_variants")
                     }
+                    ast::enum_variant_kind(_) => {
+                        fail!(~"enum variant kinds unimpl in enum_variants")
+                    }
                 }
             })
           }

branches/try2/src/librustc/middle/typeck/check/mod.rs

@@ -3066,6 +3066,16 @@ pub fn check_enum_variants(ccx: @mut CrateCtxt,
                         ccx.tcx, local_def(v.node.id)).map(|cf|
                             ty::node_id_to_type(ccx.tcx, cf.id.node)));
                 }
+                ast::enum_variant_kind(_) => {
+                    arg_tys = None;
+                    do_check(ccx,
+                             sp,
+                             vs,
+                             id,
+                             &mut *disr_vals,
+                             &mut *disr_val,
+                             &mut *variants);
+                }
             }
 
             match arg_tys {

branches/try2/src/librustc/middle/typeck/collect.rs

@@ -202,6 +202,15 @@ pub fn get_enum_variant_types(ccx: &CrateCtxt,
                     |f| ty::node_id_to_type(ccx.tcx, f.node.id));
                 result_ty = Some(ty::mk_ctor_fn(tcx, input_tys, enum_ty));
             }
+
+            ast::enum_variant_kind(ref enum_definition) => {
+                get_enum_variant_types(ccx,
+                                       enum_ty,
+                                       enum_definition.variants,
+                                       generics,
+                                       rp);
+                result_ty = None;
+            }
         };
 
         match result_ty {

branches/try2/src/libsyntax/ast.rs

@@ -1078,13 +1078,15 @@ pub struct variant_arg {
 pub enum variant_kind {
     tuple_variant_kind(~[variant_arg]),
     struct_variant_kind(@struct_def),
+    enum_variant_kind(enum_def)
 }
 
 #[auto_encode]
 #[auto_decode]
 #[deriving(Eq)]
 pub struct enum_def {
     variants: ~[variant],
+    common: Option<@struct_def>,
 }
 
 #[auto_encode]

branches/try2/src/libsyntax/ext/auto_encode.rs

@@ -990,6 +990,8 @@ fn mk_enum_ser_body(
                 ),
             ast::struct_variant_kind(*) =>
                 fail!(~"struct variants unimplemented"),
+            ast::enum_variant_kind(*) =>
+                fail!(~"enum variants unimplemented"),
         }
     };
 
@@ -1087,6 +1089,8 @@ fn mk_enum_deser_body(
             },
             ast::struct_variant_kind(*) =>
                 fail!(~"struct variants unimplemented"),
+            ast::enum_variant_kind(*) =>
+                fail!(~"enum variants unimplemented")
         };
 
         let pat = @ast::pat {