Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

basic: merge eval_ast into EVAL #707

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

basic: merge eval_ast into EVAL #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cef22b
basic: separate evaluation of the function and its arguments
asarhaddon Nov 16, 2024
8ff18f5
basic: merge eval_ast and macroexpand into EVAL
asarhaddon Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions impls/basic/step2_eval.in.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,31 +102,46 @@ SUB EVAL
GOSUB EMPTY_Q
IF R THEN R=A:GOSUB INC_REF_R:GOTO EVAL_RETURN

A0=Z%(A+2)

EVAL_INVOKE:
CALL EVAL_AST
W=R

REM if error, return f/args for release by caller
REM evaluate A0
GOSUB PUSH_A
A=A0:CALL EVAL
GOSUB POP_A
IF ER<>-2 THEN GOTO EVAL_RETURN

AR=Z%(R+1): REM rest
F=Z%(R+2)
REM set F, push it in the stack for release after call
GOSUB PUSH_R
F=R

GOSUB TYPE_F
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
REM if error, pop and return f for release by caller
GOSUB POP_R
ER=-1:E$="apply of non-function":GOTO EVAL_RETURN

EVAL_DO_FUNCTION:
REM regular function

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

GOSUB DO_FUNCTION

EVAL_INVOKE_DONE:
REM pop and release f/args
AY=W:GOSUB RELEASE
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE

EVAL_RETURN:
REM AZ=R: B=1: GOSUB PR_STR
Expand Down
31 changes: 22 additions & 9 deletions impls/basic/step3_env.in.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,30 +172,43 @@ SUB EVAL
A=A2:CALL EVAL: REM eval A2 using let_env
GOTO EVAL_RETURN
EVAL_INVOKE:
CALL EVAL_AST
W=R

REM if error, return f/args for release by caller
REM evaluate A0
GOSUB PUSH_A
A=A0:CALL EVAL
GOSUB POP_A
IF ER<>-2 THEN GOTO EVAL_RETURN

AR=Z%(R+1): REM rest
F=Z%(R+2)
REM set F, push it in the stack for release after call
GOSUB PUSH_R
F=R

GOSUB TYPE_F
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
REM if error, pop and return f for release by caller
GOSUB POP_R
ER=-1:E$="apply of non-function":GOTO EVAL_RETURN

EVAL_DO_FUNCTION:
REM regular function

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

GOSUB DO_FUNCTION

EVAL_INVOKE_DONE:
REM pop and release f/args
AY=W:GOSUB RELEASE
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE

EVAL_RETURN:
REM AZ=R: B=1: GOSUB PR_STR
Expand Down
38 changes: 31 additions & 7 deletions impls/basic/step4_if_fn_do.in.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,38 +213,61 @@ SUB EVAL
GOTO EVAL_RETURN

EVAL_INVOKE:
CALL EVAL_AST

REM if error, return f/args for release by caller
REM evaluate A0
GOSUB PUSH_A
A=A0:CALL EVAL
GOSUB POP_A
IF ER<>-2 THEN GOTO EVAL_RETURN

REM push f/args for release after call
REM set F, push it in the stack for release after call
GOSUB PUSH_R

AR=Z%(R+1): REM rest
F=Z%(R+2)
F=R

GOSUB TYPE_F
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
REM if error, pop and return f for release by caller
GOSUB POP_R
ER=-1:E$="apply of non-function":GOTO EVAL_RETURN

REM Duplicate evaluation of args in order to prepare step8.

EVAL_DO_FUNCTION:
REM regular function

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

IF Z%(F+1)<65 THEN GOSUB DO_FUNCTION:GOTO EVAL_DO_FUNCTION_SKIP
REM for recur functions (apply, map, swap!), use GOTO
IF Z%(F+1)>64 THEN CALL DO_TCO_FUNCTION
EVAL_DO_FUNCTION_SKIP:

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE
GOTO EVAL_RETURN

EVAL_DO_MAL_FUNCTION:

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

Q=E:GOSUB PUSH_Q: REM save the current environment for release

