1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-07 18:00:24 +00:00

Stores full type name with variable list.

This commit is contained in:
FellippeHeitor 2021-07-24 16:16:18 -03:00
parent ed59d6411e
commit 8f2e969711

View file

@ -115,6 +115,7 @@ TYPE usedVarList
includedLine AS LONG includedLine AS LONG
includedFile AS STRING includedFile AS STRING
scope AS LONG scope AS LONG
varType AS STRING
subfunc AS STRING subfunc AS STRING
localIndex AS LONG localIndex AS LONG
cname AS STRING cname AS STRING
@ -14248,6 +14249,7 @@ SUB vWatchVariable (this$, action AS _BYTE)
totalSharedVariablesFromMainModule = totalSharedVariablesFromMainModule + 1 totalSharedVariablesFromMainModule = totalSharedVariablesFromMainModule + 1
mainModuleSharedVariablesList$ = mainModuleSharedVariablesList$ + MKL$(LEN(this$)) + this$ mainModuleSharedVariablesList$ = mainModuleSharedVariablesList$ + MKL$(LEN(this$)) + this$
END IF END IF
manageVariableList id.cn, this$, totalMainModuleVariables - 1, 0
ELSE ELSE
totalLocalVariables = totalLocalVariables + 1 totalLocalVariables = totalLocalVariables + 1
localVariablesList$ = localVariablesList$ + "vwatch_local_vars[" + str2$(totalLocalVariables - 1) + "] = &" + this$ + ";" + CRLF localVariablesList$ = localVariablesList$ + "vwatch_local_vars[" + str2$(totalLocalVariables - 1) + "] = &" + this$ + ";" + CRLF
@ -25911,8 +25913,8 @@ END SUB
SUB manageVariableList (__name$, __cname$, localIndex AS LONG, action AS _BYTE) SUB manageVariableList (__name$, __cname$, localIndex AS LONG, action AS _BYTE)
DIM findItem AS LONG, cname$, i AS LONG, name$ DIM findItem AS LONG, cname$, i AS LONG, name$
name$ = __name$ name$ = RTRIM$(__name$)
cname$ = __cname$ cname$ = RTRIM$(__cname$)
IF LEN(cname$) = 0 THEN EXIT SUB IF LEN(cname$) = 0 THEN EXIT SUB
@ -25946,10 +25948,14 @@ SUB manageVariableList (__name$, __cname$, localIndex AS LONG, action AS _BYTE)
END IF END IF
usedVariableList(i).scope = subfuncn usedVariableList(i).scope = subfuncn
usedVariableList(i).subfunc = subfunc usedVariableList(i).subfunc = subfunc
usedVariableList(i).varType = id2fulltypename$
usedVariableList(i).cname = cname$ usedVariableList(i).cname = cname$
usedVariableList(i).localIndex = localIndex usedVariableList(i).localIndex = localIndex
IF LEN(RTRIM$(id.mayhave)) = 0 AND LEN(RTRIM$(id.musthave)) > 0 THEN usedVariableList(i).name = name$ + RTRIM$(id.musthave) IF LEN(RTRIM$(id.musthave)) > 0 THEN
IF LEN(RTRIM$(id.musthave)) = 0 AND LEN(RTRIM$(id.mayhave)) > 0 THEN usedVariableList(i).name = name$ + RTRIM$(id.mayhave) usedVariableList(i).name = name$ + RTRIM$(id.musthave)
ELSE
usedVariableList(i).name = name$
END IF
totalVariablesCreated = totalVariablesCreated + 1 totalVariablesCreated = totalVariablesCreated + 1
END IF END IF
CASE ELSE 'find and mark as used CASE ELSE 'find and mark as used