---

yaml
---
r: 7864
b: refs/heads/snap-stage3
c: ca0aefa
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4e1bf8d69238bc0ca801f100a88399475da49066
+refs/heads/snap-stage3: ca0aefa8bfbd1f1906f6aa7bba430c1765d2345f
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/syntax/print/pprust.rs

@@ -117,6 +117,34 @@ fn test_fun_to_str() {
     assert fun_to_str(decl, "a", []) == "fn a()";
 }
 
+fn res_to_str(decl: ast::fn_decl, name: ast::ident,
+              params: [ast::ty_param]) -> str {
+    let buffer = io::mk_mem_buffer();
+    let s = rust_printer(io::mem_buffer_writer(buffer));
+    print_res(s, decl, name, params);
+    end(s); // Close the head box
+    end(s); // Close the outer box
+    eof(s.s);
+    io::mem_buffer_str(buffer)
+}
+
+#[test]
+fn test_res_to_str() {
+    let decl: ast::fn_decl = {
+        inputs: [{
+            mode: ast::by_val,
+            ty: @ast_util::respan(ast_util::dummy_sp(), ast::ty_bool),
+            ident: "b",
+            id: 0
+        }],
+        output: @ast_util::respan(ast_util::dummy_sp(), ast::ty_nil),
+        purity: ast::impure_fn,
+        cf: ast::return_val,
+        constraints: []
+    };
+    assert res_to_str(decl, "a", []) == "resource a(b: bool)";
+}
+
 fn block_to_str(blk: ast::blk) -> str {
     let buffer = io::mk_mem_buffer();
     let s = rust_printer(io::mem_buffer_writer(buffer));
@@ -498,20 +526,25 @@ fn print_item(s: ps, &&item: @ast::item) {
         bclose(s, item.span);
       }
       ast::item_res(decl, tps, body, dt_id, ct_id) {
-        head(s, "resource");
-        word(s.s, item.ident);
-        print_type_params(s, tps);
-        popen(s);
-        word_space(s, decl.inputs[0].ident + ":");
-        print_type(s, decl.inputs[0].ty);
-        pclose(s);
-        space(s.s);
+        print_res(s, decl, item.ident, tps);
         print_block(s, body);
       }
     }
     s.ann.post(ann_node);
 }
 
+fn print_res(s: ps, decl: ast::fn_decl, name: ast::ident,
+             typarams: [ast::ty_param]) {
+    head(s, "resource");
+    word(s.s, name);
+    print_type_params(s, typarams);
+    popen(s);
+    word_space(s, decl.inputs[0].ident + ":");
+    print_type(s, decl.inputs[0].ty);
+    pclose(s);
+    space(s.s);
+}
+
 fn print_variant(s: ps, v: ast::variant) {
     word(s.s, v.node.name);
     if vec::len(v.node.args) > 0u {

branches/snap-stage3/src/libcore/f32.rs

@@ -1,4 +1,8 @@
-#[doc = "Floating point operations and constants for `f32`"];
+/*
+Module: f32
+
+Floating point operations and constants for `f32`
+*/
 
 // PORT
 
@@ -25,87 +29,113 @@ type t = f32;
 // These are not defined inside consts:: for consistency with
 // the integer types
 
+/* Const: NaN */
 const NaN: f32 = 0.0_f32/0.0_f32;
 
+/* Const: infinity */
 const infinity: f32 = 1.0_f32/0.0_f32;
 
+/* Const: neg_infinity */
 const neg_infinity: f32 = -1.0_f32/0.0_f32;
 
+/* Predicate: isNaN */
 pure fn is_NaN(f: f32) -> bool { f != f }
 
+/* Function: add */
 pure fn add(x: f32, y: f32) -> f32 { ret x + y; }
 
+/* Function: sub */
 pure fn sub(x: f32, y: f32) -> f32 { ret x - y; }
 
+/* Function: mul */
 pure fn mul(x: f32, y: f32) -> f32 { ret x * y; }
 
+/* Function: div */
 pure fn div(x: f32, y: f32) -> f32 { ret x / y; }
 
+/* Function: rem */
 pure fn rem(x: f32, y: f32) -> f32 { ret x % y; }
 
+/* Predicate: lt */
 pure fn lt(x: f32, y: f32) -> bool { ret x < y; }
 
+/* Predicate: le */
 pure fn le(x: f32, y: f32) -> bool { ret x <= y; }
 
+/* Predicate: eq */
 pure fn eq(x: f32, y: f32) -> bool { ret x == y; }
 
+/* Predicate: ne */
 pure fn ne(x: f32, y: f32) -> bool { ret x != y; }
 
+/* Predicate: ge */
 pure fn ge(x: f32, y: f32) -> bool { ret x >= y; }
 
+/* Predicate: gt */
 pure fn gt(x: f32, y: f32) -> bool { ret x > y; }
 
 // FIXME replace the predicates below with llvm intrinsics or calls
 // to the libmath macros in the rust runtime for performance
 
-#[doc(
-  brief = "Returns true if `x` is a positive number, including +0.0f320 and +Infinity."
-)]
+/*
+Predicate: is_positive
+
+Returns true if `x` is a positive number, including +0.0f320 and +Infinity.
+ */
 pure fn is_positive(x: f32) -> bool
     { ret x > 0.0f32 || (1.0f32/x) == infinity; }
 
