Merge pull request #202 from QB64Team/master-hotfix

Master hotfix

Author: FellippeHeitor

CHANGELOG.md

@@ -45,6 +45,11 @@
 - Fixes issue with `Put #` and variable-length strings in UDTs (`Binary` files).
 - Fixes issue with recursive functions without parameters.
 
+### Fixed in 2.0.1
+- Fix "Duplicate definition" error with Static arrays in Subs/Functions with active On Error trapping.
+- Fix internal UDT arrays not resetting when a new file is loaded.
+- Fix issue preventing `$Debug` from working in Windows versions prior to Windows 10.
+
 ### Windows
 - Allows `$Console:Only` programs to return `_WindowHandle`.
 - Saving a file to the root of a drive would display double backslashes in the Recent Files list.

internal/c/libqb.cpp

@@ -12671,19 +12671,22 @@ int32 func__blink(){
 }
 
 int64 func__handle(){
-    //#ifdef QB64_GUI
-        #ifdef QB64_WINDOWS
-            #ifdef DEPENDENCY_CONSOLE_ONLY
+    #ifdef QB64_WINDOWS
+        #ifdef DEPENDENCY_CONSOLE_ONLY
+            if (!window_handle) {
                 char pszConsoleTitle[1024];
                 GetConsoleTitle(pszConsoleTitle,1024);
                 window_handle = FindWindow(NULL, pszConsoleTitle);
-            #else
-                if (!window_exists) return 0;
-            #endif
-            while (!window_handle){Sleep(100);}
+            }
             return (ptrszint)window_handle;
         #endif
-    //#endif
+
+        if (!screen_hide){
+            while (!window_exists){Sleep(100);}
+            while (!window_handle){Sleep(100);}
+            return (ptrszint)window_handle;
+        }
+    #endif
 
     return 0;
 }

internal/support/vwatch/vwatch.bm

@@ -24,19 +24,14 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
         SUB unlockvWatchHandle
         SUB set_qbs_size (target AS _OFFSET, BYVAL length&)
         SUB call_setbits (BYVAL bsize AS _UNSIGNED LONG, array AS _OFFSET, BYVAL index AS _OFFSET, BYVAL value AS _INTEGER64)
+        SUB set_foreground_window (BYVAL hwnd AS _OFFSET)
         FUNCTION stop_program_state&
         FUNCTION check_lbound%& (array AS _OFFSET, BYVAL index AS LONG, BYVAL num_indexes AS LONG)
         FUNCTION check_ubound%& (array AS _OFFSET, BYVAL index AS LONG, BYVAL num_indexes AS LONG)
         FUNCTION call_getubits~&& (BYVAL bsize AS _UNSIGNED LONG, array AS _OFFSET, BYVAL index AS _OFFSET)
         FUNCTION call_getbits&& (BYVAL bsize AS _UNSIGNED LONG, array AS _OFFSET, BYVAL index AS _OFFSET)
     END DECLARE
 
-    $IF WIN THEN
-        DECLARE CUSTOMTYPE LIBRARY
-            FUNCTION vwSetForegroundWindow& ALIAS "SetForegroundWindow" (BYVAL hWnd AS _OFFSET)
-        END DECLARE
-    $END IF
-
     IF vw_bypass THEN EXIT SUB
 
     vwatch_goto = 0
@@ -130,9 +125,7 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
         GOSUB SendCallStack
         vw_cmd$ = "error:" + MKL$(vw_lastLine)
         GOSUB SendCommand
-        $IF WIN THEN
-            vw_i = vwSetForegroundWindow&(vw_ideHwnd)
-        $END IF
+        set_foreground_window vw_ideHwnd
         EXIT SUB
     ELSEIF vwatch_linenumber = -2 THEN
         'report a new sub/function has been "entered"
@@ -228,9 +221,7 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
     vw_cmd$ = "current sub:" + LEFT$(vwatch_stack(vwatch_sublevel), INSTR(vwatch_stack(vwatch_sublevel), ",") - 1)
     GOSUB SendCommand
 
-    $IF WIN THEN
-        vw_i = vwSetForegroundWindow&(vw_ideHwnd)
-    $END IF
+    set_foreground_window vw_ideHwnd
 
     DO 'main loop
         IF stop_program_state& THEN vw_bypass = -1: EXIT DO

source/global/version.bas

@@ -2,7 +2,7 @@ DIM SHARED Version AS STRING
 DIM SHARED DevChannel AS STRING
 DIM SHARED AutoBuildMsg AS STRING
 
