Return after errors, move left bracket consumption down

diff --git a/src/cc65/goto.c b/src/cc65/goto.c
index 08a7033c38dc3da200810884057a82a5f002abfc..fde9df94595bf4ffc652ba2f51cd7b14f2a61703 100644 (file)
--- a/src/cc65/goto.c
+++ b/src/cc65/goto.c
@@ -87,15 +87,20 @@ void GotoStatement (void)
         if (CurTok.Tok == TOK_IDENT &&
             (arr = FindSym (CurTok.Ident))) {
             NextToken ();
         if (CurTok.Tok == TOK_IDENT &&
             (arr = FindSym (CurTok.Ident))) {
             NextToken ();

-            ConsumeLBrack ();

 
             /* Find array size */
             if (!IsTypeArray (arr->Type) || SizeOf (arr->Type) == 0 ||
 
             /* Find array size */
             if (!IsTypeArray (arr->Type) || SizeOf (arr->Type) == 0 ||

-                SizeOf (GetElementType(arr->Type)) != 2)
+                SizeOf (GetElementType(arr->Type)) != 2) {

                 Error ("Expected array");
                 Error ("Expected array");

-            if (GetElementCount (arr->Type) > 127)
+                return;
+            }
+            if (GetElementCount (arr->Type) > 127) {

                 Error ("Only arrays with <= 127 labels are supported, got %lu",
                        GetElementCount (arr->Type));
                 Error ("Only arrays with <= 127 labels are supported, got %lu",
                        GetElementCount (arr->Type));

+                return;
+            }
+
+            ConsumeLBrack ();

 
             if (CurTok.Tok == TOK_ICONST) {
                 val = CurTok.IVal;
 
             if (CurTok.Tok == TOK_ICONST) {
                 val = CurTok.IVal;