diff -r c1ba166f3fc4 -r 9904633b1dfc src/Interpreter.cpp --- a/src/Interpreter.cpp Sat Nov 17 18:41:01 2012 -0800 +++ b/src/Interpreter.cpp Sat Nov 17 19:07:49 2012 -0800 @@ -196,7 +196,7 @@ } static void -GetField(Struct *obj, Descriptor *desc, LocalSlot *vp) +FetchField(Struct *obj, Descriptor *desc, LocalSlot *vp) { // :TODO: assert no GC. if (desc->type()->isTraceable()) { @@ -221,7 +221,7 @@ { StructType *type = StructType::cast(obj->map()->type()); Descriptor *desc = Descriptor::cast(type->fields()->at(index)); - GetField(obj, desc, vp); + FetchField(obj, desc, vp); } static void @@ -229,11 +229,11 @@ { Local type(zone, StructType::cast(obj->map()->type())); Local desc(zone, type->lookupField(name, NULL)); - GetField(obj, desc, vp); + FetchField(obj, desc, vp); } static void -SetField(Zone *zone, Struct *obj, Descriptor *desc, const LocalSlot &v) +StoreField(Zone *zone, Struct *obj, Descriptor *desc, const LocalSlot &v) { // :TODO: assert no GC. if (desc->type()->isTraceable()) { @@ -258,7 +258,7 @@ { StructType *type = StructType::cast(obj->map()->type()); Descriptor *desc = Descriptor::cast(type->fields()->at(index)); - SetField(zone, obj, desc, v); + StoreField(zone, obj, desc, v); } static void @@ -266,7 +266,7 @@ { Local type(zone, StructType::cast(obj->map()->type())); Local desc(zone, type->lookupField(name, NULL)); - SetField(zone, obj, desc, v); + StoreField(zone, obj, desc, v); } // Even though this function can fail, we immediately bail out, so it doesn't @@ -285,13 +285,13 @@ Descriptor *desc = Descriptor::cast(type->fields()->at(i)); LocalSlot rval; - GetField(right, desc, &rval); + FetchField(right, desc, &rval); // If the field is a struct, we need to deep-copy. if (desc->type()->isStruct()) { LocalSlot lval; - GetField(left, desc, &lval); + FetchField(left, desc, &lval); leftStruct = Struct::cast(lval.obj); rightStruct = Struct::cast(rval.obj); if (!CopyStruct(zone, leftStruct, rightStruct)) @@ -299,13 +299,13 @@ } else if (desc->type()->isArray()) { LocalSlot lval; - GetField(left, desc, &lval); + FetchField(left, desc, &lval); leftArray = Array::cast(lval.obj); rightArray = Array::cast(rval.obj); if (!CopyArray(zone, leftArray, rightArray)) return false; } else { - SetField(zone, left, desc, rval); + StoreField(zone, left, desc, rval); } }