1.1 --- a/src/Array.h	Sun Aug 05 00:31:20 2012 -0700
     1.2 +++ b/src/Array.h	Sun Aug 05 00:45:06 2012 -0700
     1.3 @@ -39,7 +39,7 @@
     1.4      static Array *NewExternal(Zone *zone, Handle<ArrayMap> map, uint32 nelements,
     1.5                                void *elements, Heap::Tenure = Heap::Tenure_Default);
     1.6  
     1.7 -    uint32 nelements() {
     1.8 +    uint32 length() {
     1.9          return nelements_;
    1.10      }
    1.11      void *vec() {
    1.12 @@ -55,36 +55,36 @@
    1.13      inline size_t elementSize();
    1.14  
    1.15      int readInt32(size_t index) {
    1.16 -        assert(index < nelements());
    1.17 +        assert(index < length());
    1.18          return int32Vec()[index];
    1.19      }
    1.20      void writeInt32(size_t index, int i) {
    1.21 -        assert(index < nelements());
    1.22 +        assert(index < length());
    1.23          int32Vec()[index] = i;
    1.24      }
    1.25      char readChar(size_t index) {
    1.26 -        assert(index < nelements());
    1.27 +        assert(index < length());
    1.28          return chars()[index];
    1.29      }
    1.30      void writeChar(size_t index, char c) {
    1.31 -        assert(index < nelements());
    1.32 +        assert(index < length());
    1.33          chars()[index] = c;
    1.34      }
    1.35      float readFloat(size_t index) {
    1.36 -        assert(index < nelements());
    1.37 +        assert(index < length());
    1.38          return floatVec()[index];
    1.39      }
    1.40      void writeFloat(size_t index, float f) {
    1.41 -        assert(index < nelements());
    1.42 +        assert(index < length());
    1.43          floatVec()[index] = f;
    1.44      }
    1.45      inline void *slotPtr(size_t index);
    1.46      Object *readObject(size_t index) {
    1.47 -        assert(index < nelements());
    1.48 +        assert(index < length());
    1.49          return objVec()[index];
    1.50      }
    1.51      void writeObject(Zone *zone, size_t index, Object *ptr) {
    1.52 -        assert(index < nelements());
    1.53 +        assert(index < length());
    1.54          write(zone, &objVec()[index], ptr);
    1.55      }
    1.56  
    1.57 @@ -97,7 +97,7 @@
    1.58      static inline size_t SizeOf(Array *array) {
    1.59          if (array->isExternal())
    1.60              return sizeof(Array);
    1.61 -        return sizeof(Array) + array->nelements() * array->elementSize();
    1.62 +        return sizeof(Array) + array->length() * array->elementSize();
    1.63      }
    1.64  
    1.65      static Array *cast(Object *obj) {
    1.66 @@ -157,7 +157,7 @@
    1.67  {
    1.68      assert(type()->contained()->primitive() == PrimitiveType_Int32 ||
    1.69             type()->contained()->primitive() == PrimitiveType_Float);
    1.70 -    assert(index < nelements());
    1.71 +    assert(index < length());
    1.72      return reinterpret_cast<int *>(vec()) + index;
    1.73  }
    1.74