First try at allowing procedure parameters.

Author: dmsc

Makefile

@@ -183,6 +183,7 @@ COMMON_AS_SRC=\
     src/interp/peekb.asm\
     src/interp/pmgraphics.asm\
     src/interp/poke.asm\
+    src/interp/pop.asm\
     src/interp/position.asm\
     src/interp/print_str.asm\
     src/interp/print_tab.asm\

src/actions.asm

@@ -26,7 +26,7 @@
         .export         E_CONST_STRING
         .export         E_VAR_CREATE, E_VAR_WORD, E_VAR_SEARCH
         .export         E_VAR_SET_TYPE, E_LABEL_SET_TYPE
-        .export         E_LABEL, E_LABEL_DEF
+        .export         E_LABEL, E_LABEL_DEF, E_LABEL_EXEC, E_DO_EXEC
         .export         E_PUSH_VAR, E_POP_VAR
         .exportzp       VT_WORD, VT_STRING, VT_FLOAT, VT_UNDEF
         .exportzp       VT_ARRAY_WORD, VT_ARRAY_BYTE, VT_ARRAY_STRING, VT_ARRAY_FLOAT
@@ -610,6 +610,34 @@ nfound: lda     #0
 ret:    rts
 .endproc
 
+; Label search only
+.proc   E_LABEL_EXEC
+        ldx     #label_buf - prog_ptr
+        ldy     label_count
+        jsr     list_search
+        bcs     do_create
+        beq     set_var
+        sec
+        rts
+
+do_create:
+        ; Create a new label
+        ldx     #label_ptr - prog_ptr
+        jsr     name_new
+        ldx     label_count
+        inc     label_count
+set_var:
+        stx     E_POP_VAR+1
+        clc
+        rts
+.endproc
+
+.proc   E_DO_EXEC
+        ldx     E_POP_VAR+1
+        jsr     label_create::no_create
+        jmp     E_LABEL::cloop
+.endproc
+
 ; PUSH/POP variables
 .proc   E_PUSH_VAR
         jsr     get_last_tok    ; Get variable ID from last token

src/basic.syn

@@ -27,7 +27,7 @@ TOKENS {
  TOK_SHL8, TOK_0, TOK_1
  # PUSH plus composed PUSH ops
  TOK_PUSH, TOK_PUSH_VAR_LOAD
- TOK_PUSH_NUM, TOK_PUSH_BYTE, TOK_PUSH_0, TOK_PUSH_1
+ TOK_PUSH_NUM, TOK_PUSH_BYTE, TOK_PUSH_0, TOK_PUSH_1, TOK_POP
  # Numeric operators
  TOK_NEG, TOK_ABS, TOK_SGN, TOK_ADD, TOK_SUB, TOK_MUL, TOK_DIV, TOK_MOD
  # Operators on VAR
@@ -90,7 +90,7 @@ EXTERN {
  E_CONST_STRING
  E_VAR_CREATE, E_VAR_SET_TYPE, E_LABEL_SET_TYPE
  E_VAR_WORD, E_VAR_SEARCH
- E_LABEL, E_LABEL_DEF
+ E_LABEL, E_LABEL_DEF, E_LABEL_EXEC, E_DO_EXEC
  E_PUSH_VAR, E_POP_VAR
 
 #@if EXTENDED
@@ -629,6 +629,16 @@ PAUSE_OPT:
         EXPR
         E_EOL emit { TOK_0 }
 
+# Optional expression for EXEC
+OPT_EXPR:
+        EXPR emit { TOK_PUSH }
+        pass
+
+# Optional variable in PROC
+OPT_PROC_VAR:
+        VAR_WORD_SAVE emit { TOK_POP, TOK_VAR_STORE } E_POP_VAR
+        pass
+
 # Parse a line
 PARSE_LINE_COMMAND: statement
         "." E_REM
@@ -678,9 +688,9 @@ 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
+        "PRoc" emit { TOK_JUMP, LT_PROC_DATA } E_PUSH_LT 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" emit { TOK_CALL, VT_UNDEF } E_LABEL
+        "EXEc" E_LABEL_EXEC OPT_EXPR emit { TOK_CALL } E_DO_EXEC
         "DAta" DATA_VAR DATA_END
         "END" emit TOK_END
 #@if FASTBASIC_FP

src/compiler/parser.cc

@@ -616,6 +616,35 @@ bool SMB_E_LABEL(parse &s)
     return true;
 }
 
+static std::string v_last_name;
+bool SMB_E_LABEL_EXEC(parse &s)
+{
+    s.debug("E_LABEL_EXEC");
+    // Get type
+    auto &v = s.labels;
+    std::string name;
+    if( !s.get_ident(name) )
+        return false;
+    if ( v.find(name) == v.end() )
+    {
+        v[name] = VT_UNDEF;
+    }
+    // Check type
+    if( v[name] != VT_UNDEF )
+        return false;
+    // Store variable name
+    s.add_text(name);
+    v_last_name = name;
+    return true;
+}
+
+bool SMB_E_DO_EXEC(parse &s)
+{
+    s.debug("E_DO_EXEC");
+    s.emit_word("fb_lbl_" + v_last_name);
+    return true;
+}
+
 bool SMB_E_LABEL_SET_TYPE(parse &s)
 {
     s.debug("E_LABEL_SET_TYPE");

src/interp/pop.asm

@@ -0,0 +1,44 @@
+;
+; FastBasic - Fast basic interpreter for the Atari 8-bit computers
+; Copyright (C) 2017-2021 Daniel Serpell
+;
+; This program is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 2 of the License, or
+; (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License along
+; with this program.  If not, see <http://www.gnu.org/licenses/>
+;
+; In addition to the permissions in the GNU General Public License, the
+; authors give you unlimited permission to link the compiled version of
+; this file into combinations with other programs, and to distribute those
+; combinations without any restriction coming from the use of this file.
+; (The General Public License restrictions do apply in other respects; for
+; example, they cover modification of the file, and distribution when not
+; linked into a combine executable.)
+
+
+; Stack pop
+; ---------
+
+        .importzp       next_ins_incsp
+        .import stack_l, stack_h
+
+        .segment        "RUNTIME"
+
+.proc   EXE_POP ; pop AX from stack
+        lda     stack_l, y
+        ldx     stack_h, y
+        jmp     next_ins_incsp
+.endproc
+
+        .include "../deftok.inc"
+        deftoken "POP"
+
+; vi:syntax=asm_ca65

testsuite/tests/testproc.bas

@@ -20,3 +20,9 @@ endproc
 
 exec before
 
+exec param 123
+
+' Proc with a parameter
+proc param x
+   ? "X="; x
+endproc

testsuite/tests/testproc.chk

@@ -13,3 +13,4 @@ Loop: 8
 Loop: 9
 Loop: 10
 -- test --
+X=123