mirror of
https://github.com/QB64Official/qb64.git
synced 2024-07-18 09:25:15 +00:00
Final adjustments to CONST parsing + $NOPREFIX
This commit is contained in:
parent
f63358698b
commit
18974d56e4
|
@ -23931,7 +23931,16 @@ SUB PreParse (e$)
|
||||||
IF l AND l > 2 THEN 'Don't check the starting bracket; there's nothing before it.
|
IF l AND l > 2 THEN 'Don't check the starting bracket; there's nothing before it.
|
||||||
good = 0
|
good = 0
|
||||||
FOR i = 1 TO UBOUND(OName)
|
FOR i = 1 TO UBOUND(OName)
|
||||||
IF MID$(t$, l - LEN(OName(i)), LEN(OName(i))) = OName(i) AND PL(i) > 1 AND PL(i) <= 250 THEN good = -1: EXIT FOR 'We found an operator after our ), and it's not a CONST (like PI)
|
IF MID$(t$, l - LEN(OName(i)), LEN(OName(i))) = OName(i) AND PL(i) > 1 AND PL(i) <= 250 THEN
|
||||||
|
good = -1: EXIT FOR 'We found an operator after our ), and it's not a CONST (like PI)
|
||||||
|
ELSE
|
||||||
|
IF LEFT$(OName(i), 1) = "_" AND qb64prefix_set = 1 THEN
|
||||||
|
'try without prefix
|
||||||
|
IF MID$(t$, l - (LEN(OName(i)) - 1), LEN(OName(i)) - 1) = MID$(OName(i), 2) AND PL(i) > 1 AND PL(i) <= 250 THEN
|
||||||
|
good = -1: EXIT FOR
|
||||||
|
END IF
|
||||||
|
END IF
|
||||||
|
END IF
|
||||||
NEXT
|
NEXT
|
||||||
IF NOT good THEN e$ = "ERROR - Improper operations before (.": EXIT SUB
|
IF NOT good THEN e$ = "ERROR - Improper operations before (.": EXIT SUB
|
||||||
l = l + 1
|
l = l + 1
|
||||||
|
@ -23945,7 +23954,16 @@ SUB PreParse (e$)
|
||||||
IF l AND l < LEN(t$) THEN
|
IF l AND l < LEN(t$) THEN
|
||||||
good = 0
|
good = 0
|
||||||
FOR i = 1 TO UBOUND(OName)
|
FOR i = 1 TO UBOUND(OName)
|
||||||
IF MID$(t$, l + 1, LEN(OName(i))) = OName(i) AND PL(i) > 1 AND PL(i) <= 250 THEN good = -1: EXIT FOR 'We found an operator after our ), and it's not a CONST (like PI)
|
IF MID$(t$, l + 1, LEN(OName(i))) = OName(i) AND PL(i) > 1 AND PL(i) <= 250 THEN
|
||||||
|
good = -1: EXIT FOR 'We found an operator after our ), and it's not a CONST (like PI)
|
||||||
|
ELSE
|
||||||
|
IF LEFT$(OName(i), 1) = "_" AND qb64prefix_set = 1 THEN
|
||||||
|
'try without prefix
|
||||||
|
IF MID$(t$, l + 1, LEN(OName(i)) - 1) = MID$(OName(i), 2) AND PL(i) > 1 AND PL(i) <= 250 THEN
|
||||||
|
good = -1: EXIT FOR
|
||||||
|
END IF
|
||||||
|
END IF
|
||||||
|
END IF
|
||||||
NEXT
|
NEXT
|
||||||
IF MID$(t$, l + 1, 1) = ")" THEN good = -1
|
IF MID$(t$, l + 1, 1) = ")" THEN good = -1
|
||||||
IF NOT good THEN e$ = "ERROR - Improper operations after ).": EXIT SUB
|
IF NOT good THEN e$ = "ERROR - Improper operations after ).": EXIT SUB
|
||||||
|
|
Loading…
Reference in a new issue