---

yaml
---
r: 10670
b: refs/heads/snap-stage3
c: 588c1eb
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 275c1e44383bbacd8d81a9f80df9ad4da99f0168
+refs/heads/snap-stage3: 588c1eb41ff88efe3cc971f341d6f866f66dd62c
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -24,17 +24,19 @@ type arc_data<T> = {
     data: T
 };
 
-resource arc_destruct<T>(data: *libc::c_void) {
-    unsafe {
-        let data: ~arc_data<T> = unsafe::reinterpret_cast(data);
-        let new_count = rustrt::rust_atomic_decrement(&mut data.count);
-        assert new_count >= 0;
-        if new_count == 0 {
-            // drop glue takes over.
-        } else {
-            unsafe::forget(data);
-        }
-    }
+class arc_destruct<T> {
+  let data: *libc::c_void;
+  new(data: *libc::c_void) { self.data = data; }
+  drop unsafe {
+     let data: ~arc_data<T> = unsafe::reinterpret_cast(self.data);
+     let new_count = rustrt::rust_atomic_decrement(&mut data.count);
+     assert new_count >= 0;
+     if new_count == 0 {
+         // drop glue takes over.
+     } else {
+       unsafe::forget(data);
+     }
+  }
 }
 
 type arc<T: const> = arc_destruct<T>;
@@ -52,7 +54,7 @@ fn arc<T: const>(-data: T) -> arc<T> {
  wrapper."]
 fn get<T: const>(rc: &a.arc<T>) -> &a.T {
     unsafe {
-        let ptr: ~arc_data<T> = unsafe::reinterpret_cast(**rc);
+        let ptr: ~arc_data<T> = unsafe::reinterpret_cast((*rc).data);
         // Cast us back into the correct region
         let r = unsafe::reinterpret_cast(&ptr.data);
         unsafe::forget(ptr);
@@ -67,12 +69,12 @@ object. However, one of the `arc` objects can be sent to another task,
 allowing them to share the underlying data."]
 fn clone<T: const>(rc: &arc<T>) -> arc<T> {
     unsafe {
-        let ptr: ~arc_data<T> = unsafe::reinterpret_cast(**rc);
+        let ptr: ~arc_data<T> = unsafe::reinterpret_cast((*rc).data);
         let new_count = rustrt::rust_atomic_increment(&mut ptr.count);
         assert new_count >= 2;
         unsafe::forget(ptr);
     }
-    arc_destruct(**rc)
+    arc_destruct((*rc).data)
 }
 
 // An arc over mutable data that is protected by a lock.
@@ -93,17 +95,19 @@ impl methods<T: send> for exclusive<T> {
     fn clone() -> exclusive<T> {
         unsafe {
             // this makes me nervous...
-            let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
+            let ptr: ~arc_data<ex_data<T>> =
+                  unsafe::reinterpret_cast(self.data);
             let new_count = rustrt::rust_atomic_increment(&mut ptr.count);
             assert new_count > 1;
             unsafe::forget(ptr);
         }
-        arc_destruct(*self)
+        arc_destruct(self.data)
     }
 
     fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
         unsafe {
-            let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
+            let ptr: ~arc_data<ex_data<T>> =
+                  unsafe::reinterpret_cast(self.data);
             let r = {
                 let rec: &ex_data<T> = &(*ptr).data;
                 rec.lock.lock_cond() {|c|
@@ -123,8 +127,10 @@ type get_chan<T: const send> = chan<chan<arc<T>>>;
 // (terminate, get)
 type shared_arc<T: const send> = (shared_arc_res, get_chan<T>);
 
-resource shared_arc_res(c: comm::chan<()>) {
-    c.send(());
+class shared_arc_res {
+   let c: comm::chan<()>;
+   new(c: comm::chan<()>) { self.c = c; }
+   drop { self.c.send(()); }
 }
 
 fn shared_arc<T: send const>(-data: T) -> shared_arc<T> {

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

@@ -224,7 +224,11 @@ impl <T: reader, C> of reader for {base: T, cleanup: C} {
     fn tell() -> uint { self.base.tell() }
 }
 
-resource FILE_res(f: *libc::FILE) { libc::fclose(f); }
+class FILE_res {
+    let f: *libc::FILE;
+    new(f: *libc::FILE) { self.f = f; }
+    drop { libc::fclose(self.f); }
+}
 
 fn FILE_reader(f: *libc::FILE, cleanup: bool) -> reader {
     if cleanup {
@@ -383,7 +387,11 @@ impl of writer for fd_t {
     fn flush() -> int { 0 }
 }
 
-resource fd_res(fd: fd_t) { libc::close(fd); }
+class fd_res {
+    let fd: fd_t;
+    new(fd: fd_t) { self.fd = fd; }
+    drop { libc::close(self.fd); }
+}
 
 fn fd_writer(fd: fd_t, cleanup: bool) -> writer {
     if cleanup {
@@ -695,13 +703,17 @@ mod fsync {
     }
 
 
-    // Resource of artifacts that need to fsync on destruction
-    resource res<t>(arg: arg<t>) {
-        alt arg.opt_level {
-          option::none { }
-          option::some(level) {
-            // fail hard if not succesful
-            assert(arg.fsync_fn(arg.val, level) != -1);
+    // Artifacts that need to fsync on destruction
+    class res<t> {
+        let arg: arg<t>;
+        new(-arg: arg<t>) { self.arg <- arg; }
+        drop {
+          alt self.arg.opt_level {
+            option::none { }
+            option::some(level) {
+              // fail hard if not succesful
+              assert(self.arg.fsync_fn(self.arg.val, level) != -1);
+            }
           }
         }
     }
@@ -718,7 +730,7 @@ mod fsync {
     fn FILE_res_sync(&&file: FILE_res, opt_level: option<level>,
                   blk: fn(&&res<*libc::FILE>)) {
         blk(res({
-            val: *file, opt_level: opt_level,
+            val: file.f, opt_level: opt_level,
             fsync_fn: fn@(&&file: *libc::FILE, l: level) -> int {
                 ret os::fsync_fd(libc::fileno(file), l) as int;
             }
@@ -729,7 +741,7 @@ mod fsync {
     fn fd_res_sync(&&fd: fd_res, opt_level: option<level>,
                    blk: fn(&&res<fd_t>)) {
         blk(res({
-            val: *fd, opt_level: opt_level,
+            val: fd.fd, opt_level: opt_level,
             fsync_fn: fn@(&&fd: fd_t, l: level) -> int {
                 ret os::fsync_fd(fd, l) as int;
             }

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

@@ -140,8 +140,10 @@ fn test_unwrap_str() {
 
 #[test]
 fn test_unwrap_resource() {
-    resource r(i: @mut int) {
-        *i += 1;
+    class r {
+       let i: @mut int;
+       new(i: @mut int) { self.i = i; }
+       drop { *(self.i) += 1; }
     }
     let i = @mut 0;
     {

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

@@ -181,8 +181,12 @@ unsafe fn weaken_task(f: fn(comm::port<()>)) unsafe {
     let _unweaken = unweaken(ch);
     f(po);
 
-    resource unweaken(ch: comm::chan<()>) unsafe {
-        rustrt::rust_task_unweaken(unsafe::reinterpret_cast(ch));
+    class unweaken {
+      let ch: comm::chan<()>;
+      new(ch: comm::chan<()>) { self.ch = ch; }
+      drop unsafe {
+        rustrt::rust_task_unweaken(unsafe::reinterpret_cast(self.ch));
+      }
     }
 }
 

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

@@ -230,10 +230,14 @@ impl extensions for rng {
 
 }
 
-resource rand_res(c: *rctx) { rustrt::rand_free(c); }
+class rand_res {
+    let c: *rctx;
+    new(c: *rctx) { self.c = c; }
+    drop { rustrt::rand_free(self.c); }
+}
 
 impl of rng for @rand_res {
-    fn next() -> u32 { ret rustrt::rand_next(**self); }
+    fn next() -> u32 { ret rustrt::rand_next((*self).c); }
 }
 
 #[doc = "Create a new random seed for seeded_rng"]

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

@@ -170,9 +170,9 @@ fn run_program(prog: str, args: [str]) -> int {
 #[doc ="
 Spawns a process and returns a program
 
-The returned value is a boxed resource containing a <program> object that can
-be used for sending and recieving data over the standard file descriptors.
-The resource will ensure that file descriptors are closed properly.
+The returned value is a boxed class containing a <program> object that can
+be used for sending and receiving data over the standard file descriptors.
+The class will ensure that file descriptors are closed properly.
 
 # Arguments
 
@@ -181,7 +181,7 @@ The resource will ensure that file descriptors are closed properly.
 
 # Return value
 
-A boxed resource of <program>
+A class with a <program> field
 "]
 fn start_program(prog: str, args: [str]) -> program {
     let pipe_input = os::pipe();
@@ -221,16 +221,20 @@ fn start_program(prog: str, args: [str]) -> program {
        libc::fclose(r.out_file);
        libc::fclose(r.err_file);
     }
-    resource prog_res(r: prog_repr) { destroy_repr(r); }
+    class prog_res {
+        let r: prog_repr;
+        new(-r: prog_repr) { self.r = r; }
+        drop { destroy_repr(self.r); }
+    }
 
     impl of program for prog_res {
-        fn get_id() -> pid_t { ret self.pid; }
-        fn input() -> io::writer { io::fd_writer(self.in_fd, false) }
-        fn output() -> io::reader { io::FILE_reader(self.out_file, false) }
-        fn err() -> io::reader { io::FILE_reader(self.err_file, false) }
-        fn close_input() { close_repr_input(*self); }
-        fn finish() -> int { finish_repr(*self) }
-        fn destroy() { destroy_repr(*self); }
+        fn get_id() -> pid_t { ret self.r.pid; }
+        fn input() -> io::writer { io::fd_writer(self.r.in_fd, false) }
+        fn output() -> io::reader { io::FILE_reader(self.r.out_file, false) }
+        fn err() -> io::reader { io::FILE_reader(self.r.err_file, false) }
+        fn close_input() { close_repr_input(self.r); }
+        fn finish() -> int { finish_repr(self.r) }
+        fn destroy() { destroy_repr(self.r); }
     }
     let repr = {pid: pid,
                 mut in_fd: pipe_input.out,

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

@@ -85,16 +85,20 @@ pure fn log_str<T>(t: T) -> str {
     }
 }
 
-resource lock_and_signal(lock: rust_cond_lock) {
-    rustrt::rust_destroy_cond_lock(lock);
+class lock_and_signal {
+    let lock: rust_cond_lock;
+    new(lock: rust_cond_lock) { self.lock = lock; }
+    drop { rustrt::rust_destroy_cond_lock(self.lock); }
 }
 
 enum condition {
     condition_(rust_cond_lock)
 }
 
-resource unlock(lock: rust_cond_lock) {
-    rustrt::rust_unlock_cond_lock(lock);
+class unlock {
+    let lock: rust_cond_lock;
+    new(lock: rust_cond_lock) { self.lock = lock; }
+    drop { rustrt::rust_unlock_cond_lock(self.lock); }
 }
 
 fn create_lock() -> lock_and_signal {
@@ -103,15 +107,15 @@ fn create_lock() -> lock_and_signal {
 
 impl methods for lock_and_signal {
     fn lock<T>(f: fn() -> T) -> T {
-        rustrt::rust_lock_cond_lock(*self);
-        let _r = unlock(*self);
+        rustrt::rust_lock_cond_lock(self.lock);
+        let _r = unlock(self.lock);
         f()
     }
 
     fn lock_cond<T>(f: fn(condition) -> T) -> T {
-        rustrt::rust_lock_cond_lock(*self);
-        let _r = unlock(*self);
-        f(condition_(*self))
+        rustrt::rust_lock_cond_lock(self.lock);
+        let _r = unlock(self.lock);
+        f(condition_(self.lock))
     }
 }
 

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

@@ -482,9 +482,12 @@ Temporarily make the task unkillable
 
 "]
 unsafe fn unkillable(f: fn()) {
-    resource allow_failure(_i: ()) {
-        rustrt::rust_task_allow_kill();
+    class allow_failure {
+      let i: (); // since a class must have at least one field
+      new(_i: ()) { self.i = (); }
+      drop { rustrt::rust_task_allow_kill(); }
     }
+
     let _allow_failure = allow_failure(());
     rustrt::rust_task_inhibit_kill();
     f();

branches/snap-stage3/src/libstd/c_vec.rs

@@ -41,11 +41,15 @@ enum c_vec<T> {
     c_vec_({ base: *mut T, len: uint, rsrc: @dtor_res})
 }
 
-resource dtor_res(dtor: option<fn@()>) {
-    alt dtor {
+class dtor_res {
+  let dtor: option<fn@()>;
+  new(dtor: option<fn@()>) { self.dtor = dtor; }
+  drop {
+    alt self.dtor {
       option::none { }
       option::some(f) { f(); }
     }
+  }
 }
 
 /*