-Version$ = "2.0"
+Version$ = "2.0.1"
 DevChannel$ = "Stable Release"
 IF _FILEEXISTS("internal/version.txt") THEN
     versionfile = FREEFILE

source/icon.rc

@@ -1,22 +1,22 @@
 0 ICON "qb64.ico"
 
 1 VERSIONINFO
-FILEVERSION     2,0,0,0
-PRODUCTVERSION  2,0,0,0
+FILEVERSION     2,0,1,0
+PRODUCTVERSION  2,0,1,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName","QB64\0"
             VALUE "FileDescription","QB64 Compiler\0"
-            VALUE "FileVersion","2.0\0"
+            VALUE "FileVersion","2.0.1\0"
             VALUE "InternalName","qb64.bas\0"
             VALUE "LegalCopyright","LGPL\0"
             VALUE "LegalTrademarks","\0"
             VALUE "OriginalFilename","qb64.exe\0"
             VALUE "ProductName","QB64\0"
-            VALUE "ProductVersion","2.0\0"
+            VALUE "ProductVersion","2.0.1\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"
         END
     END

source/qb64.bas

@@ -640,22 +640,7 @@ REDIM SHARED constdefined(constmax) AS LONG
 'UDT
 'names
 DIM SHARED lasttype AS LONG
-REDIM SHARED udtxname(1000) AS STRING * 256
-REDIM SHARED udtxcname(1000) AS STRING * 256
-REDIM SHARED udtxsize(1000) AS LONG
-REDIM SHARED udtxbytealign(1000) AS INTEGER 'first element MUST be on a byte alignment & size is a multiple of 8
-REDIM SHARED udtxnext(1000) AS LONG
-REDIM SHARED udtxvariable(1000) AS INTEGER 'true if the udt contains variable length elements
-'elements
-REDIM SHARED lasttypeelement AS LONG
-REDIM SHARED udtename(1000) AS STRING * 256
-REDIM SHARED udtecname(1000) AS STRING * 256
-REDIM SHARED udtebytealign(1000) AS INTEGER
-REDIM SHARED udtesize(1000) AS LONG
-REDIM SHARED udtetype(1000) AS LONG
-REDIM SHARED udtetypesize(1000) AS LONG
-REDIM SHARED udtearrayelements(1000) AS LONG
-REDIM SHARED udtenext(1000) AS LONG
+DIM SHARED lasttypeelement AS LONG
 
 TYPE idstruct
 
@@ -1427,6 +1412,21 @@ addmetainclude$ = ""
 nextrunlineindex = 1
 lasttype = 0
 lasttypeelement = 0
+REDIM SHARED udtxname(1000) AS STRING * 256
+REDIM SHARED udtxcname(1000) AS STRING * 256
+REDIM SHARED udtxsize(1000) AS LONG
+REDIM SHARED udtxbytealign(1000) AS INTEGER 'first element MUST be on a byte alignment & size is a multiple of 8
+REDIM SHARED udtxnext(1000) AS LONG
+REDIM SHARED udtxvariable(1000) AS INTEGER 'true if the udt contains variable length elements
+'elements
+REDIM SHARED udtename(1000) AS STRING * 256
+REDIM SHARED udtecname(1000) AS STRING * 256
+REDIM SHARED udtebytealign(1000) AS INTEGER
+REDIM SHARED udtesize(1000) AS LONG
+REDIM SHARED udtetype(1000) AS LONG
+REDIM SHARED udtetypesize(1000) AS LONG
+REDIM SHARED udtearrayelements(1000) AS LONG
+REDIM SHARED udtenext(1000) AS LONG
 definingtype = 0
 definingtypeerror = 0
 constlast = -1
@@ -13923,7 +13923,7 @@ FUNCTION allocarray (n2$, elements$, elementsize, udt)
             'REDIM (not DIM) must be used to redefine an array
             IF redimoption = 0 THEN
                 f12$ = f12$ + CRLF + "if (" + n$ + "[2]&1){" 'array is defined
-                f12$ = f12$ + CRLF + "error(10);" 'cannot redefine an array without using REDIM!
+                f12$ = f12$ + CRLF + "if (!error_occurred) error(10);" 'cannot redefine an array without using REDIM!
                 f12$ = f12$ + CRLF + "}else{"
             ELSE
                 '--------ERASE EXISTING ARRAY IF NECESSARY--------