djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Rename strtonum to mp_strtonum.

Browse Source 
strtonum clashes with BSD function of same name, and our version is
different so warrants a unique name.  Addresses Issue #305.
This commit is contained in:
Damien George 2014-02-22 17:49:15 +00:00
parent 0379b55ab0
commit 2613ffde43
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/misc.h
View File

@ -60,8 +60,6 @@ bool unichar_isxdigit(unichar c);
#define streq(s1, s2) (strcmp((s1), (s2)) == 0) #define streq(s1, s2) (strcmp((s1), (s2)) == 0)
*/ */
long strtonum(const char *restrict s, int base);
/** variable string *********************************************/ /** variable string *********************************************/
typedef struct _vstr_t { typedef struct _vstr_t {

5
py/objint.c
View File

@ -5,6 +5,7 @@
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "strtonum.h"
#include "mpconfig.h" #include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
@ -24,7 +25,7 @@ STATIC mp_obj_t int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_
// a string, parse it // a string, parse it
uint l; uint l;
const char *s = mp_obj_str_get_data(args[0], &l); const char *s = mp_obj_str_get_data(args[0], &l);
return MP_OBJ_NEW_SMALL_INT(strtonum(s, 0)); return MP_OBJ_NEW_SMALL_INT(mp_strtonum(s, 0));
} else { } else {
return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0])); return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0]));
} }
@ -35,7 +36,7 @@ STATIC mp_obj_t int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_
// TODO proper error checking of argument types // TODO proper error checking of argument types
uint l; uint l;
const char *s = mp_obj_str_get_data(args[0], &l); const char *s = mp_obj_str_get_data(args[0], &l);
return MP_OBJ_NEW_SMALL_INT(strtonum(s, mp_obj_get_int(args[1]))); return MP_OBJ_NEW_SMALL_INT(mp_strtonum(s, mp_obj_get_int(args[1])));
} }
default: default:

5
py/strtonum.c
View File

@ -5,12 +5,13 @@
#include <stdlib.h> #include <stdlib.h>
#include "misc.h" #include "misc.h"
#include "strtonum.h"
#include "mpconfig.h" #include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "nlr.h" #include "nlr.h"
#include "obj.h" #include "obj.h"
long strtonum(const char *restrict s, int base) { long mp_strtonum(const char *restrict s, int base) {
int c, neg = 0; int c, neg = 0;
const char *p = s; const char *p = s;
char *num; char *num;
@ -89,7 +90,7 @@ value_error:
#else /* defined(UNIX) */ #else /* defined(UNIX) */
long strtonum(const char *restrict s, int base) { long mp_strtonum(const char *restrict s, int base) {
// TODO port strtol to stm // TODO port strtol to stm
return 0; return 0;
} }

1
py/strtonum.h Normal file
View File

@ -0,0 +1 @@
long mp_strtonum(const char *restrict s, int base);