Require "self" as base expression for intra-class method or field references

All field or method references within a class must begin with "self." now.
A bare reference to a field or method in the same class will no longer
typecheck.

17 files changed, 40 insertions, 40 deletions

diff --git a/src/test/auxiliary/cci_class.rs b/src/test/auxiliary/cci_class.rs
index cda361c1be9..182bfd351d4 100644
--- a/src/test/auxiliary/cci_class.rs
+++ b/src/test/auxiliary/cci_class.rs
@@ -7,7 +7,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 }
diff --git a/src/test/auxiliary/cci_class_2.rs b/src/test/auxiliary/cci_class_2.rs
index 0bb398839d1..92ffb217f6a 100644
--- a/src/test/auxiliary/cci_class_2.rs
+++ b/src/test/auxiliary/cci_class_2.rs
@@ -7,7 +7,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 
   fn speak() {}
 }
diff --git a/src/test/auxiliary/cci_class_3.rs b/src/test/auxiliary/cci_class_3.rs
index a30233c8135..dab856377f8 100644
--- a/src/test/auxiliary/cci_class_3.rs
+++ b/src/test/auxiliary/cci_class_3.rs
@@ -7,10 +7,10 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 
-  fn speak() { meows += 1u; }
-  fn meow_count() -> uint { meows }
+  fn speak() { self.meows += 1u; }
+  fn meow_count() -> uint { self.meows }
 
 }
 
diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs
index e44a90e5a5c..1ed65b21d03 100644
--- a/src/test/auxiliary/cci_class_4.rs
+++ b/src/test/auxiliary/cci_class_4.rs
@@ -5,9 +5,9 @@ class cat {
     let mut meows : uint;
     fn meow() {
       #error("Meow");
-      meows += 1u;
-      if meows % 5u == 0u {
-          how_hungry += 1;
+      self.meows += 1u;
+      if self.meows % 5u == 0u {
+          self.how_hungry += 1;
       }
     }
   }
@@ -16,14 +16,14 @@ class cat {
   let name : str;
 
   new(in_x : uint, in_y : int, in_name: str)
-    { meows = in_x; how_hungry = in_y; name = in_name; }
+    { self.meows = in_x; self.how_hungry = in_y; self.name = in_name; }
 
-  fn speak() { meow(); }
+  fn speak() { self.meow(); }
 
   fn eat() -> bool {
-    if how_hungry > 0 {
+    if self.how_hungry > 0 {
         #error("OM NOM NOM");
-        how_hungry -= 2;
+        self.how_hungry -= 2;
         ret true;
     }
     else {
diff --git a/src/test/auxiliary/cci_class_5.rs b/src/test/auxiliary/cci_class_5.rs
index 6dc4d76cf52..dc933937058 100644
--- a/src/test/auxiliary/cci_class_5.rs
+++ b/src/test/auxiliary/cci_class_5.rs
@@ -8,7 +8,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 }
\ No newline at end of file
diff --git a/src/test/compile-fail/assign-to-method.rs b/src/test/compile-fail/assign-to-method.rs
index aea25979d9b..bec20390067 100644
--- a/src/test/compile-fail/assign-to-method.rs
+++ b/src/test/compile-fail/assign-to-method.rs
@@ -6,8 +6,8 @@ class cat {
 
   let how_hungry : int;
 
-  fn speak() { meows += 1u; }
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  fn speak() { self.meows += 1u; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/compile-fail/ctor-uninit-var.rs b/src/test/compile-fail/ctor-uninit-var.rs
index b2af5e48f01..5450cd77189 100644
--- a/src/test/compile-fail/ctor-uninit-var.rs
+++ b/src/test/compile-fail/ctor-uninit-var.rs
@@ -7,13 +7,13 @@ class cat {
   let how_hungry : int;
 
   fn eat() {
-    how_hungry -= 5;
+    self.how_hungry -= 5;
   }
 
   new(in_x : uint, in_y : int) {
     let foo;
-    meows = in_x + (in_y as uint);
-    how_hungry = foo;
+    self.meows = in_x + (in_y as uint);
+    self.how_hungry = foo;
   }
 }
 
diff --git a/src/test/compile-fail/mutable-class-fields-2.rs b/src/test/compile-fail/mutable-class-fields-2.rs
index edfb5a92058..1c06727ec2e 100644
--- a/src/test/compile-fail/mutable-class-fields-2.rs
+++ b/src/test/compile-fail/mutable-class-fields-2.rs
@@ -1,4 +1,4 @@
-// error-pattern:assigning to immutable class field
+// error-pattern:assigning to immutable field
 class cat {
   priv {
     let mutable meows : uint;
@@ -7,10 +7,10 @@ class cat {
   let how_hungry : int;
 
   fn eat() {
-    how_hungry -= 5;
+    self.how_hungry -= 5;
   }
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/compile-fail/mutable-class-fields.rs b/src/test/compile-fail/mutable-class-fields.rs
index b345c0c80f1..adac61c5e64 100644
--- a/src/test/compile-fail/mutable-class-fields.rs
+++ b/src/test/compile-fail/mutable-class-fields.rs
@@ -6,7 +6,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/compile-fail/private-class-field.rs b/src/test/compile-fail/private-class-field.rs
index c0fb997d14c..15aba5d009d 100644
--- a/src/test/compile-fail/private-class-field.rs
+++ b/src/test/compile-fail/private-class-field.rs
@@ -6,7 +6,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/compile-fail/private-method.rs b/src/test/compile-fail/private-method.rs
index 09f0f9b5af5..b6a16c33a2b 100644
--- a/src/test/compile-fail/private-method.rs
+++ b/src/test/compile-fail/private-method.rs
@@ -7,7 +7,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/run-pass/class-methods.rs b/src/test/run-pass/class-methods.rs
index f1769b0fb50..8023879ca97 100644
--- a/src/test/run-pass/class-methods.rs
+++ b/src/test/run-pass/class-methods.rs
@@ -5,10 +5,10 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 
-  fn speak() { meows += 1u; }
-  fn meow_count() -> uint { meows }
+  fn speak() { self.meows += 1u; }
+  fn meow_count() -> uint { self.meows }
 }
 
 fn main() {
diff --git a/src/test/run-pass/class-str-field.rs b/src/test/run-pass/class-str-field.rs
index 831006a7dfd..fab99f25910 100644
--- a/src/test/run-pass/class-str-field.rs
+++ b/src/test/run-pass/class-str-field.rs
@@ -3,7 +3,7 @@ class cat {
   let name : str;
 
   new(in_name: str)
-    { name = in_name; }
+    { self.name = in_name; }
 }
 
 fn main() {
diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/run-pass/classes-simple-method.rs
index dff5a035d98..8fcf5b96be2 100644
--- a/src/test/run-pass/classes-simple-method.rs
+++ b/src/test/run-pass/classes-simple-method.rs
@@ -5,7 +5,7 @@ class cat {
 
   let how_hungry : int;
 
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 
   fn speak() {}
 }
diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs
index 32add1b606d..f2790cee354 100644
--- a/src/test/run-pass/classes.rs
+++ b/src/test/run-pass/classes.rs
@@ -3,9 +3,9 @@ class cat {
     let mut meows : uint;
     fn meow() {
       #error("Meow");
-      meows += 1u;
-      if meows % 5u == 0u {
-          how_hungry += 1;
+      self.meows += 1u;
+      if self.meows % 5u == 0u {
+          self.how_hungry += 1;
       }
     }
   }
@@ -14,14 +14,14 @@ class cat {
   let name : str;
 
   new(in_x : uint, in_y : int, in_name: str)
-    { meows = in_x; how_hungry = in_y; name = in_name; }
+    { self.meows = in_x; self.how_hungry = in_y; self.name = in_name; }
 
-  fn speak() { meow(); }
+  fn speak() { self.meow(); }
 
   fn eat() -> bool {
-    if how_hungry > 0 {
+    if self.how_hungry > 0 {
         #error("OM NOM NOM");
-        how_hungry -= 2;
+        self.how_hungry -= 2;
         ret true;
     }
     else {
diff --git a/src/test/run-pass/private-class-field.rs b/src/test/run-pass/private-class-field.rs
index f2f7c795252..a6baea1ffa7 100644
--- a/src/test/run-pass/private-class-field.rs
+++ b/src/test/run-pass/private-class-field.rs
@@ -5,8 +5,8 @@ class cat {
 
   let how_hungry : int;
 
-  fn meow_count() -> uint { meows }
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  fn meow_count() -> uint { self.meows }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {
diff --git a/src/test/run-pass/private-method.rs b/src/test/run-pass/private-method.rs
index 1d062f32b7a..fab6bbaf7d9 100644
--- a/src/test/run-pass/private-method.rs
+++ b/src/test/run-pass/private-method.rs
@@ -7,10 +7,10 @@ class cat {
   let how_hungry : int;
 
   fn play() {
-    meows += 1u;
+    self.meows += 1u;
     self.nap();
   }
-  new(in_x : uint, in_y : int) { meows = in_x; how_hungry = in_y; }
+  new(in_x : uint, in_y : int) { self.meows = in_x; self.how_hungry = in_y; }
 }
 
 fn main() {