mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-06-29 11:40:38 +00:00
Fix watchpoints for fixed-length strings in UDTs.
This commit is contained in:
parent
602a32d3ba
commit
765b77c9bb
|
@ -404,7 +404,7 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
|
||||||
vw_m2 = _MEM(_OFFSET(vw_buf$), vw_varSize)
|
vw_m2 = _MEM(_OFFSET(vw_buf$), vw_varSize)
|
||||||
_MEMCOPY vw_m, vw_m.OFFSET, vw_m.SIZE TO vw_m2, vw_m2.OFFSET
|
_MEMCOPY vw_m, vw_m.OFFSET, vw_m.SIZE TO vw_m2, vw_m2.OFFSET
|
||||||
|
|
||||||
IF INSTR(vw_varType$, "STRING *") > 0 AND (vw_isArray <> 0 OR vw_element > 0) THEN
|
IF INSTR(vw_varType$, "STRING *") > 0 AND (vw_isArray <> 0 OR vw_element > 0 OR vw_isUDT <> 0) THEN
|
||||||
'actual data already fetched; nothing else to do
|
'actual data already fetched; nothing else to do
|
||||||
ELSEIF INSTR(vw_varType$, "STRING") > 0 THEN
|
ELSEIF INSTR(vw_varType$, "STRING") > 0 THEN
|
||||||
IF vw_isArray <> 0 OR vw_element > 0 OR vw_isUDT <> 0 THEN
|
IF vw_isArray <> 0 OR vw_element > 0 OR vw_isUDT <> 0 THEN
|
||||||
|
|
|
@ -7312,7 +7312,11 @@ SUB DebugMode
|
||||||
IF INSTR(varType$, "STRING") = 0 THEN
|
IF INSTR(varType$, "STRING") = 0 THEN
|
||||||
GOSUB findVarSize
|
GOSUB findVarSize
|
||||||
ELSE
|
ELSE
|
||||||
varSize& = LEN(dummy%&) + LEN(dummy&)
|
IF INSTR(varType$, " * ") = 0 THEN
|
||||||
|
varSize& = LEN(dummy%&) + LEN(dummy&)
|
||||||
|
ELSE
|
||||||
|
varSize& = VAL(_TRIM$(MID$(varType$, INSTR(varType$, "STRING *") + 8)))
|
||||||
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
cmd$ = cmd$ + MKL$(tempIndex&)
|
cmd$ = cmd$ + MKL$(tempIndex&)
|
||||||
|
|
Loading…
Reference in a new issue