-#[doc(
-  brief = "Returns true if `x` is a negative number, including -0.0f320 and -Infinity."
-)]
+/*
+Predicate: is_negative
+
+Returns true if `x` is a negative number, including -0.0f320 and -Infinity.
+ */
 pure fn is_negative(x: f32) -> bool
     { ret x < 0.0f32 || (1.0f32/x) == neg_infinity; }
 
-#[doc(
-  brief = "Returns true if `x` is a negative number, including \
-           -0.0f320 and -Infinity. (This is the same as \
-           `f32::negative`.)"
-)]
+/*
+Predicate: is_nonpositive
+
+Returns true if `x` is a negative number, including -0.0f320 and -Infinity.
+(This is the same as `f32::negative`.)
+*/
 pure fn is_nonpositive(x: f32) -> bool {
   ret x < 0.0f32 || (1.0f32/x) == neg_infinity;
 }
 
-#[doc(
-  brief = "Returns true if `x` is a positive number, \
-           including +0.0f320 and +Infinity. (This is \
-           the same as `f32::positive`.)"
-)]
+/*
+Predicate: nonnegative
+
+Returns true if `x` is a positive number, including +0.0f320 and +Infinity.
+(This is the same as `f32::positive`.)
+*/
 pure fn is_nonnegative(x: f32) -> bool {
   ret x > 0.0f32 || (1.0f32/x) == infinity;
 }
 
-#[doc(
-  brief = "Returns true if `x` is a zero number \
-  (positive or negative zero)"
-)]
+/*
+Predicate: is_zero
+
+Returns true if `x` is a zero number (positive or negative zero)
+*/
 pure fn is_zero(x: f32) -> bool {
     ret x == 0.0f32 || x == -0.0f32;
 }
 
-#[doc(
-  brief = "Returns true if `x`is an infinite number"
-)]
+/*
+Predicate: is_infinite
+
+Returns true if `x`is an infinite numer
+*/
 pure fn is_infinite(x: f32) -> bool {
     ret x == infinity || x == neg_infinity;
 }
 
-#[doc(
-  brief = "Returns true if `x`is a finite number"
-)]
+/*
+Predicate: is_finite
+
+Returns true if `x`is a finite numer
+*/
 pure fn is_finite(x: f32) -> bool {
     ret !(is_NaN(x) || is_infinite(x));
 }
@@ -116,69 +146,96 @@ pure fn is_finite(x: f32) -> bool {
 mod consts {
 
     // FIXME replace with mathematical constants from cmath
-    #[doc(
-      brief = "Archimedes' constant"
-    )]
+
+    /*
+    Const: pi
+
+    Archimedes' constant
+    */
     const pi: f32 = 3.14159265358979323846264338327950288_f32;
 
-    #[doc(
-      brief = "pi/2.0"
-    )]
+    /*
+    Const: frac_pi_2
+
+    pi/2.0
+    */
     const frac_pi_2: f32 = 1.57079632679489661923132169163975144_f32;
 
-    #[doc(
-      brief = "pi/4.0"
-    )]
+    /*
+    Const: frac_pi_4
+
+    pi/4.0
+    */
     const frac_pi_4: f32 = 0.785398163397448309615660845819875721_f32;
 
-    #[doc(
-      brief = "1.0/pi"
-    )]
+    /*
+    Const: frac_1_pi
+
+    1.0/pi
+    */
     const frac_1_pi: f32 = 0.318309886183790671537767526745028724_f32;
 
-    #[doc(
-      brief = "2.0/pi"
-    )]
+    /*
+    Const: frac_2_pi
+
+    2.0/pi
+    */
     const frac_2_pi: f32 = 0.636619772367581343075535053490057448_f32;
 
-    #[doc(
-      brief = "2.0/sqrt(pi)"
-    )]
+    /*
+    Const: frac_2_sqrtpi
+
+    2.0/sqrt(pi)
+    */
     const frac_2_sqrtpi: f32 = 1.12837916709551257389615890312154517_f32;
 
-    #[doc(
-      brief = "sqrt(2.0)"
-    )]
+    /*
+    Const: sqrt2
+
+    sqrt(2.0)
+    */
     const sqrt2: f32 = 1.41421356237309504880168872420969808_f32;
 
-    #[doc(
-      brief = "1.0/sqrt(2.0)"
-    )]
+    /*
+    Const: frac_1_sqrt2
+
+    1.0/sqrt(2.0)
+    */
     const frac_1_sqrt2: f32 = 0.707106781186547524400844362104849039_f32;
 
-    #[doc(
-      brief = "Euler's number"
-    )]
+    /*
+    Const: e
+
+    Euler's number
+    */
     const e: f32 = 2.71828182845904523536028747135266250_f32;
 
-    #[doc(
-      brief = "log2(e)"
-    )]
+    /*
+    Const: log2_e
+
+    log2(e)
+    */
     const log2_e: f32 = 1.44269504088896340735992468100189214_f32;
 
-    #[doc(
-      brief = "log10(e)"
-    )]
+    /*
+    Const: log10_e
+
+    log10(e)
+    */
     const log10_e: f32 = 0.434294481903251827651128918916605082_f32;
 
-    #[doc(
-      brief = "ln(2.0)"
-    )]
+    /*
+    Const: ln_2
+
+    ln(2.0)
+    */
     const ln_2: f32 = 0.693147180559945309417232121458176568_f32;
 
-    #[doc(
-      brief = "ln(10.0)"
-    )]
+    /*
+    Const: ln_10
+
+    ln(10.0)
+    */
     const ln_10: f32 = 2.30258509299404568401799145468436421_f32;
 }