---

yaml
---
r: 36062
b: refs/heads/try2
c: a605416
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1048f9abfac08c59d313e0764c909cfa0821a39e
+refs/heads/try2: a605416bb471652768a28f9fc5d54f0327f6d770
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/condition.rs

@@ -20,12 +20,18 @@ impl<T, U: Copy>  Condition<T,U> {
         }
     }
 
-    fn raise(t:&T) -> U {
+    fn raise(t:&T) -> U  {
+        do self.raise_default(t) {
+            fail ~"Unhandled condition";
+        }
+    }
+
+    fn raise_default(t:&T, default: fn() -> U) -> U {
         unsafe {
             match task::local_data::local_data_pop(self.key) {
                 None => {
                     debug!("Condition.raise: found no handler");
-                    fail
+                    default()
                 }
 
                 Some(handler) => {
@@ -134,7 +140,6 @@ mod test {
             trouble(1);
         }
 
-
         assert outer_trapped;
     }
 
@@ -174,8 +179,25 @@ mod test {
             nested_reraise_trap_test_inner();
         }
 
-
         assert outer_trapped;
     }
 
-}
+    #[test]
+    fn test_default() {
+        let sadness_condition : Condition<int,int> =
+            Condition { key: sadness_key };
+
+        let mut trapped = false;
+
+        do sadness_condition.trap(|j| {
+            debug!("test_default: in handler");
+            sadness_condition.raise_default(j, || {trapped=true; 5})
+        }).in {
+            debug!("test_default: in protected block");
+            trouble(1);
+        }
+
+        assert trapped;
+    }
+
+}