---

yaml
---
r: 32460
b: refs/heads/dist-snap
c: e9f5a09
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 249668f22396bde43523207117b3869e63b49c4f
+refs/heads/dist-snap: e9f5a099dfcb42c7f2bb38974b57bbde7042ee9c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/dvec.rs

@@ -235,13 +235,13 @@ impl<A: copy> DVec<A> {
         }
     }
 
-    /*
     /**
      * Append all elements of an iterable.
      *
      * Failure will occur if the iterable's `each()` method
      * attempts to access this vector.
      */
+    /*
     fn append_iter<A, I:iter::base_iter<A>>(ts: I) {
         do self.swap |v| {
            let mut v = match ts.size_hint() {

branches/dist-snap/src/libsyntax/ext/expand.rs

@@ -243,6 +243,7 @@ fn new_span(cx: ext_ctxt, sp: span) -> span {
 fn core_macros() -> ~str {
     return
 ~"{
+    macro_rules! ignore (($($x:tt)*) => (()))
     #macro[[#error[f, ...], log(core::error, #fmt[f, ...])]];
     #macro[[#warn[f, ...], log(core::warn, #fmt[f, ...])]];
     #macro[[#info[f, ...], log(core::info, #fmt[f, ...])]];

branches/dist-snap/src/libsyntax/parse/lexer.rs

@@ -267,21 +267,16 @@ fn consume_block_comment(rdr: string_reader)
                 sp: ast_util::mk_sp(start_chpos, rdr.chpos)
             });
         }
-    }
-
-    let mut level: int = 1;
-    while level > 0 {
-        if is_eof(rdr) { rdr.fatal(~"unterminated block comment"); }
-        if rdr.curr == '/' && nextch(rdr) == '*' {
-            bump(rdr);
-            bump(rdr);
-            level += 1;
-        } else {
+    } else {
+        loop {
+            if is_eof(rdr) { rdr.fatal(~"unterminated block comment"); }
             if rdr.curr == '*' && nextch(rdr) == '/' {
                 bump(rdr);
                 bump(rdr);
-                level -= 1;
-            } else { bump(rdr); }
+                break;
+            } else {
+                bump(rdr);
+            }
         }
     }
     // restart whitespace munch.

branches/dist-snap/src/test/compile-fail/no-comment-balancing.rs

@@ -0,0 +1,16 @@
+// error-pattern:
+
+/* This is a test to ensure that we do _not_ support nested/balanced comments. I know you might be
+   thinking "but nested comments are cool", and that would be a valid point, but they are also a
+   thing that would make our lexical syntax non-regular, and we do not want that to be true.
+
+   omitting-things at a higher level (tokens) should be done via token-trees / macros,
+   not comments.
+
+   /*
+     fail here
+   */
+*/
+
+fn main() {
+}

branches/dist-snap/src/test/compile-fail/unbalanced-comment.rs

@@ -1,9 +1,6 @@
-
-
-
 // -*- rust -*-
 
 /*
- * This is a /* depth-balanced */ multi-line comment.
+ * This is a multi-line comment.
  */
 fn main() { }