mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-07-01 15:00:38 +00:00
Allows $NOPREFIX to be placed anywhere.
Also allows it to play nice with $DEBUG.
This commit is contained in:
parent
7fc3a0752b
commit
ad3ae35810
|
@ -6118,7 +6118,7 @@ SUB DebugMode
|
||||||
GOSUB SendCommand
|
GOSUB SendCommand
|
||||||
|
|
||||||
clearStatusWindow 1
|
clearStatusWindow 1
|
||||||
setStatusMessage 1, "$DEBUG MODE: Set focus to the IDE to control execution", 15
|
setStatusMessage 1, "$DEBUG: Set focus to the IDE to control execution", 15
|
||||||
|
|
||||||
noFocusMessage = -1
|
noFocusMessage = -1
|
||||||
|
|
||||||
|
@ -6126,13 +6126,13 @@ SUB DebugMode
|
||||||
IF _WINDOWHASFOCUS THEN
|
IF _WINDOWHASFOCUS THEN
|
||||||
IF noFocusMessage THEN
|
IF noFocusMessage THEN
|
||||||
clearStatusWindow 1
|
clearStatusWindow 1
|
||||||
setStatusMessage 1, "$DEBUG <F5=Run> <F7=Step Over> <F8=Step> <F9=Toggle Breakpoint> <ESC=Abort>", 15
|
setStatusMessage 1, "$DEBUG: <F5=Run> <F7=Step Over> <F8=Step> <F9=Toggle Breakpoint> <ESC=Abort>", 15
|
||||||
noFocusMessage = 0
|
noFocusMessage = 0
|
||||||
END IF
|
END IF
|
||||||
ELSE
|
ELSE
|
||||||
IF noFocusMessage = 0 THEN
|
IF noFocusMessage = 0 THEN
|
||||||
clearStatusWindow 1
|
clearStatusWindow 1
|
||||||
setStatusMessage 1, "$DEBUG MODE: Set focus to the IDE to control execution", 15
|
setStatusMessage 1, "$DEBUG: Set focus to the IDE to control execution", 15
|
||||||
noFocusMessage = -1
|
noFocusMessage = -1
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
|
@ -27,6 +27,7 @@ REDIM SHARED PP_TypeMod(0) AS STRING, PP_ConvertedMod(0) AS STRING 'Prepass Name
|
||||||
Set_OrderOfOperations
|
Set_OrderOfOperations
|
||||||
|
|
||||||
DIM SHARED vWatchOn, vWatchRecompileAttempts, vWatchDesiredState
|
DIM SHARED vWatchOn, vWatchRecompileAttempts, vWatchDesiredState
|
||||||
|
DIM SHARED qb64prefix_set_recompileAttempts, qb64prefix_set_desiredState
|
||||||
|
|
||||||
REDIM EveryCaseSet(100), SelectCaseCounter AS _UNSIGNED LONG
|
REDIM EveryCaseSet(100), SelectCaseCounter AS _UNSIGNED LONG
|
||||||
REDIM SelectCaseHasCaseBlock(100)
|
REDIM SelectCaseHasCaseBlock(100)
|
||||||
|
@ -1204,7 +1205,13 @@ SubNameLabels = sp 'QB64 will perform a repass to resolve sub names used as labe
|
||||||
vWatchDesiredState = 0
|
vWatchDesiredState = 0
|
||||||
vWatchRecompileAttempts = 0
|
vWatchRecompileAttempts = 0
|
||||||
|
|
||||||
|
qb64prefix_set_desiredState = 0
|
||||||
|
qb64prefix_set_recompileAttempts = 0
|
||||||
|
|
||||||
recompile:
|
recompile:
|
||||||
|
qb64prefix_set = qb64prefix_set_desiredState
|
||||||
|
qb64prefix$ = "_"
|
||||||
|
|
||||||
vWatchOn = vWatchDesiredState
|
vWatchOn = vWatchDesiredState
|
||||||
|
|
||||||
lastLineReturn = 0
|
lastLineReturn = 0
|
||||||
|
@ -1441,8 +1448,7 @@ REDIM SHARED warningIncLines(1000) AS LONG
|
||||||
REDIM SHARED warningIncFiles(1000) AS STRING
|
REDIM SHARED warningIncFiles(1000) AS STRING
|
||||||
maxLineNumber = 0
|
maxLineNumber = 0
|
||||||
uniquenumbern = 0
|
uniquenumbern = 0
|
||||||
qb64prefix_set = 0
|
|
||||||
qb64prefix$ = "_"
|
|
||||||
|
|
||||||
''create a type for storing memory blocks
|
''create a type for storing memory blocks
|
||||||
''UDT
|
''UDT
|
||||||
|
@ -1573,6 +1579,24 @@ END IF
|
||||||
|
|
||||||
reginternal
|
reginternal
|
||||||
|
|
||||||
|
IF qb64prefix_set THEN
|
||||||
|
qb64prefix$ = ""
|
||||||
|
|
||||||
|
're-add internal keywords without the "_" prefix
|
||||||
|
reginternal
|
||||||
|
|
||||||
|
f = HASHFLAG_TYPE + HASHFLAG_RESERVED
|
||||||
|
HashAdd "UNSIGNED", f, 0
|
||||||
|
HashAdd "BIT", f, 0
|
||||||
|
HashAdd "BYTE", f, 0
|
||||||
|
HashAdd "INTEGER64", f, 0
|
||||||
|
HashAdd "OFFSET", f, 0
|
||||||
|
HashAdd "FLOAT", f, 0
|
||||||
|
|
||||||
|
f = HASHFLAG_RESERVED + HASHFLAG_CUSTOMSYNTAX
|
||||||
|
HashAdd "EXPLICIT", f, 0
|
||||||
|
END IF
|
||||||
|
|
||||||
OPEN tmpdir$ + "global.txt" FOR OUTPUT AS #18
|
OPEN tmpdir$ + "global.txt" FOR OUTPUT AS #18
|
||||||
|
|
||||||
IF iderecompile THEN
|
IF iderecompile THEN
|
||||||
|
@ -1638,26 +1662,13 @@ DO
|
||||||
IF LEN(wholeline$) THEN
|
IF LEN(wholeline$) THEN
|
||||||
|
|
||||||
IF UCASE$(_TRIM$(wholeline$)) = "$NOPREFIX" THEN
|
IF UCASE$(_TRIM$(wholeline$)) = "$NOPREFIX" THEN
|
||||||
IF firstLine = 0 THEN a$ = "$NOPREFIX must come before any other statements": GOTO errmes
|
qb64prefix_set_desiredState = 1
|
||||||
|
IF qb64prefix_set = 0 THEN
|
||||||
qb64prefix$ = ""
|
IF qb64prefix_set_recompileAttempts = 0 THEN
|
||||||
qb64prefix_set = 1
|
qb64prefix_set_recompileAttempts = qb64prefix_set_recompileAttempts + 1
|
||||||
|
GOTO do_recompile
|
||||||
're-add internal keywords without the "_" prefix
|
END IF
|
||||||
reginternal
|
END IF
|
||||||
|
|
||||||
f = HASHFLAG_TYPE + HASHFLAG_RESERVED
|
|
||||||
HashAdd "UNSIGNED", f, 0
|
|
||||||
HashAdd "BIT", f, 0
|
|
||||||
HashAdd "BYTE", f, 0
|
|
||||||
HashAdd "INTEGER64", f, 0
|
|
||||||
HashAdd "OFFSET", f, 0
|
|
||||||
HashAdd "FLOAT", f, 0
|
|
||||||
|
|
||||||
f = HASHFLAG_RESERVED + HASHFLAG_CUSTOMSYNTAX
|
|
||||||
HashAdd "EXPLICIT", f, 0
|
|
||||||
|
|
||||||
GOTO finishedlinepp
|
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
wholeline$ = lineformat(wholeline$)
|
wholeline$ = lineformat(wholeline$)
|
||||||
|
|
Loading…
Reference in a new issue