mirror of
https://github.com/QB64Official/qb64.git
synced 2024-09-12 21:14:34 +00:00
Fixes condition that wouldn't allow "null" as a var name is some cases.
Declaring a variable called "null" was ok, but passing it to a sub was not.
This commit is contained in:
parent
1da1687633
commit
a4fe64329f
2 changed files with 10 additions and 10 deletions
|
@ -4,5 +4,5 @@ DIM SHARED AutoBuildMsg AS STRING
|
||||||
Version$ = "1.1"
|
Version$ = "1.1"
|
||||||
'BuildNum format is YYYYMMDD/id, where id is a ever-increasing
|
'BuildNum format is YYYYMMDD/id, where id is a ever-increasing
|
||||||
'integer. If you make a change, update the date and increase the id!
|
'integer. If you make a change, update the date and increase the id!
|
||||||
BuildNum$ = "20171024/79"
|
BuildNum$ = "20171027/80"
|
||||||
|
|
||||||
|
|
|
@ -10093,7 +10093,7 @@ DO
|
||||||
|
|
||||||
|
|
||||||
IF targettyp = -3 THEN
|
IF targettyp = -3 THEN
|
||||||
IF separgs2(i) = "NULL" THEN a$ = "Expected array name": GOTO errmes
|
IF separgs2(i) = "N-LL" THEN a$ = "Expected array name": GOTO errmes
|
||||||
'names of numeric arrays have ( ) automatically appended (nothing else)
|
'names of numeric arrays have ( ) automatically appended (nothing else)
|
||||||
e$ = separgs2(i)
|
e$ = separgs2(i)
|
||||||
|
|
||||||
|
@ -10156,7 +10156,7 @@ DO
|
||||||
EXIT FOR
|
EXIT FOR
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF separgs2(i) = "NULL" THEN a$ = "Expected variable name/array element": GOTO errmes
|
IF separgs2(i) = "N-LL" THEN a$ = "Expected variable name/array element": GOTO errmes
|
||||||
e$ = fixoperationorder$(separgs2(i))
|
e$ = fixoperationorder$(separgs2(i))
|
||||||
IF Error_Happened THEN GOTO errmes
|
IF Error_Happened THEN GOTO errmes
|
||||||
IF convertspacing = 1 AND addlayout = 1 THEN l$ = LEFT$(l$, LEN(l$) - 1) + sp
|
IF convertspacing = 1 AND addlayout = 1 THEN l$ = LEFT$(l$, LEN(l$) - 1) + sp
|
||||||
|
@ -10191,7 +10191,7 @@ DO
|
||||||
GOTO sete
|
GOTO sete
|
||||||
END IF '-4
|
END IF '-4
|
||||||
|
|
||||||
IF separgs2(i) = "NULL" THEN
|
IF separgs2(i) = "N-LL" THEN
|
||||||
e$ = "NULL"
|
e$ = "NULL"
|
||||||
ELSE
|
ELSE
|
||||||
|
|
||||||
|
@ -20842,7 +20842,7 @@ END IF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FOR i = 1 TO lastt: separgs(i) = "null": NEXT
|
FOR i = 1 TO lastt: separgs(i) = "n-ll": NEXT
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -21032,9 +21032,9 @@ FOR x = 1 TO lastt
|
||||||
x = BranchFormatPos(Branches)
|
x = BranchFormatPos(Branches)
|
||||||
level = BranchLevel(Branches)
|
level = BranchLevel(Branches)
|
||||||
'3)Erase any content created after revert position
|
'3)Erase any content created after revert position
|
||||||
IF Expression THEN separgs(Expression) = "null"
|
IF Expression THEN separgs(Expression) = "n-ll"
|
||||||
FOR x2 = x TO lastt
|
FOR x2 = x TO lastt
|
||||||
separgs(x2) = "null"
|
separgs(x2) = "n-ll"
|
||||||
separgslayout(x2) = ""
|
separgslayout(x2) = ""
|
||||||
NEXT
|
NEXT
|
||||||
END IF 'Optional Opt ()?
|
END IF 'Optional Opt ()?
|
||||||
|
@ -21104,7 +21104,7 @@ FOR i = 1 TO lastt
|
||||||
IF DontPass(i) = 0 THEN
|
IF DontPass(i) = 0 THEN
|
||||||
|
|
||||||
IF PassRule(i) > 0 THEN
|
IF PassRule(i) > 0 THEN
|
||||||
IF separgs(i) <> "null" THEN pass& = pass& OR PassRule(i) 'build 'passed' flags
|
IF separgs(i) <> "n-ll" THEN pass& = pass& OR PassRule(i) 'build 'passed' flags
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
separgs(x) = separgs(i)
|
separgs(x) = separgs(i)
|
||||||
|
@ -21118,7 +21118,7 @@ FOR i = 1 TO lastt
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF separgs(x) = "null" THEN separgs(x) = "NULL"
|
IF separgs(x) = "n-ll" THEN separgs(x) = "N-LL"
|
||||||
x = x + 1
|
x = x + 1
|
||||||
|
|
||||||
ELSE
|
ELSE
|
||||||
|
@ -21127,7 +21127,7 @@ FOR i = 1 TO lastt
|
||||||
|
|
||||||
'for syntax such as [{HELLO}] which uses a flag instead of being passed
|
'for syntax such as [{HELLO}] which uses a flag instead of being passed
|
||||||
IF PassRule(i) > 0 THEN
|
IF PassRule(i) > 0 THEN
|
||||||
IF separgs(i) <> "null" THEN pass& = pass& OR PassRule(i) 'build 'passed' flags
|
IF separgs(i) <> "n-ll" THEN pass& = pass& OR PassRule(i) 'build 'passed' flags
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
separgslayout(i + 1) = separgslayout(i) + separgslayout(i + 1)
|
separgslayout(i + 1) = separgslayout(i) + separgslayout(i + 1)
|
||||||
|
|
Loading…
Reference in a new issue