QB64/qb64
QB64/qb64
1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-05 07:40:24 +00:00
Code Releases Wiki Activity

Fix evaluation of some boolean conditionals

Browse source 
Commit 7855219 introduced a regression which caused some IF
statements involving boolean operators and strings to
give a C++ compilation error.
This commit is contained in:
Luke Ceddia 2016-08-03 17:18:20 +10:00
parent 705b48c5c5
commit 84e542ef32
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal/c/libqb.cpp
View file

@ -12634,18 +12634,11 @@ void qbs_print(qbs* str,int32 finish_on_new_line){
}
int32 qbs_cleanup(uint32 base,int32 passvalue){
while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
return passvalue;
template <typename T> static T qbs_cleanup(uint32 base,T passvalue){
while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
return passvalue;
}
long double qbs_cleanup(uint32 base,long double passvalue){
while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
return passvalue;
}
void qbg_sub_window(float x1,float y1,float x2,float y2,int32 passed){
// &1
//(passed&2)->SCREEN

7
internal/c/qbx.cpp
View file

@ -393,8 +393,6 @@ extern void lprint_makefit(qbs *text);
extern void tab();
extern void qbs_print(qbs* str,int32 finish_on_new_line);
extern void qbs_lprint(qbs* str,int32 finish_on_new_line);
extern long double qbs_cleanup(uint32 base,long double passvalue);
extern int32 qbs_cleanup(uint32 base,int32 passvalue);
extern void qbg_sub_window(float x1,float y1,float x2,float y2,int32 passed);
extern void qbg_sub_view_print(int32 topline,int32 bottomline,int32 passed);
extern void qbg_sub_view(int32 x1,int32 y1,int32 x2,int32 y2,int32 fillcolor,int32 bordercolor,int32 passed);
@ -781,6 +779,11 @@ c=*a8;
*b8++=c;
}
}
extern ptrszint *qbs_tmp_list;
template <typename T> static T qbs_cleanup(uint32 base,T passvalue){
while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
return passvalue;
}
//CSNG
inline double func_csng_float(long double value){

2
source/global/version.bas
View file

@ -3,5 +3,5 @@ DIM SHARED BuildNum AS STRING
Version$ = "1.000"
'BuildNum format is YYYYMMDD/id, where id is a ever-increasing
'integer. If you make a change, update the date and increase the id!
BuildNum$ = "20160802/39"
BuildNum$ = "20160803/40"