Merge branch 'main' into main

QB64-Phoenix-Edition · Dec 7, 2024 · 44b8116 · 44b8116
2 parents d1ead44 + 6f7cd75
commit 44b8116
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/internal/source/data117.txt b/internal/source/data117.txt
@@ -12,23 +12,6 @@ memcpy(_FUNC_CREATEELEMENTSTRING_STRING_S->chr,oldstr3780->chr,oldstr3780->len);
 }
 qbs *_FUNC_CREATEELEMENTSTRING_STRING_ELE=NULL;
 if (!_FUNC_CREATEELEMENTSTRING_STRING_ELE)_FUNC_CREATEELEMENTSTRING_STRING_ELE=qbs_new(0,0);
-qbs *_FUNC_CREATEELEMENTSTRING_STRING_O=NULL;
-if (!_FUNC_CREATEELEMENTSTRING_STRING_O)_FUNC_CREATEELEMENTSTRING_STRING_O=qbs_new(0,0);
-int32 *_FUNC_CREATEELEMENTSTRING_LONG_P1=NULL;
-if(_FUNC_CREATEELEMENTSTRING_LONG_P1==NULL){
-_FUNC_CREATEELEMENTSTRING_LONG_P1=(int32*)mem_static_malloc(4);
-*_FUNC_CREATEELEMENTSTRING_LONG_P1=0;
-}
-int32 *_FUNC_CREATEELEMENTSTRING_LONG_C2=NULL;
-if(_FUNC_CREATEELEMENTSTRING_LONG_C2==NULL){
-_FUNC_CREATEELEMENTSTRING_LONG_C2=(int32*)mem_static_malloc(4);
-*_FUNC_CREATEELEMENTSTRING_LONG_C2=0;
-}
-int32 *_FUNC_CREATEELEMENTSTRING_LONG_I=NULL;
-if(_FUNC_CREATEELEMENTSTRING_LONG_I==NULL){
-_FUNC_CREATEELEMENTSTRING_LONG_I=(int32*)mem_static_malloc(4);
-*_FUNC_CREATEELEMENTSTRING_LONG_I=0;
-}
 byte_element_struct *byte_element_3781=NULL;
 if (!byte_element_3781){
 if ((mem_static_pointer+=12)<mem_static_limit) byte_element_3781=(byte_element_struct*)(mem_static_pointer-12); else byte_element_3781=(byte_element_struct*)mem_static_malloc(12);

diff --git a/internal/source/free117.txt b/internal/source/free117.txt
@@ -3,4 +3,3 @@ if(oldstr3780->fixed)qbs_set(oldstr3780,_FUNC_CREATEELEMENTSTRING_STRING_S);
 qbs_free(_FUNC_CREATEELEMENTSTRING_STRING_S);
 }
 qbs_free(_FUNC_CREATEELEMENTSTRING_STRING_ELE);
-qbs_free(_FUNC_CREATEELEMENTSTRING_STRING_O);
diff --git a/internal/source/icon.rc b/internal/source/icon.rc
@@ -5,22 +5,22 @@
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "qb64pe.manifest"
 
 1 VERSIONINFO
-FILEVERSION     3,14,1,0
-PRODUCTVERSION  3,14,1,0
+FILEVERSION     4,0,0,0
+PRODUCTVERSION  4,0,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName","QB64 Phoenix Edition\0"
             VALUE "FileDescription","QB64 IDE and Compiler\0"
-            VALUE "FileVersion","3,14,1,0\0"
+            VALUE "FileVersion","4,0,0,0\0"
             VALUE "InternalName","qb64pe.bas\0"
             VALUE "LegalCopyright","MIT\0"
             VALUE "LegalTrademarks","\0"
             VALUE "OriginalFilename","qb64pe.exe\0"
             VALUE "ProductName","QB64-PE\0"
-            VALUE "ProductVersion","3,14,1,0\0"
+            VALUE "ProductVersion","4,0,0,0\0"
             VALUE "Comments","QB64 is a modern extended BASIC programming language that retains QB4.5/QBasic compatibility and compiles native binaries for Windows, Linux and macOS.\0"
             VALUE "Web","\0"
         END

diff --git a/internal/source/main.txt b/internal/source/main.txt
@@ -7,7 +7,7 @@ if(!qbevent)break;evnt(24,1,"version.bas");}while(r);
 do{
 if(!qbevent)break;evnt(24,2,"version.bas");}while(r);
 do{
-qbs_set(__STRING_VERSION,qbs_new_txt_len("3.14.1",6));
+qbs_set(__STRING_VERSION,qbs_new_txt_len("4.0.0",5));
 qbs_cleanup(qbs_tmp_base,0);
 if(!qbevent)break;evnt(24,4,"version.bas");}while(r);
 S_4:;
@@ -161221,18 +161221,18 @@ S_47849:;
 if ((qbs_cleanup(qbs_tmp_base,qbs_equal(_FUNC_IDEVARIABLEWATCHBOX_STRING_PROPOSEDTITLE,qbs_new_txt_len("",0))))||is_error_pending()){
 if(qbevent){evnt(23895,9596,"ide_methods.bas");if(r)goto S_47849;}
 do{
-qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_add(qbs_new_txt_len("QB64 - Variable List Report: untitled",37),__STRING_TEMPFOLDERINDEXSTR),qbs_new_txt_len(".bas",4)),func_chr( 10 )));
+qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_add(qbs_new_txt_len("QB64(PE) - Variable List Report: untitled",41),__STRING_TEMPFOLDERINDEXSTR),qbs_new_txt_len(".bas",4)),func_chr( 10 )));
 qbs_cleanup(qbs_tmp_base,0);
 if(!qbevent)break;evnt(23895,9597,"ide_methods.bas");}while(r);
 }else{
 do{
-qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_add(qbs_new_txt_len("QB64 - Variable List Report: ",29),_FUNC_IDEVARIABLEWATCHBOX_STRING_PROPOSEDTITLE),qbs_new_txt_len(".bas",4)),func_chr( 10 )));
+qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_add(qbs_new_txt_len("QB64(PE) - Variable List Report: ",33),_FUNC_IDEVARIABLEWATCHBOX_STRING_PROPOSEDTITLE),qbs_new_txt_len(".bas",4)),func_chr( 10 )));
 qbs_cleanup(qbs_tmp_base,0);
 if(!qbevent)break;evnt(23895,9599,"ide_methods.bas");}while(r);
 }
 }else{
 do{
-qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_new_txt_len("QB64 - Variable List Report: ",29),__STRING_IDEPROGNAME),func_chr( 10 )));
+qbs_set(_FUNC_IDEVARIABLEWATCHBOX_STRING_TEMP,qbs_add(qbs_add(qbs_new_txt_len("QB64(PE) - Variable List Report: ",33),__STRING_IDEPROGNAME),func_chr( 10 )));
 qbs_cleanup(qbs_tmp_base,0);
 if(!qbevent)break;evnt(23895,9602,"ide_methods.bas");}while(r);
 }