Allow 0-arg functions

Author: willisblackburn

expect_tests/functions.exp

@@ -155,7 +155,7 @@ PRINT INT(3.9),INT(-3.1),INT(-3.9)
 test {
 PRINT INT()
 } {
-ERR: SYNTAX
+ERR: ARITY?
 }
 
 test {
@@ -173,7 +173,7 @@ PRINT ABS(3.14), ABS(-3.14), ABS(0)
 test {
 PRINT ABS()
 } {
-ERR: SYNTAX
+ERR: ARITY?
 }
 
 test {
@@ -191,7 +191,7 @@ PRINT SGN(5),SGN(-5),SGN(0)
 test {
 PRINT SGN()
 } {
-ERR: SYNTAX
+ERR: ARITY?
 }
 
 test {
@@ -201,12 +201,11 @@ ERR: ARITY?
 }
 
 # FRE
-# TODO: FRE(0) returns negative value in sim65 due to 16-bit signed integer limits.
-# test {
-# PRINT FRE(0) > 0
-# } {
-# 1
-# }
+test {
+PRINT FRE()<0 OR FRE()>0
+} {
+1
+}
 
 # RND
 

expect_tests/peek_poke.exp

@@ -32,7 +32,7 @@ READY
 test {
 PRINT PEEK()
 } {
-ERR: SYNTAX
+ERR: ARITY?
 }
 
 test {
@@ -66,7 +66,7 @@ READY
 test {
 PRINT DPEEK()
 } {
-ERR: SYNTAX
+ERR: ARITY?
 }
 
 test {

expect_tests/trig.exp

@@ -10,23 +10,23 @@ spawn_basic
 test "PRINT SIN(0)\n" "0\n"
 test "PRINT SIN(1)\n" "0.841470985\n"
 
-test "PRINT SIN()\n" "ERR: SYNTAX\n"
+test "PRINT SIN()\n" "ERR: ARITY?\n"
 test "PRINT SIN(1, 2)\n" "ERR: ARITY?\n"
 
 # COS
 
 test "PRINT COS(0)\n" "1\n"
 test "PRINT COS(1)\n" "0.540301189\n"
 
-test "PRINT COS()\n" "ERR: SYNTAX\n"
+test "PRINT COS()\n" "ERR: ARITY?\n"
 test "PRINT COS(1, 2)\n" "ERR: ARITY?\n"
 
 # TAN
 
 test "PRINT TAN(0)\n" "0\n"
 test "PRINT TAN(1)\n" "1.55741094\n"
 
-test "PRINT TAN()\n" "ERR: SYNTAX\n"
+test "PRINT TAN()\n" "ERR: ARITY?\n"
 test "PRINT TAN(1, 2)\n" "ERR: ARITY?\n"
 
 # ATN
@@ -37,7 +37,7 @@ test "PRINT ATN(0.5)\n" "0.463647609\n"
 test "PRINT ATN(2)\n" "1.10714739\n"
 test "PRINT ATN(-1)\n" "-0.785398163\n"
 
-test "PRINT ATN()\n" "ERR: SYNTAX\n"
+test "PRINT ATN()\n" "ERR: ARITY?\n"
 test "PRINT ATN(1, 2)\n" "ERR: ARITY?\n"
 
 # LOG
@@ -51,15 +51,15 @@ PRINT LOG(-1)
 ERR: RANGE
 }
 
-test "PRINT LOG()\n" "ERR: SYNTAX\n"
+test "PRINT LOG()\n" "ERR: ARITY?\n"
 test "PRINT LOG(1, 2)\n" "ERR: ARITY?\n"
 
 # EXP
 
 test "PRINT EXP(0)\n" "1\n"
 test "PRINT EXP(1)\n" "2.71828182\n"
 
-test "PRINT EXP()\n" "ERR: SYNTAX\n"
+test "PRINT EXP()\n" "ERR: ARITY?\n"
 test "PRINT EXP(1, 2)\n" "ERR: ARITY?\n"
 
 # SQR
@@ -73,5 +73,5 @@ PRINT SQR(-1)
 ERR: RANGE
 }
 
-test "PRINT SQR()\n" "ERR: SYNTAX\n"
+test "PRINT SQR()\n" "ERR: ARITY?\n"
 test "PRINT SQR(1, 2)\n" "ERR: ARITY?\n"

src/expression.s

@@ -222,6 +222,9 @@ evaluate_unary_operator:
 
 evaluate_argument_list:
         pha                             ; Save expected count
+        jsr     peek_byte
+        cmp     #')'
+        beq     @done
 @loop:
         jsr     evaluate_expression
         tsx

src/functions.s

@@ -22,7 +22,7 @@ function_table:
     .word   fun_val-1
     .byte   1 | PROLOG_POP_STRING | EPILOG_PUSH_FP
     .word   fun_fre-1
-    .byte   1 | PROLOG_POP_FP | EPILOG_PUSH_INT
+    .byte   0 | EPILOG_PUSH_INT
     .word   fun_peek-1
     .byte   1 | PROLOG_POP_INT | EPILOG_PUSH_INT
     .word   fun_dpeek-1

src/parser.s

@@ -609,22 +609,18 @@ pvm_arg_2:
         ARGSEP
         JUMP pvm_expression
 
-; pvm_arg_list is list of 1-N (but not 0) expressions.
+; pvm_paren_arg_list is a list of expressions surrounded by parentheses.
 
-pvm_arg_list:
+pvm_paren_arg_list:
+        WS
+        MATCH '('
+@loop:
+        TRY @done
         CALL pvm_expression
         TRY @done
         ARGSEP
-        JUMP pvm_arg_list
+        JUMP @loop
 @done:
-        RETURN
-
-; pvm_paren_arg_list is a list of 1-N (but not 0) expressions surrounded by parentheses.
-
-pvm_paren_arg_list:
-        WS
-        MATCH '('
-        CALL pvm_arg_list
         WS
         MATCH ')'
         RETURN

src/run.s

@@ -42,11 +42,3 @@ exec_cont:
         raieq   ERR_CONT_WITHOUT_STOP
         mva     resume_line_pos, next_line_pos
         jmp     raise_ps_running
-
-; NEW statment:
-; Clears the program from memory, which also has the effect of stopping the program as if END.
-
-exec_new:
-        jsr     initialize_program
-        clc
-        rts

src/statements.s

@@ -36,7 +36,7 @@ statement_vectors:
         .word   exec_next-1
         .word   exec_stop-1
         .word   exec_cont-1
-        .word   exec_new-1
+        .word   initialize_program-1
         .word   clear_variables-1
         .word   exec_dim-1
         .word   exec_rem-1

targets/apple2/apple2_startup.s

@@ -12,8 +12,7 @@ startup:
         ldx     #$FF        
         txs                             ; Initialize the stack to $FF
         jsr     initialize_target
-        jsr     main        
-        jmp     DOSWARM                 ; Exit to resident program
+        jmp     main
 
 
 .code

targets/sim6502/sim6502_startup.s

@@ -19,7 +19,6 @@ startup:
         txs                             ; Initialize the stack to $FF
         mvax    #(__MAIN_START__ + __MAIN_SIZE__ + __STACKSIZE__), c_sp
         jsr     initialize_target
-        jsr     main        
-        jmp     exit                    ; Return 0 from sim65
+        jmp     main
 
 .code