---

yaml
---
r: 3402
b: refs/heads/master
c: 9561def
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb14afd5eb8ab19f08e37e295fb207f0a1bb8e23
+refs/heads/master: 9561def20974acb302034c21b6de221972918d27

trunk/src/comp/front/parser.rs

@@ -139,7 +139,7 @@ fn bad_expr_word_table() -> hashmap[str, ()] {
     words.insert("be", ());
     words.insert("fail", ());
     words.insert("type", ());
-    words.insert("res", ());
+    words.insert("resource", ());
     words.insert("check", ());
     words.insert("assert", ());
     words.insert("claim", ());
@@ -2045,7 +2045,7 @@ fn parse_item(&parser p, vec[ast::attribute] attrs) -> parsed_item {
         ret got_item(parse_item_tag(p, attrs));
     } else if (eat_word(p, "obj")) {
         ret got_item(parse_item_obj(p, lyr, attrs));
-    } else if (eat_word(p, "res")) {
+    } else if (eat_word(p, "resource")) {
         ret got_item(parse_item_res(p, lyr, attrs));
     } else { ret no_item; }
 }

trunk/src/test/compile-fail/copy-a-resource.rs

@@ -1,6 +1,6 @@
 // error-pattern:Copying a non-copyable type
 
-res foo(int i) {}
+resource foo(int i) {}
 
 fn main() {
     auto x <- foo(10);

trunk/src/test/run-pass/expr-alt-box.rs

@@ -5,13 +5,13 @@
 
 // Tests for alt as expressions resulting in boxed types
 fn test_box() {
-    auto rs = alt (true) { case (true) { @100 } };
-    assert (*rs == 100);
+    auto res = alt (true) { case (true) { @100 } };
+    assert (*res == 100);
 }
 
 fn test_str() {
-    auto rs = alt (true) { case (true) { "happy" } };
-    assert (rs == "happy");
+    auto res = alt (true) { case (true) { "happy" } };
+    assert (res == "happy");
 }
 
 fn main() { test_box(); test_str(); }

trunk/src/test/run-pass/resource-destruct.rs

@@ -1,4 +1,4 @@
-res shrinky_pointer(@mutable int i) {
+resource shrinky_pointer(@mutable int i) {
     *i -= 1;
 }