aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/atoi.c59
1 files changed, 38 insertions, 21 deletions
diff --git a/src/atoi.c b/src/atoi.c
index 5a6498b..ee462ae 100644
--- a/src/atoi.c
+++ b/src/atoi.c
@@ -19,46 +19,59 @@
#include "zexy.h"
#include <stdlib.h>
+#include <string.h>
static t_class *atoi_class;
typedef struct _atoi
{
t_object x_obj;
- int i;
+ int x_i;
+ t_outlet*x_reject;
} t_atoi;
+
static void atoi_bang(t_atoi *x)
{
- outlet_float(x->x_obj.ob_outlet, (t_float)x->i);
+ outlet_float(x->x_obj.ob_outlet, (t_float)x->x_i);
}
-static void atoi_float(t_atoi *x, t_floatarg f)
+static void atoi_float(t_atoi *x, t_float f)
{
- x->i = f;
- outlet_float(x->x_obj.ob_outlet, (t_float)x->i);
+ x->x_i = f;
+ atoi_bang(x);
+}
+static void atoi_atoi(t_atoi *x, t_symbol*s, int base) {
+ char*endptr=NULL;
+ const char*str=s->s_name;
+ long l=strtol(str, &endptr, base);
+ size_t len=strlen(str);
+ if(str+len == endptr)
+ atoi_float(x, l);
+ else
+ outlet_symbol(x->x_reject, s);
}
-static void atoi_symbol(t_atoi *x, t_symbol *s)
+
+static void atoi_symbol(t_atoi *x, t_symbol *sym)
{
+ long l=0;
int base=10;
- const char* c = s->s_name;
- if(c[0]=='0'){
+ const char* s = sym->s_name;
+ if(s[0]=='0'){
base=8;
- if (c[1]=='x')base=16;
+ if (s[1]=='x')base=16;
}
- x->i=strtol(c, 0, base);
- outlet_float(x->x_obj.ob_outlet, (t_float)x->i);
+ atoi_atoi(x, sym, base);
}
-static void atoi_list(t_atoi *x, t_symbol *s, int argc, t_atom *argv)
+static void atoi_list(t_atoi *x, t_symbol *sym, int argc, t_atom *argv)
{
int base=10;
- const char* c;
- ZEXY_USEVAR(s);
+ const char* s;
+ ZEXY_USEVAR(sym);
if (argv->a_type==A_FLOAT){
- x->i=atom_getfloat(argv);
- outlet_float(x->x_obj.ob_outlet, (t_float)x->i);
+ atoi_float(x, atom_getfloat(argv));
return;
}
-
+
if (argc>1){
base=atom_getfloat(argv+1);
if (base<2) {
@@ -66,21 +79,25 @@ static void atoi_list(t_atoi *x, t_symbol *s, int argc, t_atom *argv)
base=10;
}
}
- c=atom_getsymbol(argv)->s_name;
- x->i=strtol(c, 0, base);
- outlet_float(x->x_obj.ob_outlet, (t_float)x->i);
+ atoi_atoi(x, sym, base);
}
+static void atoi_free(t_atoi *x){
+ outlet_free(x->x_reject);
+ x->x_reject=NULL;
+}
static void *atoi_new(void)
{
t_atoi *x = (t_atoi *)pd_new(atoi_class);
outlet_new(&x->x_obj, gensym("float"));
+ x->x_reject=outlet_new(&x->x_obj, gensym("symbol"));
+ x->x_i=0;
return (x);
}
void atoi_setup(void)
{
- atoi_class = class_new(gensym("atoi"), (t_newmethod)atoi_new, 0,
+ atoi_class = class_new(gensym("atoi"), (t_newmethod)atoi_new, (t_method)atoi_free,
sizeof(t_atoi), 0, A_DEFFLOAT, 0);
class_addbang(atoi_class, (t_method)atoi_bang);