Split parsing of labels and starting of PROC/DATA loops.

This fixes creation of variables starting with "DATA".

Author: dmsc

src/actions.asm

@@ -463,6 +463,8 @@ xit:    rts
 
 ::laddr_search_num = cpnum + 1
 ::laddr_search_start:
+::last_label_num = *+1
+        ldx     #0
         lda     laddr_buf
         ldy     laddr_buf+1
         sty     tmp1+1
@@ -500,12 +502,10 @@ xit:    rts
 xit:    rts
 .endproc
 
-; Label definition search/create
+; Pushes the PROC/DATA loop, search, create a label and define the location
 .proc   E_LABEL_DEF
-
-        ; Search and create the label
-        jsr     E_LABEL_CREATE
-        bcs     add_laddr_list::xit     ; Label already defined
+        lda     #LT_PROC_DATA
+        jsr     push_codep
 
         ; Search in the label list
         jsr     laddr_search_start
@@ -531,7 +531,7 @@ cloop:  bmi     xit_label_err
         ; No more entries, adds our address as a "definition" (A = 128)
 nfound:
         lda     #128
-        jmp     add_laddr_list
+        bmi     add_laddr_list
 .endproc
 
 ; Label search on use
@@ -542,6 +542,7 @@ nfound:
         ; Check if we have a valid name - this exits on error!
         jsr     label_search
         bcs     xit
+        stx     last_label_num
 
         ; Check if type is compatible
         cmp     tmp3
@@ -554,7 +555,6 @@ xit:    rts
 ; label (and create it if needed), then parse arguments and at last emit the
 ; call address
 ::E_DO_EXEC:
-        ldx     #0
 
         ; Emits a label, searching the label address in the label list
 start_searching:
@@ -581,24 +581,18 @@ ret:    rts
 ; Label search and create if not exists
 .proc   E_LABEL_CREATE
         jsr     label_search
-        bcc     check_var
+        stx     last_label_num
+        ; Already defined, just store index
+        bcc     ret
 
 do_create:
         ; Create a new label
         ldx     #label_ptr - prog_ptr
         jsr     name_new
-        ldx     label_count
         inc     label_count
         clc
-set_var:
-        stx     E_DO_EXEC+1
-        rts
+ret:    rts
 
-        ; Check if label is PROC, error if not
-check_var:
-        beq     set_var
-        sec
-        rts
 .endproc
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

src/basic.syn

@@ -596,13 +596,13 @@ DATA_END:
 
 DATA_VAR: new data array name
         DATA_TYPE
-        emit { TOK_JUMP, LT_PROC_DATA } E_PUSH_LT E_LABEL_DEF "()" DATA_TYPE
+        E_LABEL_CREATE "()" emit { TOK_JUMP } E_LABEL_DEF DATA_TYPE
 
 # DLI support - builds a machine code routine and store the address to
 # display list interrupt handler:
 DLI_COMMAND: 'SET', label
         # Define a new DLI with given name
-        "Set" emit { TOK_JUMP, LT_PROC_DATA } E_PUSH_LT \
+        "Set" E_LABEL_CREATE emit { TOK_JUMP } \
               E_LABEL_DEF emit { VT_ARRAY_BYTE } E_LABEL_SET_TYPE \
               emit { 72, 138, 72, 166, COLRSH } EQUAL \
               DLI_LDA emit { 141, &WSYNC } DLI_STA DLI_CODES
@@ -711,7 +711,7 @@ PARSE_LINE_COMMAND: statement
         "PAuse" PAUSE_OPT emit TOK_PAUSE
         "INC" VAR_WORD_LVALUE_SADDR emit TOK_INC
         "DEc" VAR_WORD_LVALUE_SADDR emit TOK_DEC
-        "PRoc" emit { TOK_JUMP, LT_PROC_DATA } E_PUSH_LT E_LABEL_DEF emit LT_PROC_2 E_PUSH_LT OPT_PROC_VAR
+        "PRoc" E_LABEL_CREATE emit { TOK_JUMP } E_LABEL_DEF emit LT_PROC_2 E_PUSH_LT OPT_PROC_VAR
         "ENDProc" E_POP_PROC_2 emit TOK_RET E_POP_PROC_DATA
         EXEC_CALL E_LABEL_CREATE OPT_EXEC_PARAM emit { TOK_CALL } E_DO_EXEC
         "DAta" DATA_VAR DATA_END

src/compiler/parser.cc

@@ -577,16 +577,15 @@ bool SMB_E_NUMBER_FP(parse &s)
 
 bool SMB_E_LABEL_DEF(parse &s)
 {
+    auto l = s.push_loop(LT_PROC_DATA);
+    s.remove_last();
+    s.push_proc(l);
+
     s.debug("E_LABEL_DEF");
     auto &v = s.labels;
-    std::string name;
-    if( !s.get_ident(name) )
-        return false;
-    if( v.find(name) == v.end() )
-        v[name] = labelType();
+    auto name = s.last_label;
     if( v[name].is_defined() )
         return false;
-    s.last_label = name;
     s.current_params = 0;
     s.add_text(name);
     s.emit_label("fb_lbl_" + name);

testsuite/tests/err-vdata.bas

@@ -0,0 +1,6 @@
+' Test for error parsing variables that start with DATA
+? "Start"
+X=1234
+DATAVAR=DPEEK(&X)
+? DATAVAR
+

testsuite/tests/err-vdata.chk

@@ -0,0 +1,5 @@
+Name: Test for error parsing variables that start with DATA
+Test: run
+Output:
+Start
+1234