QB64/qb64
QB64/qb64
1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-03 07:41:21 +00:00
Code Releases Wiki Activity

Fixes parsing in TYPE blocks (new AS syntax)

Browse source
This commit is contained in:
FellippeHeitor 2021-09-19 14:56:16 -03:00
parent 4d94cc56d8
commit 34138cead6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/qb64.bas
View file

@ -2054,6 +2054,7 @@ DO
IF typ = 0 THEN a$ = "Undefined type": GOTO errmes IF typ = 0 THEN a$ = "Undefined type": GOTO errmes
typsize = typname2typsize typsize = typname2typsize
previousElement$ = lastElement$
nexttypeelement: nexttypeelement:
lasttypeelement = lasttypeelement + 1 lasttypeelement = lasttypeelement + 1
i2 = lasttypeelement i2 = lasttypeelement
@ -2074,8 +2075,14 @@ DO
lastElement$ = getelement$(a$, ii) lastElement$ = getelement$(a$, ii)
IF lastElement$ = "" THEN GOTO finishedlinepp IF lastElement$ = "" THEN GOTO finishedlinepp
IF ii = n AND lastElement$ = "," THEN a$ = "Expected element-name": GOTO errmes IF ii = n AND lastElement$ = "," THEN a$ = "Expected element-name": GOTO errmes
IF lastElement$ = "," THEN GOTO getNextElement IF lastElement$ = "," THEN
IF previousElement$ = "," THEN a$ = "Expected element-name": GOTO errmes
previousElement$ = lastElement$
GOTO getNextElement
END IF
n$ = lastElement$ n$ = lastElement$
IF previousElement$ <> "," THEN a$ = "Expected ,": GOTO errmes
previousElement$ = lastElement$
cn$ = getelement$(ca$, ii) cn$ = getelement$(ca$, ii)
GOTO nexttypeelement GOTO nexttypeelement
END IF END IF
@ -8120,7 +8127,7 @@ DO
GOTO dimgottyp GOTO dimgottyp
dimgottyp: dimgottyp:
IF d$ <> "" AND d$ <> "," THEN a$ = "DIM: Expected comma!": GOTO errmes IF d$ <> "" AND d$ <> "," THEN a$ = "DIM: Expected ,": GOTO errmes
'In QBASIC, if no type info is given it can refer to an expeicit/formally defined array 'In QBASIC, if no type info is given it can refer to an expeicit/formally defined array
IF notype <> 0 AND dimoption <> 3 AND dimoption <> 1 THEN 'not DIM or STATIC which only create new content IF notype <> 0 AND dimoption <> 3 AND dimoption <> 1 THEN 'not DIM or STATIC which only create new content
@ -8674,7 +8681,7 @@ DO
GOTO errmes GOTO errmes
END IF END IF
IF d$ <> "" AND d$ <> "," THEN a$ = "DIM: Expected comma!": GOTO errmes IF d$ <> "" AND d$ <> "," THEN a$ = "DIM: Expected ,": GOTO errmes
newDimSyntax = -1 newDimSyntax = -1
GOSUB NormalDimBlock GOSUB NormalDimBlock