# HG changeset patch # User michael # Date 1158483161 0 # Node ID 58483364f0211b4868d23711d548609b30d51ee2 # Parent 4d346abd723c9ccf3e4de0b4667fb2cfc8c7de4c support SI and some non SI prefixes diff -r 4d346abd723c -r 58483364f021 eval.c --- a/eval.c Sat Sep 16 22:26:09 2006 +0000 +++ b/eval.c Sun Sep 17 08:52:41 2006 +0000 @@ -64,6 +64,28 @@ return 1; } +static int8_t si_prefixes['z' - 'E' + 1]={ + ['y'-'E']= -24, + ['z'-'E']= -21, + ['a'-'E']= -18, + ['f'-'E']= -15, + ['p'-'E']= -12, + ['n'-'E']= - 9, + ['u'-'E']= - 6, + ['m'-'E']= - 3, + ['c'-'E']= - 2, + ['d'-'E']= - 1, + ['h'-'E']= 2, + ['k'-'E']= 3, + ['M'-'E']= 6, + ['G'-'E']= 9, + ['T'-'E']= 12, + ['P'-'E']= 15, + ['E'-'E']= 18, + ['Z'-'E']= 21, + ['Y'-'E']= 24, +}; + static double evalPrimary(Parser *p){ double d, d2=NAN; char *next= p->s; @@ -72,6 +94,18 @@ /* number */ d= strtod(p->s, &next); if(next != p->s){ + if(*next >= 'E' && *next <= 'z'){ + int e= si_prefixes[*next - 'E']; + if(e){ + if(next[1] == 'i'){ + d*= pow( 2, e/0.3); + next+=2; + }else{ + d*= pow(10, e); + next++; + } + } + } p->s= next; return d; }