Skip to content

[WIP] Fix the SECD Machine for 0.1.0 #346

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

Draft
gfngfn wants to merge 2 commits into
base: dev-0-1-0
Choose a base branch
from
Draft

[WIP] Fix the SECD Machine for 0.1.0 #346

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
b0abbdd
fix 'Vm.stack'
gfngfn Aug 26, 2022
5c5e603
Merge branch 'dev-0-1-0' into dev-0-1-0-fix-vm
gfngfn Aug 27, 2022
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
10 changes: 5 additions & 5 deletions src/frontend/bytecomp/bytecomp.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open Types
open EvalUtil


let compile_and_exec_0 (env : environment) (ast : abstract_tree) : syntactic_value * environment option =
let compile_and_exec_0 (env : environment) (ast : abstract_tree) : syntactic_value =
let (ir, env) = Ir.transform_ast_0 env ast in
let instrs = Compiler.compile ir [] in
(*
Expand All @@ -23,7 +23,7 @@ let compile_environment (env : environment) : unit =
| PrimitiveClosure(parbr, env1, arity, astf) ->
begin
match compile_and_exec_0 env (Function(LabelMap.empty, parbr)) with
| (CompiledClosure(varloc_labmap, _, _, framesize, body, env1), _) ->
| CompiledClosure(varloc_labmap, _, _, framesize, body, env1) ->
if LabelMap.cardinal varloc_labmap = 0 then
loc := CompiledPrimitiveClosure(arity, [], framesize, body, env1, astf)
else
Expand All @@ -38,10 +38,10 @@ let compile_environment (env : environment) : unit =
)


let compile_and_exec_1 (env : environment) (ast : abstract_tree) : code_value * environment option =
let compile_and_exec_1 (env : environment) (ast : abstract_tree) : code_value =
let (ir, env) = Ir.transform_ast_1 env ast in
let instrs = Compiler.compile ir [] in
let (value, envopt) = Vm.exec_code env instrs in
let value = Vm.exec_code env instrs in
match value with
| CodeValue(cv) -> (cv, envopt)
| CodeValue(cv) -> cv
| _ -> report_bug_value "compile_and_exec_1: not a CodeValue(...)" value
Loading