REM create new environ using env and params stored in function
Expand All @@ -264,6 +287,7 @@ SUB EVAL
LV=LV+1:GOSUB PEND_A_LV:LV=LV-1

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE

Expand Down
38 changes: 31 additions & 7 deletions impls/basic/step5_tco.in.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,38 +237,61 @@ SUB EVAL
GOTO EVAL_RETURN

EVAL_INVOKE:
CALL EVAL_AST

REM if error, return f/args for release by caller
REM evaluate A0
GOSUB PUSH_A
A=A0:CALL EVAL
GOSUB POP_A
IF ER<>-2 THEN GOTO EVAL_RETURN

REM push f/args for release after call
REM set F, push it in the stack for release after call
GOSUB PUSH_R

AR=Z%(R+1): REM rest
F=Z%(R+2)
F=R

GOSUB TYPE_F
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
REM if error, pop and return f for release by caller
GOSUB POP_R
ER=-1:E$="apply of non-function":GOTO EVAL_RETURN

REM Duplicate evaluation of args in order to prepare step8.

EVAL_DO_FUNCTION:
REM regular function

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

IF Z%(F+1)<65 THEN GOSUB DO_FUNCTION:GOTO EVAL_DO_FUNCTION_SKIP
REM for recur functions (apply, map, swap!), use GOTO
IF Z%(F+1)>64 THEN CALL DO_TCO_FUNCTION
EVAL_DO_FUNCTION_SKIP:

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE
GOTO EVAL_RETURN

EVAL_DO_MAL_FUNCTION:

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

Q=E:GOSUB PUSH_Q: REM save the current environment for release

REM create new environ using env and params stored in function
Expand All @@ -288,6 +311,7 @@ SUB EVAL
LV=LV+1:GOSUB PEND_A_LV:LV=LV-1

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE

Expand Down
38 changes: 31 additions & 7 deletions impls/basic/step6_file.in.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,38 +237,61 @@ SUB EVAL
GOTO EVAL_RETURN

EVAL_INVOKE:
CALL EVAL_AST

REM if error, return f/args for release by caller
REM evaluate A0
GOSUB PUSH_A
A=A0:CALL EVAL
GOSUB POP_A
IF ER<>-2 THEN GOTO EVAL_RETURN

REM push f/args for release after call
REM set F, push it in the stack for release after call
GOSUB PUSH_R

AR=Z%(R+1): REM rest
F=Z%(R+2)
F=R

GOSUB TYPE_F
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
REM if error, pop and return f for release by caller
GOSUB POP_R
ER=-1:E$="apply of non-function":GOTO EVAL_RETURN

REM Duplicate evaluation of args in order to prepare step8.

EVAL_DO_FUNCTION:
REM regular function

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

IF Z%(F+1)<65 THEN GOSUB DO_FUNCTION:GOTO EVAL_DO_FUNCTION_SKIP
REM for recur functions (apply, map, swap!), use GOTO
IF Z%(F+1)>64 THEN CALL DO_TCO_FUNCTION
EVAL_DO_FUNCTION_SKIP:

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE
GOTO EVAL_RETURN

EVAL_DO_MAL_FUNCTION:

REM Evaluate the arguments
A=Z%(A+1):CALL EVAL_AST
IF ER<>-2 THEN GOSUB POP_Q:AY=Q:GOSUB RELEASE:GOTO EVAL_RETURN

REM set F and AR, push AR (after F) in the stack for release after call
GOSUB PEEK_Q:F=Q
GOSUB PUSH_R
AR=R

Q=E:GOSUB PUSH_Q: REM save the current environment for release

REM create new environ using env and params stored in function
Expand All @@ -288,6 +311,7 @@ SUB EVAL
LV=LV+1:GOSUB PEND_A_LV:LV=LV-1

REM pop and release f/args
GOSUB POP_Q:AY=Q:GOSUB RELEASE
GOSUB POP_Q:AY=Q
GOSUB RELEASE

Expand Down
Loading
Loading