basic: remove the macroexpand special form

asarhaddon · Nov 13, 2024 · d3d6674 · d3d6674
1 parent b7d5200
commit d3d6674
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 33 deletions.
diff --git a/impls/basic/step8_macros.in.bas b/impls/basic/step8_macros.in.bas
@@ -279,7 +279,6 @@ SUB EVAL
     IF A$="quote" THEN GOTO EVAL_QUOTE
     IF A$="quasiquote" THEN GOTO EVAL_QUASIQUOTE
     IF A$="defmacro!" THEN GOTO EVAL_DEFMACRO
-    IF A$="macroexpand" THEN GOTO EVAL_MACROEXPAND
     IF A$="do" THEN GOTO EVAL_DO
     IF A$="if" THEN GOTO EVAL_IF
     IF A$="fn*" THEN GOTO EVAL_FN
@@ -396,16 +395,6 @@ SUB EVAL
       K=A1:C=R:GOSUB ENV_SET
       GOTO EVAL_RETURN
 
-    EVAL_MACROEXPAND:
-      REM PRINT "macroexpand"
-      R=Z%(Z%(A+1)+2)
-      A=R:CALL MACROEXPAND
-      R=A
-
-      REM since we are returning it unevaluated, inc the ref cnt
-      GOSUB INC_REF_R
-      GOTO EVAL_RETURN
-
     EVAL_IF:
       GOSUB EVAL_GET_A1: REM set A1
       GOSUB PUSH_A: REM push/save A

diff --git a/impls/basic/step9_try.in.bas b/impls/basic/step9_try.in.bas
@@ -279,7 +279,6 @@ SUB EVAL
     IF A$="quote" THEN GOTO EVAL_QUOTE
     IF A$="quasiquote" THEN GOTO EVAL_QUASIQUOTE
     IF A$="defmacro!" THEN GOTO EVAL_DEFMACRO
-    IF A$="macroexpand" THEN GOTO EVAL_MACROEXPAND
     IF A$="try*" THEN GOTO EVAL_TRY
     IF A$="do" THEN GOTO EVAL_DO
     IF A$="if" THEN GOTO EVAL_IF
@@ -397,16 +396,6 @@ SUB EVAL
       K=A1:C=R:GOSUB ENV_SET
       GOTO EVAL_RETURN
 
-    EVAL_MACROEXPAND:
-      REM PRINT "macroexpand"
-      R=Z%(Z%(A+1)+2)
-      A=R:CALL MACROEXPAND
-      R=A
-
-      REM since we are returning it unevaluated, inc the ref cnt
-      GOSUB INC_REF_R
-      GOTO EVAL_RETURN
-
     EVAL_TRY:
       REM PRINT "try*"
       GOSUB EVAL_GET_A1: REM set A1

diff --git a/impls/basic/stepA_mal.in.bas b/impls/basic/stepA_mal.in.bas
@@ -279,7 +279,6 @@ SUB EVAL
     IF A$="quote" THEN GOTO EVAL_QUOTE
     IF A$="quasiquote" THEN GOTO EVAL_QUASIQUOTE
     IF A$="defmacro!" THEN GOTO EVAL_DEFMACRO
-    IF A$="macroexpand" THEN GOTO EVAL_MACROEXPAND
     IF A$="try*" THEN GOTO EVAL_TRY
     IF A$="do" THEN GOTO EVAL_DO
     IF A$="if" THEN GOTO EVAL_IF
@@ -397,16 +396,6 @@ SUB EVAL
       K=A1:C=R:GOSUB ENV_SET
       GOTO EVAL_RETURN
 
-    EVAL_MACROEXPAND:
-      REM PRINT "macroexpand"
-      R=Z%(Z%(A+1)+2)
-      A=R:CALL MACROEXPAND
-      R=A
-
-      REM since we are returning it unevaluated, inc the ref cnt
-      GOSUB INC_REF_R
-      GOTO EVAL_RETURN
-
     EVAL_TRY:
       REM PRINT "try*"
       GOSUB EVAL_GET_A1: REM set A1