QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-09-20 04:24:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #449 from SteveMcNeill/main

Browse source 
Fix $IF prioritization
This commit is contained in:
Roland Heyder 2024-02-09 16:51:48 +01:00 committed by GitHub
commit 737d3b76fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
source/qb64pe.bas
View file

@ -1610,52 +1610,8 @@ DO
IF LEN(wholeline$) THEN IF LEN(wholeline$) THEN
IF UCASE$(_TRIM$(wholeline$)) = "$NOPREFIX" THEN
qb64prefix_set_desiredState = 1
IF qb64prefix_set = 0 THEN
IF qb64prefix_set_recompileAttempts = 0 THEN
qb64prefix_set_recompileAttempts = qb64prefix_set_recompileAttempts + 1
GOTO do_recompile
END IF
END IF
END IF
wholeline$ = lineformat(wholeline$)
IF Error_Happened THEN GOTO errmes
temp$ = LTRIM$(RTRIM$(UCASE$(wholestv$))) temp$ = LTRIM$(RTRIM$(UCASE$(wholestv$)))
IF temp$ = "$COLOR:0" THEN
IF qb64prefix_set THEN
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0_noprefix.bi"
ELSE
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi"
END IF
GOTO finishedlinepp
END IF
IF temp$ = "$COLOR:32" THEN
IF qb64prefix_set THEN
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32_noprefix.bi"
ELSE
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi"
END IF
GOTO finishedlinepp
END IF
IF temp$ = "$DEBUG" THEN
vWatchDesiredState = 1
IF vWatchOn = 0 THEN
IF vWatchRecompileAttempts = 0 THEN
'this is the first time a conflict has occurred, so react immediately with a full recompilation using the desired state
vWatchRecompileAttempts = vWatchRecompileAttempts + 1
GOTO do_recompile
ELSE
'continue compilation to retrieve the final state requested and act on that as required
END IF
END IF
END IF
IF LEFT$(temp$, 4) = "$IF " THEN IF LEFT$(temp$, 4) = "$IF " THEN
IF RIGHT$(temp$, 5) <> " THEN" THEN a$ = "$IF without THEN": GOTO errmes IF RIGHT$(temp$, 5) <> " THEN" THEN a$ = "$IF without THEN": GOTO errmes
@ -1724,6 +1680,47 @@ DO
GOTO finishedlinepp 'we don't check for anything inside lines that we've marked for skipping GOTO finishedlinepp 'we don't check for anything inside lines that we've marked for skipping
END IF END IF
IF temp$ = "$COLOR:0" THEN
IF qb64prefix_set THEN
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0_noprefix.bi"
ELSE
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color0.bi"
END IF
GOTO finishedlinepp
END IF
IF temp$ = "$COLOR:32" THEN
IF qb64prefix_set THEN
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32_noprefix.bi"
ELSE
addmetainclude$ = getfilepath$(COMMAND$(0)) + "internal" + pathsep$ + "support" + pathsep$ + "color" + pathsep$ + "color32.bi"
END IF
GOTO finishedlinepp
END IF
IF temp$ = "$DEBUG" THEN
vWatchDesiredState = 1
IF vWatchOn = 0 THEN
IF vWatchRecompileAttempts = 0 THEN
'this is the first time a conflict has occurred, so react immediately with a full recompilation using the desired state
vWatchRecompileAttempts = vWatchRecompileAttempts + 1
GOTO do_recompile
ELSE
'continue compilation to retrieve the final state requested and act on that as required
END IF
END IF
END IF
IF temp$ = "$NOPREFIX" THEN
qb64prefix_set_desiredState = 1
IF qb64prefix_set = 0 THEN
IF qb64prefix_set_recompileAttempts = 0 THEN
qb64prefix_set_recompileAttempts = qb64prefix_set_recompileAttempts + 1
GOTO do_recompile
END IF
END IF
END IF
IF LEFT$(temp$, 7) = "$ERROR " THEN IF LEFT$(temp$, 7) = "$ERROR " THEN
temp$ = RemoveStringEnclosingPair(LTRIM$(MID$(temp$, 7)), METACOMMAND_STRING_ENCLOSING_PAIR) temp$ = RemoveStringEnclosingPair(LTRIM$(MID$(temp$, 7)), METACOMMAND_STRING_ENCLOSING_PAIR)
a$ = "Compilation check failed: " + temp$ a$ = "Compilation check failed: " + temp$
@ -1793,6 +1790,9 @@ DO
END SELECT END SELECT
END IF END IF
wholeline$ = lineformat(wholeline$)
IF Error_Happened THEN GOTO errmes
cwholeline$ = wholeline$ cwholeline$ = wholeline$
wholeline$ = eleucase$(wholeline$) '********REMOVE THIS LINE LATER******** wholeline$ = eleucase$(wholeline$) '********REMOVE THIS LINE LATER********