st/lama_byterun
1
0
Fork 0
mirror of https://github.com/ProgramSnail/Lama.git synced 2025-12-09 16:28:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More stdlib; fixed another bug in higher-order functions

Browse source
This commit is contained in:
Dmitry Boulytchev 2020-01-15 05:24:35 +03:00
parent 2594f7a8dc
commit 5dcc3a97b0
5 changed files with 469 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/SM.ml
View file

@ -349,7 +349,7 @@ object (self : 'self)
method private get_parent f = M.find f !funtree
method private get_closure f = M.find f !closures
method get_closure f = M.find f !closures
method private propagate_for_call (f, c) =
try
@ -420,7 +420,9 @@ object (self : 'self)
method show_funinfo = funinfo#show_funinfo
method get_closure p = try funinfo#lookup_closure p with Not_found -> []
method get_fun_closure f = funinfo#get_closure f
method propagate_closures = {< funinfo = funinfo#propagate_closures >}
method register_call f = {< funinfo = funinfo#register_call f self#current_function >}
@ -855,9 +857,10 @@ let compile cmd ((imports, infixes), p) =
in
let fix_closures env prg =
let rec inner state = function
| [] -> []
| PROTO (f, c) :: tl -> CLOSURE (f, env#get_closure (f, c)) :: inner state tl
| PPROTO (f, c) :: tl ->
| [] -> []
| BEGIN (f, a, l, c) :: tl -> BEGIN (f, a, l, try env#get_fun_closure f with Not_found -> c) :: inner state tl
| PROTO (f, c) :: tl -> CLOSURE (f, env#get_closure (f, c)) :: inner state tl
| PPROTO (f, c) :: tl ->
(match env#get_closure (f, c) with
| [] -> inner (Some f :: state) tl
| closure -> CLOSURE (f, closure) :: inner (None :: state) tl