basic: merge eval_ast and macroexpand into EVAL

impls/basic/step2_eval.in.bas

@@ -12,28 +12,12 @@ REM READ is inlined in RE
 
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    H=E:B$=S$(Z%(A+1)):GOSUB HASHMAP_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -94,13 +78,27 @@ SUB EVAL
   REM AZ=A:B=1:GOSUB PR_STR
   REM PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    H=E:B$=S$(Z%(A+1)):GOSUB HASHMAP_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 

impls/basic/step3_env.in.bas

@@ -13,28 +13,12 @@ REM READ is inlined in RE
 
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -98,13 +82,27 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 

impls/basic/step4_if_fn_do.in.bas

@@ -14,28 +14,12 @@ REM READ is inlined in RE
 
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -101,13 +85,27 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 

impls/basic/step5_tco.in.bas

@@ -14,28 +14,12 @@ REM READ is inlined in RE
 
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -107,13 +91,27 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 

impls/basic/step6_file.in.bas

@@ -14,28 +14,12 @@ REM READ is inlined in RE
 
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -107,13 +91,27 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 

impls/basic/step7_quote.in.bas

@@ -124,31 +124,14 @@ SUB QQ_FOLDR
 QQ_FOLDR_DONE:
 END SUB
 
-
 REM EVAL_AST(A, E) -> R
 SUB EVAL_AST
+  REM A must be a list, sequence or map
+
   REM push A and E on the stack
   Q=E:GOSUB PUSH_Q
   GOSUB PUSH_A
 
-  IF ER<>-2 THEN GOTO EVAL_AST_RETURN
-
-  GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
-
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -220,13 +203,27 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  IF T=5 THEN GOTO EVAL_SYMBOL
+  IF T=6 THEN GOTO APPLY_LIST
+  IF T=7 OR T=8 THEN GOTO EVAL_MAP_VECTOR
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN