1.1 --- a/src/Interpreter.cpp	Sat Nov 17 18:41:01 2012 -0800
     1.2 +++ b/src/Interpreter.cpp	Sat Nov 17 19:07:49 2012 -0800
     1.3 @@ -196,7 +196,7 @@
     1.4  }
     1.5  
     1.6  static void
     1.7 -GetField(Struct *obj, Descriptor *desc, LocalSlot *vp)
     1.8 +FetchField(Struct *obj, Descriptor *desc, LocalSlot *vp)
     1.9  {
    1.10      // :TODO: assert no GC.
    1.11      if (desc->type()->isTraceable()) {
    1.12 @@ -221,7 +221,7 @@
    1.13  {
    1.14      StructType *type = StructType::cast(obj->map()->type());
    1.15      Descriptor *desc = Descriptor::cast(type->fields()->at(index));
    1.16 -    GetField(obj, desc, vp);
    1.17 +    FetchField(obj, desc, vp);
    1.18  }
    1.19  
    1.20  static void
    1.21 @@ -229,11 +229,11 @@
    1.22  {
    1.23      Local<StructType> type(zone, StructType::cast(obj->map()->type()));
    1.24      Local<Descriptor> desc(zone, type->lookupField(name, NULL));
    1.25 -    GetField(obj, desc, vp);
    1.26 +    FetchField(obj, desc, vp);
    1.27  }
    1.28  
    1.29  static void
    1.30 -SetField(Zone *zone, Struct *obj, Descriptor *desc, const LocalSlot &v)
    1.31 +StoreField(Zone *zone, Struct *obj, Descriptor *desc, const LocalSlot &v)
    1.32  {
    1.33      // :TODO: assert no GC.
    1.34      if (desc->type()->isTraceable()) {
    1.35 @@ -258,7 +258,7 @@
    1.36  {
    1.37      StructType *type = StructType::cast(obj->map()->type());
    1.38      Descriptor *desc = Descriptor::cast(type->fields()->at(index));
    1.39 -    SetField(zone, obj, desc, v);
    1.40 +    StoreField(zone, obj, desc, v);
    1.41  }
    1.42  
    1.43  static void
    1.44 @@ -266,7 +266,7 @@
    1.45  {
    1.46      Local<StructType> type(zone, StructType::cast(obj->map()->type()));
    1.47      Local<Descriptor> desc(zone, type->lookupField(name, NULL));
    1.48 -    SetField(zone, obj, desc, v);
    1.49 +    StoreField(zone, obj, desc, v);
    1.50  }
    1.51  
    1.52  // Even though this function can fail, we immediately bail out, so it doesn't
    1.53 @@ -285,13 +285,13 @@
    1.54          Descriptor *desc = Descriptor::cast(type->fields()->at(i));
    1.55  
    1.56          LocalSlot rval;
    1.57 -        GetField(right, desc, &rval);
    1.58 +        FetchField(right, desc, &rval);
    1.59  
    1.60          // If the field is a struct, we need to deep-copy.
    1.61          if (desc->type()->isStruct()) {
    1.62              LocalSlot lval;
    1.63  
    1.64 -            GetField(left, desc, &lval);
    1.65 +            FetchField(left, desc, &lval);
    1.66              leftStruct = Struct::cast(lval.obj);
    1.67              rightStruct = Struct::cast(rval.obj);
    1.68              if (!CopyStruct(zone, leftStruct, rightStruct))
    1.69 @@ -299,13 +299,13 @@
    1.70          } else if (desc->type()->isArray()) {
    1.71              LocalSlot lval;
    1.72  
    1.73 -            GetField(left, desc, &lval);
    1.74 +            FetchField(left, desc, &lval);
    1.75              leftArray = Array::cast(lval.obj);
    1.76              rightArray = Array::cast(rval.obj);
    1.77              if (!CopyArray(zone, leftArray, rightArray))
    1.78                  return false;
    1.79          } else {
    1.80 -            SetField(zone, left, desc, rval);
    1.81 +            StoreField(zone, left, desc, rval);
    1.82          }
    1.83      }
    1.84