commit 39dc1454788d1c6fb06c79871c7cd6e12aeb50a0
author Damien George <damien.p.george@gmail.com> Fri Oct 03 19:52:22 2014 +0100
committer Damien George <damien.p.george@gmail.com> Fri Oct 03 19:52:22 2014 +0100
tree 12cb09a1c24b932ca7bbf715a662e78c838e1bf9
parent 3eaa0c383317f05b678422f88546ecf21ea4f9bb

py: Change [u]int to mp_[u]int_t in qstr.[ch], and some other places.

This should pretty much resolve issue #50.

py/qstr.c

diff --git a/py/qstr.c b/py/qstr.c
index 27f1377..f841f1d 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -55,7 +55,7 @@
 #define Q_GET_DATA(q)   ((q) + 4)
 
 // this must match the equivalent function in makeqstrdata.py
-mp_uint_t qstr_compute_hash(const byte *data, uint len) {
+mp_uint_t qstr_compute_hash(const byte *data, mp_uint_t len) {
     // djb2 algorithm; see http://www.cse.yorku.ca/~oz/hash.html
     mp_uint_t hash = 5381;
     for (const byte *top = data + len; data < top; data++) {
@@ -71,9 +71,9 @@
 
 typedef struct _qstr_pool_t {
     struct _qstr_pool_t *prev;
-    uint total_prev_len;
-    uint alloc;
-    uint len;
+    mp_uint_t total_prev_len;
+    mp_uint_t alloc;
+    mp_uint_t len;
     const byte *qstrs[];
 } qstr_pool_t;
 
@@ -130,7 +130,7 @@
     return last_pool->total_prev_len + last_pool->len - 1;
 }
 
-qstr qstr_find_strn(const char *str, uint str_len) {
+qstr qstr_find_strn(const char *str, mp_uint_t str_len) {
     // work out hash of str
     mp_uint_t str_hash = qstr_compute_hash((const byte*)str, str_len);
 
@@ -151,7 +151,7 @@
     return qstr_from_strn(str, strlen(str));
 }
 
-qstr qstr_from_strn(const char *str, uint len) {
+qstr qstr_from_strn(const char *str, mp_uint_t len) {
     qstr q = qstr_find_strn(str, len);
     if (q == 0) {
         mp_uint_t hash = qstr_compute_hash((const byte*)str, len);
@@ -167,7 +167,7 @@
     return q;
 }
 
-byte *qstr_build_start(uint len, byte **q_ptr) {
+byte *qstr_build_start(mp_uint_t len, byte **q_ptr) {
     assert(len <= 65535);
     *q_ptr = m_new(byte, 4 + len + 1);
     (*q_ptr)[2] = len;
@@ -194,7 +194,7 @@
     return Q_GET_HASH(find_qstr(q));
 }
 
-uint qstr_len(qstr q) {
+mp_uint_t qstr_len(qstr q) {
     const byte *qd = find_qstr(q);
     return Q_GET_LENGTH(qd);
 }
@@ -205,13 +205,13 @@
     return (const char*)Q_GET_DATA(qd);
 }
 
-const byte *qstr_data(qstr q, uint *len) {
+const byte *qstr_data(qstr q, mp_uint_t *len) {
     const byte *qd = find_qstr(q);
     *len = Q_GET_LENGTH(qd);
     return Q_GET_DATA(qd);
 }
 
-void qstr_pool_info(uint *n_pool, uint *n_qstr, uint *n_str_data_bytes, uint *n_total_bytes) {
+void qstr_pool_info(mp_uint_t *n_pool, mp_uint_t *n_qstr, mp_uint_t *n_str_data_bytes, mp_uint_t *n_total_bytes) {
     *n_pool = 0;
     *n_qstr = 0;
     *n_str_data_bytes = 0;