QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-05 08:50:24 +00:00
Code Issues Releases Wiki Activity

Take LEN correctly

Browse source
This commit is contained in:
Luke Ceddia 2018-12-23 17:40:48 +11:00
parent fffd0f842c
commit 8f9837c803
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/qb64.bas
View file

@ -17100,7 +17100,7 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG)
' print "-4: evaluated as ["+e$+"]":sleep 1 ' print "-4: evaluated as ["+e$+"]":sleep 1
IF (sourcetyp AND ISUDT) THEN 'User Defined Type -> byte_element(offset,bytes) IF (sourcetyp AND ISUDT) THEN 'User Defined Type -> byte_element(offset,bytes)
IF udtxvariable(sourcetyp AND 511) THEN Give_Error "UDT must have fixed size here": EXIT FUNCTION IF udtxvariable(sourcetyp AND 511) THEN Give_Error "UDT must have fixed size": EXIT FUNCTION
idnumber = VAL(e$) idnumber = VAL(e$)
i = INSTR(e$, sp3): e$ = RIGHT$(e$, LEN(e$) - i) i = INSTR(e$, sp3): e$ = RIGHT$(e$, LEN(e$) - i)
u = VAL(e$) 'closest parent u = VAL(e$) 'closest parent
@ -17119,13 +17119,19 @@ FUNCTION evaluatetotyp$ (a2$, targettyp AS LONG)
GOTO method2usealludt GOTO method2usealludt
END IF END IF
END IF END IF
dst$ = "(((char*)" + scope$ + n$ + ")+(" + o$ + "))"
'determine size of element 'determine size of element
IF E = 0 THEN 'no specific element, use size of entire type IF E = 0 THEN 'no specific element, use size of entire type
bytes$ = str2(udtxsize(u) \ 8) bytes$ = str2(udtxsize(u) \ 8)
ELSE 'a specific element ELSE 'a specific element
if (udtetype(E) AND ISSTRING) > 0 AND (udtetype(E) AND ISFIXEDLENGTH) = 0 AND (targettyp = -5) then
evaluatetotyp$ = "(*(qbs**)" + dst$ + ")->len"
exit function
end if
bytes$ = str2(udtesize(E) \ 8) bytes$ = str2(udtesize(E) \ 8)
END IF END IF
dst$ = "(((char*)" + scope$ + n$ + ")+(" + o$ + "))"
evaluatetotyp$ = "byte_element((uint64)" + dst$ + "," + bytes$ + "," + NewByteElement$ + ")" evaluatetotyp$ = "byte_element((uint64)" + dst$ + "," + bytes$ + "," + NewByteElement$ + ")"
IF targettyp = -5 THEN evaluatetotyp$ = bytes$ IF targettyp = -5 THEN evaluatetotyp$ = bytes$
IF targettyp = -6 THEN evaluatetotyp$ = dst$ IF targettyp = -6 THEN evaluatetotyp$ = dst$