From 34138cead67ed8fee3a5dc82e57ae5a35ff36a31 Mon Sep 17 00:00:00 2001
From: FellippeHeitor <fellippeheitor@gmail.com>
Date: Sun, 19 Sep 2021 14:56:16 -0300
Subject: [PATCH 1/2] Fixes parsing in TYPE blocks (new AS syntax)

---
 source/qb64.bas | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/qb64.bas b/source/qb64.bas
index fbbeec00a..7909cdde7 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -2054,6 +2054,7 @@ DO
                                 IF typ = 0 THEN a$ = "Undefined type": GOTO errmes
                                 typsize = typname2typsize
 
+                                previousElement$ = lastElement$
                                 nexttypeelement:
                                 lasttypeelement = lasttypeelement + 1
                                 i2 = lasttypeelement
@@ -2074,8 +2075,14 @@ DO
                                 lastElement$ = getelement$(a$, ii)
                                 IF lastElement$ = "" THEN GOTO finishedlinepp
                                 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$
+                                IF previousElement$ <> "," THEN a$ = "Expected ,": GOTO errmes
+                                previousElement$ = lastElement$
                                 cn$ = getelement$(ca$, ii)
                                 GOTO nexttypeelement
                             END IF
@@ -8120,7 +8127,7 @@ DO
                 GOTO 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
                 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
                 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
                 GOSUB NormalDimBlock

From 42208832f5e93c04f655a4b2b79a7809c031a92a Mon Sep 17 00:00:00 2001
From: FellippeHeitor <fellippeheitor@gmail.com>
Date: Sun, 19 Sep 2021 15:25:39 -0300
Subject: [PATCH 2/2] Fixes evaluation of valid var/flag names for $LET/$IF

---
 source/qb64.bas | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/source/qb64.bas b/source/qb64.bas
index 7909cdde7..ae956902e 100644
--- a/source/qb64.bas
+++ b/source/qb64.bas
@@ -1804,17 +1804,7 @@ DO
             IF temp = 0 THEN a$ = "Invalid Syntax.  $LET <flag> = <value>": GOTO errmes
             l$ = RTRIM$(LEFT$(temp$, temp - 1)): r$ = LTRIM$(MID$(temp$, temp + 1))
             'then validate to make certain the left side looks proper
-            l1$ = ""
-            FOR i = 1 TO LEN(l$)
-                a = ASC(l$, i)
-                SELECT CASE a
-                    CASE 32 'strip out spaces
-                    CASE 46: l1$ = l1$ + CHR$(a)
-                    CASE IS < 48, IS > 90: a$ = "Invalid symbol left of equal sign (" + CHR$(a) + ")": GOTO errmes
-                    CASE ELSE: l1$ = l1$ + CHR$(a)
-                END SELECT
-            NEXT
-            l$ = l1$
+            IF validname(l$) = 0 THEN a$ = "Invalid flag name": GOTO errmes
             IF LEFT$(r$, 1) = CHR$(34) THEN r$ = LTRIM$(MID$(r$, 2))
             IF RIGHT$(r$, 1) = CHR$(34) THEN r$ = RTRIM$(LEFT$(r$, LEN(r$) - 1))
             IF LEFT$(r$, 1) = "-" THEN
@@ -1831,7 +1821,7 @@ DO
                     CASE 46 'periods are fine.
                         r1$ = r1$ + "."
                     CASE IS < 48, IS > 90
-                        a$ = "Invalid symbol right of equal sign (" + CHR$(a) + ")": GOTO errmes
+                        a$ = "Invalid value": GOTO errmes
                     CASE ELSE
                         r1$ = r1$ + CHR$(a)
                 END SELECT
@@ -25730,6 +25720,7 @@ FUNCTION EvalPreIF (text$, err$)
             NEXT
             leftside$ = RTRIM$(LEFT$(temp$, i))
             l$ = LTRIM$(RTRIM$(MID$(temp$, i + 1, LEN(l$) - i)))
+            IF validname(l$) = 0 THEN err$ = "Invalid flag name": EXIT FUNCTION
             rightstop = LEN(r$)
             FOR i = 1 TO LEN(r$)
                 IF ASC(r$, i) = 32 THEN EXIT FOR