From fe075d0d06430114a830beefef08584de543ebff Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Date: Fri, 15 Nov 2024 21:29:04 +0100
Subject: [PATCH] basic: cosmetic no-op changes preparing the merge of
 macroexpand into EVAL

---
 impls/basic/step2_eval.in.bas     | 18 +++++++++++++++---
 impls/basic/step3_env.in.bas      | 18 +++++++++++++++---
 impls/basic/step4_if_fn_do.in.bas |  4 +++-
 impls/basic/step5_tco.in.bas      |  4 +++-
 impls/basic/step6_file.in.bas     |  4 +++-
 impls/basic/step7_quote.in.bas    |  4 +++-
 impls/basic/step8_macros.in.bas   |  3 ++-
 impls/basic/step9_try.in.bas      |  3 ++-
 impls/basic/stepA_mal.in.bas      |  3 ++-
 9 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/impls/basic/step2_eval.in.bas b/impls/basic/step2_eval.in.bas
index f3501d1bfa..b7fa00ec51 100755
--- a/impls/basic/step2_eval.in.bas
+++ b/impls/basic/step2_eval.in.bas
@@ -102,6 +102,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -116,11 +117,22 @@ SUB EVAL
       F=Z%(R+2)
 
       GOSUB TYPE_F
-      IF T<>9 THEN R=-1:ER=-1:E$="apply of non-function":GOTO EVAL_INVOKE_DONE
-      GOSUB DO_FUNCTION
+
+      REM ON .. GOTO here reduces the diff with later steps.
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION
+
+      REM if error, pop and return f/args for release by caller
+      R=-1:ER=-1:E$="apply of non-function":GOTO EVAL_INVOKE_DONE
+
+      EVAL_DO_FUNCTION:
+        REM regular function
+
+        GOSUB DO_FUNCTION
+
       EVAL_INVOKE_DONE:
+        REM pop and release f/args
       AY=W:GOSUB RELEASE
-      GOTO EVAL_RETURN
 
   EVAL_RETURN:
     REM AZ=R: B=1: GOSUB PR_STR
diff --git a/impls/basic/step3_env.in.bas b/impls/basic/step3_env.in.bas
index ee6193dc91..2e48973071 100755
--- a/impls/basic/step3_env.in.bas
+++ b/impls/basic/step3_env.in.bas
@@ -106,6 +106,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -182,11 +183,22 @@ SUB EVAL
       F=Z%(R+2)
 
       GOSUB TYPE_F
-      IF T<>9 THEN R=-1:ER=-1:E$="apply of non-function":GOTO EVAL_INVOKE_DONE
-      GOSUB DO_FUNCTION
+
+      REM ON .. GOTO here reduces the diff with later steps.
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION
+
+      REM if error, pop and return f/args for release by caller
+      R=-1:ER=-1:E$="apply of non-function":GOTO EVAL_INVOKE_DONE
+
+      EVAL_DO_FUNCTION:
+        REM regular function
+
+        GOSUB DO_FUNCTION
+
       EVAL_INVOKE_DONE:
+        REM pop and release f/args
       AY=W:GOSUB RELEASE
-      GOTO EVAL_RETURN
 
   EVAL_RETURN:
     REM AZ=R: B=1: GOSUB PR_STR
diff --git a/impls/basic/step4_if_fn_do.in.bas b/impls/basic/step4_if_fn_do.in.bas
index eb1e229493..7f257c1e73 100755
--- a/impls/basic/step4_if_fn_do.in.bas
+++ b/impls/basic/step4_if_fn_do.in.bas
@@ -109,6 +109,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -228,7 +229,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/step5_tco.in.bas b/impls/basic/step5_tco.in.bas
index ad7410c763..23adb7c25e 100755
--- a/impls/basic/step5_tco.in.bas
+++ b/impls/basic/step5_tco.in.bas
@@ -115,6 +115,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -252,7 +253,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/step6_file.in.bas b/impls/basic/step6_file.in.bas
index 800cec84e5..084b0b1f96 100755
--- a/impls/basic/step6_file.in.bas
+++ b/impls/basic/step6_file.in.bas
@@ -115,6 +115,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -252,7 +253,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/step7_quote.in.bas b/impls/basic/step7_quote.in.bas
index b1f60fce9e..cfd968a656 100755
--- a/impls/basic/step7_quote.in.bas
+++ b/impls/basic/step7_quote.in.bas
@@ -226,6 +226,7 @@ SUB EVAL
     GOTO EVAL_RETURN
 
   APPLY_LIST:
+
     GOSUB EMPTY_Q
     IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN
 
@@ -380,7 +381,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/step8_macros.in.bas b/impls/basic/step8_macros.in.bas
index 7c26b3bd13..45917c9074 100755
--- a/impls/basic/step8_macros.in.bas
+++ b/impls/basic/step8_macros.in.bas
@@ -438,7 +438,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/step9_try.in.bas b/impls/basic/step9_try.in.bas
index b7e3dc3169..895ef40a02 100755
--- a/impls/basic/step9_try.in.bas
+++ b/impls/basic/step9_try.in.bas
@@ -471,7 +471,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R
diff --git a/impls/basic/stepA_mal.in.bas b/impls/basic/stepA_mal.in.bas
index 8c877635ac..375fc4d445 100755
--- a/impls/basic/stepA_mal.in.bas
+++ b/impls/basic/stepA_mal.in.bas
@@ -471,7 +471,8 @@ SUB EVAL
       GOSUB TYPE_F
       IF T=14 THEN F=Z%(F+1):GOSUB TYPE_F
 
-      ON T-8 GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION,EVAL_DO_MAL_FUNCTION
+      T=T-8
+      IF 0<T THEN ON T GOTO EVAL_DO_FUNCTION,EVAL_DO_MAL_FUNCTION
 
       REM if error, pop and return f/args for release by caller
       GOSUB POP_R