binary: Rename array accessors for clarity.

pfalcon · pfalcon · commit ef9124f5ffb6 · 2014-04-11T03:58:49.000+03:00
diff --git a/py/binary.c b/py/binary.c
@@ -39,7 +39,7 @@ int mp_binary_get_size(char typecode) {
     return -1;
 }
 
-mp_obj_t mp_binary_get_val(char typecode, void *p, int index) {
+mp_obj_t mp_binary_get_val_array(char typecode, void *p, int index) {
     machine_int_t val = 0;
     switch (typecode) {
         case 'b':
@@ -121,7 +121,7 @@ mp_obj_t mp_binary_get_val_unaligned(char typecode, byte **ptr) {
     }
 }
 
-void mp_binary_set_val(char typecode, void *p, int index, mp_obj_t val_in) {
+void mp_binary_set_val_array(char typecode, void *p, int index, mp_obj_t val_in) {
     machine_int_t val = 0;
     if (MP_OBJ_IS_INT(val_in)) {
         val = mp_obj_int_get(val_in);
diff --git a/py/objarray.c b/py/objarray.c
@@ -40,7 +40,7 @@ STATIC void array_print(void (*print)(void *env, const char *fmt, ...), void *en
                 if (i > 0) {
                     print(env, ", ");
                 }
-                mp_obj_print_helper(print, env, mp_binary_get_val(o->typecode, o->items, i), PRINT_REPR);
+                mp_obj_print_helper(print, env, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
             }
             print(env, "]");
         }
@@ -67,7 +67,7 @@ STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {
         if (len == 0) {
             array_append(array, item);
         } else {
-            mp_binary_set_val(typecode, array->items, i++, item);
+            mp_binary_set_val_array(typecode, array->items, i++, item);
         }
     }
 
@@ -118,7 +118,7 @@ STATIC mp_obj_t array_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
         case MP_BINARY_OP_SUBSCR:
         {
             uint index = mp_get_index(o->base.type, o->len, rhs, false);
-            return mp_binary_get_val(o->typecode, o->items, index);
+            return mp_binary_get_val_array(o->typecode, o->items, index);
         }
 
         default:
@@ -136,7 +136,7 @@ STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
         self->free = 8;
         self->items = m_realloc(self->items,  item_sz * self->len, item_sz * (self->len + self->free));
     }
-    mp_binary_set_val(self->typecode, self->items, self->len++, arg);
+    mp_binary_set_val_array(self->typecode, self->items, self->len++, arg);
     self->free--;
     return mp_const_none; // return None, as per CPython
 }
@@ -149,7 +149,7 @@ STATIC bool array_store_item(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
     }
     mp_obj_array_t *o = self_in;
     uint index = mp_get_index(o->base.type, o->len, index_in, false);
-    mp_binary_set_val(o->typecode, o->items, index, value);
+    mp_binary_set_val_array(o->typecode, o->items, index, value);
     return true;
 }
 
@@ -235,7 +235,7 @@ typedef struct _mp_obj_array_it_t {
 STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
     mp_obj_array_it_t *self = self_in;
     if (self->cur < self->array->len) {
-        return mp_binary_get_val(self->array->typecode, self->array->items, self->cur++);
+        return mp_binary_get_val_array(self->array->typecode, self->array->items, self->cur++);
     } else {
         return MP_OBJ_NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ int mp_binary_get_size(char typecode) {`
`39`	`39`	`return -1;`
`40`	`40`	`}`
`41`	`41`
`42`		`-mp_obj_t mp_binary_get_val(char typecode, void *p, int index) {`
	`42`	`+mp_obj_t mp_binary_get_val_array(char typecode, void *p, int index) {`
`43`	`43`	`machine_int_t val = 0;`
`44`	`44`	`switch (typecode) {`
`45`	`45`	`case 'b':`
`@@ -121,7 +121,7 @@ mp_obj_t mp_binary_get_val_unaligned(char typecode, byte **ptr) {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`-void mp_binary_set_val(char typecode, void *p, int index, mp_obj_t val_in) {`
	`124`	`+void mp_binary_set_val_array(char typecode, void *p, int index, mp_obj_t val_in) {`
`125`	`125`	`machine_int_t val = 0;`
`126`	`126`	`if (MP_OBJ_IS_INT(val_in)) {`
`127`	`127`	`val = mp_obj_int_get(val_in);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ STATIC void array_print(void (print)(void env, const char fmt, ...), void en`
`40`	`40`	`if (i > 0) {`
`41`	`41`	`print(env, ", ");`
`42`	`42`	`}`
`43`		`- mp_obj_print_helper(print, env, mp_binary_get_val(o->typecode, o->items, i), PRINT_REPR);`
	`43`	`+ mp_obj_print_helper(print, env, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);`
`44`	`44`	`}`
`45`	`45`	`print(env, "]");`
`46`	`46`	`}`
`@@ -67,7 +67,7 @@ STATIC mp_obj_t array_construct(char typecode, mp_obj_t initializer) {`
`67`	`67`	`if (len == 0) {`
`68`	`68`	`array_append(array, item);`
`69`	`69`	`} else {`
`70`		`- mp_binary_set_val(typecode, array->items, i++, item);`
	`70`	`+ mp_binary_set_val_array(typecode, array->items, i++, item);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`@@ -118,7 +118,7 @@ STATIC mp_obj_t array_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {`
`118`	`118`	`case MP_BINARY_OP_SUBSCR:`
`119`	`119`	`{`
`120`	`120`	`uint index = mp_get_index(o->base.type, o->len, rhs, false);`
`121`		`- return mp_binary_get_val(o->typecode, o->items, index);`
	`121`	`+ return mp_binary_get_val_array(o->typecode, o->items, index);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`default:`
`@@ -136,7 +136,7 @@ STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {`
`136`	`136`	`self->free = 8;`
`137`	`137`	`self->items = m_realloc(self->items, item_sz * self->len, item_sz * (self->len + self->free));`
`138`	`138`	`}`
`139`		`- mp_binary_set_val(self->typecode, self->items, self->len++, arg);`
	`139`	`+ mp_binary_set_val_array(self->typecode, self->items, self->len++, arg);`
`140`	`140`	`self->free--;`
`141`	`141`	`return mp_const_none; // return None, as per CPython`
`142`	`142`	`}`
`@@ -149,7 +149,7 @@ STATIC bool array_store_item(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value`
`149`	`149`	`}`
`150`	`150`	`mp_obj_array_t *o = self_in;`
`151`	`151`	`uint index = mp_get_index(o->base.type, o->len, index_in, false);`
`152`		`- mp_binary_set_val(o->typecode, o->items, index, value);`
	`152`	`+ mp_binary_set_val_array(o->typecode, o->items, index, value);`
`153`	`153`	`return true;`
`154`	`154`	`}`
`155`	`155`
`@@ -235,7 +235,7 @@ typedef struct _mp_obj_array_it_t {`
`235`	`235`	`STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {`
`236`	`236`	`mp_obj_array_it_t *self = self_in;`
`237`	`237`	`if (self->cur < self->array->len) {`
`238`		`- return mp_binary_get_val(self->array->typecode, self->array->items, self->cur++);`
	`238`	`+ return mp_binary_get_val_array(self->array->typecode, self->array->items, self->cur++);`
`239`	`239`	`} else {`
`240`	`240`	`return MP_OBJ_NULL;`
`241`	`241`	`}`