libsyntax: Implement `assert` as a macro (called `fail_unless!` on a transitionary basis to avoid conflicting with the keyword right now). r=brson

3 files changed, 31 insertions, 12 deletions

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 7c641b0e985..068b372c069 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -300,6 +300,14 @@ fn core_macros() -> ~str {
         )
     )
 
+    macro_rules! fail_unless(
+        ($cond:expr) => {
+            if !$cond {
+                die!(~\"assertion failed: \" + stringify!($cond))
+            }
+        }
+    )
+
     macro_rules! condition (
 
         { $c:ident: $in:ty -> $out:ty; } => {
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 93c03063623..2136499f8f0 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -200,19 +200,24 @@ fn to_str(in: @ident_interner, t: Token) -> ~str {
       DOC_COMMENT(s) => *in.get(s),
       EOF => ~"<eof>",
       INTERPOLATED(ref nt) => {
-        ~"an interpolated " +
-            match (*nt) {
-              nt_item(*) => ~"item",
-              nt_block(*) => ~"block",
-              nt_stmt(*) => ~"statement",
-              nt_pat(*) => ~"pattern",
-              nt_expr(*) => ~"expression",
-              nt_ty(*) => ~"type",
-              nt_ident(*) => ~"identifier",
-              nt_path(*) => ~"path",
-              nt_tt(*) => ~"tt",
-              nt_matchers(*) => ~"matcher sequence"
+        match nt {
+            &nt_expr(e) => ::print::pprust::expr_to_str(e, in),
+            _ => {
+                ~"an interpolated " +
+                    match (*nt) {
+                      nt_item(*) => ~"item",
+                      nt_block(*) => ~"block",
+                      nt_stmt(*) => ~"statement",
+                      nt_pat(*) => ~"pattern",
+                      nt_expr(*) => fail ~"should have been handled above",
+                      nt_ty(*) => ~"type",
+                      nt_ident(*) => ~"identifier",
+                      nt_path(*) => ~"path",
+                      nt_tt(*) => ~"tt",
+                      nt_matchers(*) => ~"matcher sequence"
+                    }
             }
+        }
       }
     }
 }
diff --git a/src/test/run-fail/assert-as-macro.rs b/src/test/run-fail/assert-as-macro.rs
new file mode 100644
index 00000000000..8bb1e278fd1
--- /dev/null
+++ b/src/test/run-fail/assert-as-macro.rs
@@ -0,0 +1,6 @@
+// error-pattern:assertion failed: 1 == 2
+
+fn main() {
+    fail_unless!(1 == 2);
+}
+