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

Shows <multiple values> at Watch list dialog for UDTs.

Browse source
This commit is contained in:
FellippeHeitor 2021-09-09 21:29:34 -03:00
parent 17a116b19d
commit 8d58dff862
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/ide/ide_methods.bas
View file

@ -7186,6 +7186,7 @@ SUB DebugMode
ELSEIF returnAction = 2 THEN ELSEIF returnAction = 2 THEN
PCOPY 3, 0: SCREEN , , 3, 0 PCOPY 3, 0: SCREEN , , 3, 0
WHILE _MOUSEINPUT: WEND WHILE _MOUSEINPUT: WEND
hidePanel = -1
GOSUB UpdateDisplay GOSUB UpdateDisplay
_CONTINUE _CONTINUE
ELSE ELSE
@ -8055,7 +8056,7 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
i = countelements(temp$) i = countelements(temp$)
IF i <> ABS(ids(usedVariableList(tempIndex&).id).arrayelements) THEN IF i <> ABS(ids(usedVariableList(tempIndex&).id).arrayelements) THEN
result = idemessagebox("Error", "Array has" + STR$(ABS(ids(usedVariableList(tempIndex&).id).arrayelements)) + " dimension(s).", "#OK") result = idemessagebox("Error", "Array has" + STR$(ABS(ids(usedVariableList(tempIndex&).id).arrayelements)) + " dimension(s).", "#OK")
temp$ = v$ temp$ = _TRIM$(v$)
GOTO setArrayRange3 GOTO setArrayRange3
END IF END IF
tempArrayIndexes$ = MKL$(i * 4) tempArrayIndexes$ = MKL$(i * 4)
@ -8399,7 +8400,7 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
i = countelements(temp$) i = countelements(temp$)
IF i <> ABS(ids(usedVariableList(varDlgList(y).index).id).arrayelements) THEN IF i <> ABS(ids(usedVariableList(varDlgList(y).index).id).arrayelements) THEN
result = idemessagebox("Error", "Array has" + STR$(ABS(ids(usedVariableList(varDlgList(y).index).id).arrayelements)) + " dimension(s).", "#OK") result = idemessagebox("Error", "Array has" + STR$(ABS(ids(usedVariableList(varDlgList(y).index).id).arrayelements)) + " dimension(s).", "#OK")
temp$ = v$ temp$ = _TRIM$(v$)
GOTO setArrayRange2 GOTO setArrayRange2
END IF END IF
usedVariableList(varDlgList(y).index).indexes = "" usedVariableList(varDlgList(y).index).indexes = ""
@ -8681,7 +8682,7 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
item$ = usedVariableList(x).name + usedVariableList(x).varType + thisScope$ item$ = usedVariableList(x).name + usedVariableList(x).varType + thisScope$
IF IdeDebugMode > 0 AND usedVariableList(x).isarray = 0 AND LEN(usedVariableList(x).elements) = 0 AND LEN(usedVariableList(x).storage) = 4 THEN IF IdeDebugMode > 0 AND usedVariableList(x).isarray = 0 AND LEN(usedVariableList(x).elements) = 0 AND LEN(usedVariableList(x).storage) = 4 THEN
'single var 'single var
item$ = item$ + vWatchReceivedData$(CVL(usedVariableList(x).storage)) item$ = item$ + StrReplace$(vWatchReceivedData$(CVL(usedVariableList(x).storage)), CHR$(0), " ")
END IF END IF
IF multiSearch(item$, searchTerm$) = 0 THEN IF multiSearch(item$, searchTerm$) = 0 THEN
_CONTINUE 'skip variable if no field matches the search _CONTINUE 'skip variable if no field matches the search
@ -8754,6 +8755,7 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
LOOP LOOP
IF LEN(usedVariableList(x).storage) THEN l$ = l$ + "}" IF LEN(usedVariableList(x).storage) THEN l$ = l$ + "}"
ELSEIF usedVariableList(x).isarray = 0 AND LEN(usedVariableList(x).elements) = 0 THEN ELSEIF usedVariableList(x).isarray = 0 AND LEN(usedVariableList(x).elements) = 0 THEN
'simple variable
IF LEN(usedVariableList(x).storage) = 4 THEN IF LEN(usedVariableList(x).storage) = 4 THEN
storageSlot& = CVL(usedVariableList(x).storage) storageSlot& = CVL(usedVariableList(x).storage)
l$ = l$ + " = " + CHR$(16) + CHR$(variableNameColor) l$ = l$ + " = " + CHR$(16) + CHR$(variableNameColor)
@ -8761,6 +8763,9 @@ FUNCTION idevariablewatchbox$(currentScope$, filter$, selectVar, returnAction)
l$ = l$ + StrReplace$(vWatchReceivedData$(storageSlot&), CHR$(0), " ") l$ = l$ + StrReplace$(vWatchReceivedData$(storageSlot&), CHR$(0), " ")
IF thisIsAString THEN l$ = l$ + CHR$(34) IF thisIsAString THEN l$ = l$ + CHR$(34)
END IF END IF
ELSE
l$ = l$ + " = " + CHR$(16) + CHR$(variableNameColor)
l$ = l$ + "<multiple values>"
END IF END IF
END IF END IF
ELSE ELSE