---

yaml
---
r: 22583
b: refs/heads/master
c: b71a882
h: refs/heads/master
i:
  22581: bc8da53
  22579: e0a228e
  22575: 88dc75a
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d61d7b59791703325d476942bafa5f2d218552f7
+refs/heads/master: b71a8827e3a17720508b7edebdc2c13358179e59
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/Makefile.in

@@ -136,8 +136,6 @@ ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
     CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
                      --pretty=format:'(%h %ci)')
-    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
-                     --pretty=format:'%H')
 endif
 endif
 

trunk/doc/rust.css

@@ -2,8 +2,6 @@ body {
   padding: 1em;
   margin: 0;
   font-family: "Helvetica Neue", Helvetica, sans-serif;
-  background-color: white;
-  color: black;
 }
 
 body {
@@ -60,22 +58,6 @@ h1.title {
   background-position: right;
 }
 
-#versioninfo {
-  position: fixed;
-  bottom: 0px;
-  right: 0px;
-
-  background-color: white;
-  border-left: solid 1px black;
-  border-top: solid 1px black;
-  padding: 0.5em;
-}
-
-a.lessimportant {
-  color: gray;
-  font-size: 60%;
-}
-
 blockquote {
     color: black;
     border-left: solid 1px silver;

trunk/doc/version_info_template.html

@@ -21,7 +21,7 @@ doc/rust.css: rust.css
 	$(Q)cp -a $< $@ 2> /dev/null
 
 DOCS += doc/rust.html
-doc/rust.html: rust.md doc/version_info.html doc/rust.css
+doc/rust.html: rust.md doc/version.md doc/rust.css
 	@$(call E, pandoc: $@)
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
 	"$(CFG_PANDOC)" \
@@ -30,7 +30,6 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css
          --number-sections \
          --from=markdown --to=html \
          --css=rust.css \
-	 --include-before-body=doc/version_info.html \
          --output=$@
   endif
 
@@ -73,13 +72,12 @@ doc/rust.pdf: doc/rust.tex
   else
 
 DOCS += doc/tutorial.html
-doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css
+doc/tutorial.html: tutorial.md doc/rust.css
 	@$(call E, pandoc: $@)
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
            --from=markdown --to=html --css=rust.css \
-	   --include-before-body=doc/version_info.html \
            --output=$@
 
   endif
@@ -147,12 +145,6 @@ doc/version.md: $(MKFILE_DEPS) rust.md
 	@$(call E, version-stamp: $@)
 	$(Q)echo "$(CFG_VERSION)" >$@
 
-doc/version_info.html: version_info_template.html
-	@$(call E, version-info: $@)
-	sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(shell echo \
-                    $(CFG_VER_HASH) | head --bytes=8)/;\
-	            s/STAMP/$(CFG_VER_HASH)/;" $< >$@
-
 GENERATED += doc/version.md
 
 docs: $(DOCS)

trunk/mk/docs.mk

@@ -5,7 +5,7 @@
 import option::{some, none};
 import option = option::option;
 import path = path::path;
-import tuple::extensions;
+import tuple::{extensions, tuple_ops, extended_tuple_ops};
 import str::{extensions, str_slice, unique_str};
 import vec::extensions;
 import vec::{const_vector, copyable_vector, immutable_vector};
@@ -40,6 +40,7 @@ export str_slice, unique_str;
 export const_vector, copyable_vector, immutable_vector;
 export immutable_copyable_vector, iter_trait_extensions, vec_concat;
 export base_iter, copyable_iter, extended_iter;
+export tuple_ops, extended_tuple_ops;
 export ptr;
 
 // Export the log levels as global constants. Higher levels mean

trunk/src/libcore/core.rs

@@ -1,7 +1,12 @@
 //! Operations on tuples
 
+trait tuple_ops<T,U> {
+    pure fn first() -> T;
+    pure fn second() -> U;
+    pure fn swap() -> (U, T);
+}
 
-impl extensions <T:copy, U:copy> for (T, U) {
+impl extensions <T:copy, U:copy> of tuple_ops<T,U> for (T, U) {
 
     /// Return the first element of self
     pure fn first() -> T {
@@ -23,7 +28,14 @@ impl extensions <T:copy, U:copy> for (T, U) {
 
 }
 
-impl extensions<A: copy, B: copy> for (&[A], &[B]) {
+trait extended_tuple_ops<A,B> {
+    fn zip() -> ~[(A, B)];
+    fn map<C>(f: fn(A, B) -> C) -> ~[C];
+}
+
+impl extensions<A: copy, B: copy> of extended_tuple_ops<A,B>
+        for (&[A], &[B]) {
+
     fn zip() -> ~[(A, B)] {
         let (a, b) = self;
         vec::zip(a, b)
@@ -35,7 +47,9 @@ impl extensions<A: copy, B: copy> for (&[A], &[B]) {
     }
 }
 
-impl extensions<A: copy, B: copy> for (~[A], ~[B]) {
+impl extensions<A: copy, B: copy> of extended_tuple_ops<A,B>
+        for (~[A], ~[B]) {
+
     fn zip() -> ~[(A, B)] {
         let (a, b) = self;
         vec::zip(a, b)

trunk/src/libcore/tuple.rs

@@ -244,43 +244,6 @@ fn get_mac_body(cx: ext_ctxt, sp: span, args: ast::mac_body)
     }
 }
 
-fn tt_args_to_original_flavor(cx: ext_ctxt, sp: span, arg: ~[ast::token_tree])
-    -> ast::mac_arg {
-    import ast::{matcher, matcher_, mtc_tok, mtc_rep, mtc_bb};
-    import parse::lexer::{new_tt_reader, tt_reader_as_reader, reader};
-    import tt::earley_parser::{parse_or_else, seq, leaf};
-
-    // these spans won't matter, anyways
-    fn ms(m: matcher_) -> matcher {
-        {node: m, span: {lo: 0u, hi: 0u, expn_info: none}}
-    }
-
-    let argument_gram = ~[ms(mtc_rep(~[
-        ms(mtc_bb(@"arg",@"expr", 0u))
-    ], some(parse::token::COMMA), true))];
-
-    let arg_reader = new_tt_reader(cx.parse_sess().span_diagnostic,
-                                   cx.parse_sess().interner, none, arg);
-    let args =
-        alt parse_or_else(cx.parse_sess(), cx.cfg(), arg_reader as reader,
-                          argument_gram).get(@"arg") {
-          @seq(s, _) {
-            do s.map() |lf| {
-                alt lf {
-                  @leaf(parse::token::w_expr(arg)) {
-                    arg /* whew! list of exprs, here we come! */
-                  }
-                  _ { fail "badly-structured parse result"; }
-                }
-            }
-          }
-          _ { fail "badly-structured parse result"; }
-        };
-
-    ret some(@{id: parse::next_node_id(cx.parse_sess()),
-               node: ast::expr_vec(args, ast::m_imm), span: sp});
-}
-
 //
 // Local Variables:
 // mode: rust

trunk/src/libsyntax/ext/base.rs

@@ -81,20 +81,7 @@ fn expand_expr(exts: hashmap<~str, syntax_extension>, cx: ext_ctxt,
                     cx.bt_pop();
 
                     (fully_expanded, s)
-                  }
-                  some(normal({expander: exp, span: exp_sp})) {
-                    //convert the new-style invoc for the old-style macro
-                    let arg = base::tt_args_to_original_flavor(cx, pth.span,
-                                                               tts);
-                    let expanded = exp(cx, mac.span, arg, none);
 
-                    cx.bt_push(expanded_from({call_site: s,
-                                callie: {name: *extname, span: exp_sp}}));
-                    //keep going, outside-in
-                    let fully_expanded = fld.fold_expr(expanded).node;
-                    cx.bt_pop();
-
-                    (fully_expanded, s)
                   }
                   _ {
                     cx.span_fatal(pth.span,

trunk/src/libsyntax/ext/expand.rs

@@ -202,7 +202,7 @@ impl ast_builder of ext_ctxt_ast_builder for ext_ctxt {
           span: empty_span()}
     }
 
-    fn ty_nil() -> @ast::ty {
+    fn ty_nil_ast_builder() -> @ast::ty {
         @{id: self.next_id(),
           node: ast::ty_nil,
           span: empty_span()}

trunk/src/libsyntax/ext/pipes/ast_builder.rs

@@ -22,7 +22,21 @@ import ast_builder::ast_builder;
 import ast_builder::methods;
 import ast_builder::path;
 
-impl compile for message {
+trait gen_send {
+    fn gen_send(cx: ext_ctxt) -> @ast::item;
+}
+
+trait to_type_decls {
+    fn to_type_decls(cx: ext_ctxt) -> ~[@ast::item];
+    fn to_endpoint_decls(cx: ext_ctxt, dir: direction) -> ~[@ast::item];
+}
+
+trait gen_init {
+    fn gen_init(cx: ext_ctxt) -> @ast::item;
+    fn compile(cx: ext_ctxt) -> @ast::item;
+}
+
+impl compile of gen_send for message {
     fn gen_send(cx: ext_ctxt) -> @ast::item {
         #debug("pipec: gen_send");
         alt self {
@@ -80,7 +94,7 @@ impl compile for message {
 
             let args_ast = vec::append(
                 ~[cx.arg_mode(@~"pipe",
-                              cx.ty_path(path(this.data_name())
+                              cx.ty_path_ast_builder(path(this.data_name())
                                         .add_tys(cx.ty_vars(this.ty_params))),
                               ast::by_copy)],
                 args_ast);
@@ -104,20 +118,20 @@ impl compile for message {
 
             cx.item_fn_poly(self.name(),
                             args_ast,
-                            cx.ty_nil(),
+                            cx.ty_nil_ast_builder(),
                             self.get_params(),
                             cx.expr_block(body))
           }
         }
     }
 
     fn to_ty(cx: ext_ctxt) -> @ast::ty {
-        cx.ty_path_ast_builder(path(self.name)
-          .add_tys(cx.ty_vars(self.ty_params)))
+        cx.ty_path_ast_builder(path(self.name())
+          .add_tys(cx.ty_vars(self.get_params())))
     }
 }
 
-impl compile for state {
+impl compile of to_type_decls for state {
     fn to_type_decls(cx: ext_ctxt) -> ~[@ast::item] {
         #debug("pipec: to_type_decls");
         // This compiles into two different type declarations. Say the
@@ -144,7 +158,7 @@ impl compile for state {
                 };
 
                 vec::append_one(tys,
-                                cx.ty_path((dir + next_name)
+                                cx.ty_path_ast_builder((dir + next_name)
                                            .add_tys(next_tys)))
               }
               none { tys }
@@ -184,7 +198,7 @@ impl compile for state {
     }
 }
 
-impl compile for protocol {
+impl compile of gen_init for protocol {
     fn gen_init(cx: ext_ctxt) -> @ast::item {
         let start_state = self.states[0];
 
@@ -303,19 +317,3 @@ impl parse_utils of ext_ctxt_parse_utils for ext_ctxt {
     }
 }
 
-trait two_vector_utils<A, B> {
-    fn zip() -> ~[(A, B)];
-    fn map<C>(f: fn(A, B) -> C) -> ~[C];
-}
-
-impl methods<A: copy, B: copy> of two_vector_utils<A, B> for (~[A], ~[B]) {
-    fn zip() -> ~[(A, B)] {
-        let (a, b) = self;
-        vec::zip(a, b)
-    }
-
-    fn map<C>(f: fn(A, B) -> C) -> ~[C] {
-        let (a, b) = self;
-        vec::map2(a, b, f)
-    }
-}

trunk/src/libsyntax/ext/pipes/pipec.rs

@@ -3,7 +3,7 @@ import dvec::{dvec, extensions};
 
 import ast::{ident};
 
-import ast_builder::{path, methods, ast_builder};
+import ast_builder::{path, methods, ast_builder, append_types};
 
 enum direction {
     send, recv
@@ -78,7 +78,8 @@ impl methods for state {
     }
 
     fn to_ty(cx: ext_ctxt) -> @ast::ty {
-        cx.ty_path(path(self.name).add_tys(cx.ty_vars(self.ty_params)))
+        cx.ty_path_ast_builder
+            (path(self.name).add_tys(cx.ty_vars(self.ty_params)))
     }
 }
 

trunk/src/libsyntax/ext/pipes/proto.rs

@@ -101,16 +101,6 @@ enum parse_result {
     failure(codemap::span, ~str)
 }
 
-fn parse_or_else(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader,
-                 ms: ~[matcher]) -> hashmap<ident, @arb_depth> {
-    alt parse(sess, cfg, rdr, ms) {
-      success(m) { m }
-      failure(sp, str) {
-        sess.span_diagnostic.span_fatal(sp, str);
-      }
-    }
-}
-
 fn parse(sess: parse_sess, cfg: ast::crate_cfg, rdr: reader, ms: ~[matcher])
     -> parse_result {
     let mut cur_eis = ~[];