diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-07 21:50:22 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-07 21:50:22 +0100 |
| commit | 97543c5285b47c765e19d6ab7c08b36630e23c6a (patch) | |
| tree | fd55f309f8eaa4059dd7e4160250c22f115d2b59 /py/pfenv.h | |
| parent | 98dd6d7712acdefb9179743564ee546339da9519 (diff) | |
| parent | 23dc6d0aceba51756f01e96c099678c38b4a88f9 (diff) | |
| download | micropython-97543c5285b47c765e19d6ab7c08b36630e23c6a.tar.gz micropython-97543c5285b47c765e19d6ab7c08b36630e23c6a.zip | |
Merge pull request #447 from dhylands/str-format-mpz
Add string formatting support for longlong and mpz.
Diffstat (limited to 'py/pfenv.h')
| -rw-r--r-- | py/pfenv.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/py/pfenv.h b/py/pfenv.h index 36b452b91c..32ecc159ff 100644 --- a/py/pfenv.h +++ b/py/pfenv.h @@ -1,13 +1,14 @@ -#define PF_FLAG_LEFT_ADJUST (0x001) -#define PF_FLAG_SHOW_SIGN (0x002) -#define PF_FLAG_SPACE_SIGN (0x004) -#define PF_FLAG_NO_TRAILZ (0x008) -#define PF_FLAG_SHOW_PREFIX (0x010) -#define PF_FLAG_SHOW_COMMA (0x020) -#define PF_FLAG_PAD_AFTER_SIGN (0x040) -#define PF_FLAG_CENTER_ADJUST (0x080) -#define PF_FLAG_ADD_PERCENT (0x100) -#define PF_FLAG_PAD_NAN_INF (0x200) +#define PF_FLAG_LEFT_ADJUST (0x001) +#define PF_FLAG_SHOW_SIGN (0x002) +#define PF_FLAG_SPACE_SIGN (0x004) +#define PF_FLAG_NO_TRAILZ (0x008) +#define PF_FLAG_SHOW_PREFIX (0x010) +#define PF_FLAG_SHOW_COMMA (0x020) +#define PF_FLAG_PAD_AFTER_SIGN (0x040) +#define PF_FLAG_CENTER_ADJUST (0x080) +#define PF_FLAG_ADD_PERCENT (0x100) +#define PF_FLAG_PAD_NAN_INF (0x200) +#define PF_FLAG_SHOW_OCTAL_LETTER (0x400) typedef struct _pfenv_t { void *data; @@ -17,7 +18,7 @@ typedef struct _pfenv_t { void pfenv_vstr_add_strn(void *data, const char *str, unsigned int len); int pfenv_print_strn(const pfenv_t *pfenv, const char *str, unsigned int len, int flags, char fill, int width); -int pfenv_print_int(const pfenv_t *pfenv, machine_uint_t x, int sgn, int base, int base_char, int flags, char fill, int width); +int pfenv_print_int(const pfenv_t *pfenv, mp_obj_t x, int sgn, int base, int base_char, int flags, char fill, int width); #if MICROPY_ENABLE_FLOAT int pfenv_print_float(const pfenv_t *pfenv, mp_float_t f, char fmt, int flags, char fill, int width, int prec); #endif |