p67319205
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

bug fix

This commit is contained in:
Valk Richard Li 2020-05-27 06:35:03 -07:00 committed by GitHub
parent f2ff979d72
commit d8d4ac6afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
version2.0/nasal_misc.h
View File

@ -33,18 +33,18 @@ inline bool check_oct_string(std::string str,int len)
inline bool check_dec_string(std::string str,int len) inline bool check_dec_string(std::string str,int len)
{ {
int dot_cnt=0; int dot_cnt=0;
if(str[0]=='.') return false;
if(str[0]=='0' && ('0'<=str[1] && str[1]<='9')) return false;
int i=0; int i=0;
for(;i<len;++i) for(;i<len;++i)
{ {
if(str[i]=='.') if(str[i]=='.')
{ {
if(i==len-1) return false; if(i==len-1 || str[i+1]=='e' || str[i+1]=='E') return false;
++dot_cnt; ++dot_cnt;
} }
else if(str[i]=='e' || str[i]=='E') else if(str[i]=='e' || str[i]=='E') break;
break; else if(str[i]<'0' || str[i]>'9' ) return false;
else if(str[i]<'0' || str[i]>'9')
return false;
} }
if(str[i]=='e' || str[i]=='E') if(str[i]=='e' || str[i]=='E')
{ {
@ -59,8 +59,7 @@ inline bool check_dec_string(std::string str,int len)
if(str[i]<'0' || str[i]>'9') if(str[i]<'0' || str[i]>'9')
return false; return false;
} }
if(dot_cnt>1 || str[0]=='.' || (!dot_cnt && str[0]=='0')) if(dot_cnt>1) return false;
return false;
return true; return true;
} }
@ -92,10 +91,9 @@ bool check_numerable_string(std::string str)
trans_string_to_number: trans_string_to_number:
convert string to number convert string to number
*/ */
inline double hex_to_double(std::string str) inline double hex_to_double(std::string str,int len)
{ {
double ret=0; double ret=0;
int len=str.length();
double num_pow=1; double num_pow=1;
for(int i=len-1;i>1;--i) for(int i=len-1;i>1;--i)
{ {
@ -109,10 +107,9 @@ inline double hex_to_double(std::string str)
} }
return ret; return ret;
} }
inline double oct_to_double(std::string str) inline double oct_to_double(std::string str,int len)
{ {
double ret=0; double ret=0;
int len=str.length();
double num_pow=1; double num_pow=1;
for(int i=len-1;i>1;--i) for(int i=len-1;i>1;--i)
{ {
@ -121,10 +118,9 @@ inline double oct_to_double(std::string str)
} }
return ret; return ret;
} }
inline double dec_to_double(std::string str) inline double dec_to_double(std::string str,int len)
{ {
double ret=0; double ret=0;
int len=str.length();
int i=0; int i=0;
for(;i<len;++i) for(;i<len;++i)
{ {
@ -152,12 +148,10 @@ inline double dec_to_double(std::string str)
{ {
++i; ++i;
bool is_negative=str[i]=='-'; bool is_negative=(str[i]=='-');
if(is_negative) if(is_negative) ++i;
++i;
double num_pow=0; double num_pow=0;
for(;i<len;++i) for(;i<len;++i) num_pow=num_pow*10+(str[i]-'0');
num_pow=num_pow*10+(str[i]-'0');
num_pow=std::pow(10,is_negative?-num_pow:num_pow); num_pow=std::pow(10,is_negative?-num_pow:num_pow);
ret*=num_pow; ret*=num_pow;
} }
@ -166,27 +160,27 @@ inline double dec_to_double(std::string str)
double trans_string_to_number(std::string str) double trans_string_to_number(std::string str)
{ {
bool is_negative=false; bool is_negative=false;
int len=str.length();
double ret_num=0; double ret_num=0;
if(!str.length()) if(!len) return 0;
return 0; if(str[0]=='-' && len>1)
if(str[0]=='-' && str.length()>1)
{ {
is_negative=true; is_negative=true;
std::string tmp=""; std::string tmp="";
for(int i=1;i<str.length();++i) for(int i=1;i<len;++i)
tmp.push_back(str[i]); tmp.push_back(str[i]);
str=tmp; str=tmp;
} }
else if(str[0]=='-' && str.length()==1) else if(str[0]=='-' && len==1)
return 0; return 0;
if(str.length()==1 && '0'<=str[0] && str[0]<='9') if(len==1 && '0'<=str[0] && str[0]<='9')
ret_num=(double)(str[0]-'0'); ret_num=(double)(str[0]-'0');
else if(str.length()>2 && str[0]=='0' && str[1]=='x') else if(len>2 && str[0]=='0' && str[1]=='x')
ret_num=hex_to_double(str); ret_num=hex_to_double(str,len);
else if(str.length()>2 && str[0]=='0' && str[1]=='o') else if(len>2 && str[0]=='0' && str[1]=='o')
ret_num=oct_to_double(str); ret_num=oct_to_double(str,len);
else if('0'<=str[0] && str[0]<='9') else if('0'<=str[0] && str[0]<='9')
ret_num=dec_to_double(str); ret_num=dec_to_double(str,len);
return is_negative?-ret_num:ret_num; return is_negative?-ret_num:ret_num;
} }
@ -200,7 +194,7 @@ std::string trans_number_to_string(double number)
if(number<0) if(number<0)
{ {
trans_num_string+='-'; trans_num_string+='-';
number*=-1; number=-number;
} }
double integer_bit=1; double integer_bit=1;
while(number>=integer_bit) while(number>=integer_bit)