From 634812cea4f01ce3e2c5664162ffca0f320e130c Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Mon, 23 Aug 2021 23:43:47 -0400 Subject: [PATCH] Got it working! --- partial_eval.kp | 205 ++++++++++++++++++++++++++++-------------------- 1 file changed, 122 insertions(+), 83 deletions(-) diff --git a/partial_eval.kp b/partial_eval.kp index 5803478..74ffe2c 100644 --- a/partial_eval.kp +++ b/partial_eval.kp @@ -49,6 +49,31 @@ true (recurse dict key (+ i 1) fail success))) env-lookup (lambda (env key) (env-lookup-helper (idx env 1) key 0 (lambda () (error (str key " not found in env " (idx env 1)))) (lambda (x) x))) + + ; This is a conservative analysis, since we can't always tell what constructs introduce + ; a new binding scope & would be shadowing... we should at least be able to implement it for + ; vau/lambda, but we won't at first + closes_over_var_from_this_env_val (rec-lambda recurse (env body) (cond + (symbol? body) (env-lookup-helper (concat (slice (idx env 1) 0 -2) [nil]) body 0 (lambda () false) (lambda (x) [body])) + (array? body) (foldl (lambda (a x) (or a (recurse env x))) false body) + true false)) + closes_over_var_from_this_env_marked (rec-lambda recurse (env x) (cond + (val? x) (closes_over_var_from_this_env_val env (.val x)) + (later? x) (closes_over_var_from_this_env_val env (.later x)) + (marked_array? x) (foldl (lambda (a x) (or a (recurse env x))) false (.marked_array x)) + ; This is where we'd be smart and remove shadowed stuff + (comb? x) (let ( + [wrap_level de? se params body actual_function] (.comb x) + ; Also this won't work yet because env + (error (str "haven't handled comb yet really either for closes_over_var_from_this_env_marked " x)) + ) (or (recurse env se) (recurse env body))) + + (prim_comb? x) false + ; Should check to see if the env has anything form env in it, somehow? See if it has this env itself in it? + (marked_env? x) (error "haven't handled env in closes_over_var_from_this_env_marked!") + true (error (str "Something odd passed to closes_over_var_from_this_env_marked " x)) + )) + indent_str (rec-lambda recurse (i) (if (= i 0) "" (str " " (recurse (- i 1))))) @@ -58,8 +83,7 @@ (later? x) (.later x) (marked_array? x) (cons array (map recurse (idx x 1))) (comb? x) (let (c (idx x 6)) - ; not currently possible, I rolled back partial-vau - (if (= nil c) (error (str "partial eval failed: stripping a combinator without a real combinator (due to nil enviornment, no doubt)" x)) + (if (= nil c) (error (str "partial eval failed: regular stripping a combinator without a real combinator (due to nil enviornment, no doubt)" x)) c)) (prim_comb? x) (idx x 2) (marked_env? x) (error "Env escaped to strip!") @@ -77,7 +101,7 @@ ; If indeed we have to keep track of non-primitive combinator values (which I think makes sense for stripping), ; we'll have to continually keep a map of values to their definition (we do this now!). - partial_eval_helper (rec-lambda recurse (x env comb_to_mark_map indent) + partial_eval_helper (rec-lambda recurse (x env comb_to_mark_map imm_eval indent) (cond (= x true) [comb_to_mark_map ['val true ]] (= x false) [comb_to_mark_map ['val false]] (env? x) (error (str "called partial_eval with an env " x)) @@ -86,7 +110,11 @@ (symbol? x) [comb_to_mark_map (env-lookup env x)] (int? x) [comb_to_mark_map ['val x]] (and (array? x) (= 0 (len x))) (error "Partial eval on empty array") - (array? x) (let ( [comb_to_mark_map comb] (recurse (idx x 0) env comb_to_mark_map (+ 1 indent)) ) + (array? x) (let ( [comb_to_mark_map comb] (recurse (idx x 0) env comb_to_mark_map true (+ 1 indent)) + _ (println (indent_str indent) "Going to do an array call!") + _ (println (indent_str indent) " total is " x) + _ (println (indent_str indent) " evaled comb is " comb) + ) ; it seems like even if it's later we should be able to eval some? ; Maybe there should be something between 'later and 'comb made in vau ; for those sorts of cases, but maybe it doesn't matter? @@ -97,7 +125,7 @@ ; (because of a bug, actually, MAYYYYYBE we still don't need it?), and thus couldn't then be called ; even though that call would do the evaluation without any real env and would have succeded. (cond (later? comb) [comb_to_mark_map ['later (cons (strip comb) (slice x 1 -1))]] - (prim_comb? comb) ((.prim_comb comb) env comb_to_mark_map (slice x 1 -1) (+ 1 indent)) + (prim_comb? comb) ((.prim_comb comb) env comb_to_mark_map (slice x 1 -1) imm_eval (+ 1 indent)) (comb? comb) (let ( [wrap_level de? se params body actual_function] (.comb comb) literal_params (slice x 1 -1) @@ -105,7 +133,7 @@ (if (!= 0 wrap) (let ([comb_to_mark_map evaled_params] (foldl (lambda ([comb_to_mark_map ac] p) - (let ([comb_to_mark_map p] (recurse p env comb_to_mark_map (+ 1 indent))) + (let ([comb_to_mark_map p] (recurse p env comb_to_mark_map false (+ 1 indent))) [comb_to_mark_map (concat ac [p])])) [comb_to_mark_map []] (map strip params))) @@ -124,15 +152,27 @@ _ (println (indent_str indent) "Inner_real_env is " inner_real_env " because de_real " de_real_entry " se_real_env " se_real_env) inner_env ['env (concat (zip params appropriatly_evaled_params) de_entry [se]) inner_real_env] _ (println (indent_str indent) "going to eval " body " with inner_env is " inner_env) - ; Ok, this might be a later, in which case we need to re-wrap up in a vau, since - ; it might depend on our parameter symbols, if they're used as parameters to - ; a 'later value that might be a vau, since we don't know if they have to be evaluated and thus + + + ; Ok, this might be a later with un-evaled references to parameter symbols, + ; in which case we need to re-wrap up in a vau, since + ; if they're used as parameters to a 'later value that might be a vau, + ; since we don't know if they have to be evaluated and thus ; can't partially evaluate them. - [comb_to_mark_map func_result] (recurse body inner_env comb_to_mark_map (+ 1 indent)) - ; theretically we could save some of the partial eval here by making a new - ; unwrapped comb attached to the partially evaluated parameters and even - ; the partially evaluated body... - result (if (later? func_result) [comb_to_mark_map ['later (cons (strip comb) literal_params)]] + ; We check with closes_over_var_from_this_env_marked, which can be made more + ; sophisticated, see its definition + + [comb_to_mark_map func_result] (recurse body inner_env comb_to_mark_map imm_eval (+ 1 indent)) + + _ (println (indent_str indent) "evaled result of function call (imm_eval was " imm_eval ") is " func_result) + result (if (and (later? func_result) + (closes_over_var_from_this_env_marked inner_env func_result)) + (if (= nil actual_function) + ; this is exponential-y - we retry without imm to see if we can + ; have a better partial eval'd later instead of giving up entirely + (let ([comb_to_mark_map comb] (recurse (idx x 0) env comb_to_mark_map false (+ 1 indent))) + [comb_to_mark_map ['later (cons (strip comb) literal_params)]]) + [comb_to_mark_map ['later (cons actual_function literal_params)]]) [comb_to_mark_map func_result]) ) result) true (error (str "Partial eval noticed that you will likely call not a function " x)))) @@ -143,39 +183,27 @@ is_all_vals (lambda (evaled_params) (foldl (lambda (a x) (and a (val? x))) true evaled_params)) needs_params_val_lambda (vau de (f_sym) (let ( actual_function (eval f_sym de) - handler (lambda (de comb_to_mark_map params indent) (let ( + handler (lambda (de comb_to_mark_map params imm_eval indent) (let ( [comb_to_mark_map evaled_params] (foldl (lambda ([comb_to_mark_map evaleds] x) (let ( - [comb_to_mark_map evaled] (partial_eval_helper x de comb_to_mark_map (+ 1 indent)) - ) [comb_to_mark_map (cons evaled evaleds)])) [comb_to_mark_map []] params) + [comb_to_mark_map evaled] (partial_eval_helper x de comb_to_mark_map false (+ 1 indent)) + ) [comb_to_mark_map (concat evaleds [evaled])])) [comb_to_mark_map []] params) ) (if (is_all_vals evaled_params) [comb_to_mark_map ['val (lapply actual_function (map .val evaled_params))]] - [comb_to_mark_map ['later (cons actual_function (map strip evaled_params))]]))) + [comb_to_mark_map ['later (cons actual_function (map strip evaled_params))]]))) ) [f_sym ['prim_comb handler actual_function]])) give_up (vau de (f_sym) (let ( actual_function (eval f_sym de) - handler (lambda (de comb_to_mark_map params indent) [comb_to_mark_map ['later (cons actual_function params)]]) + handler (lambda (de comb_to_mark_map params imm_eval indent) [comb_to_mark_map ['later (cons actual_function params)]]) ) [f_sym ['prim_comb handler actual_function]])) - ; Our job is made a lot easier by the fact that these will - ; all be stripped and we only care about symbols and things that could contain symbols, - ; namely arrays - ; - ; This is a conservative analysis, since we can't always tell what constructs introduce - ; a new binding scope & would be shadowing... we should at least be able to implement it for - ; vau/lambda, but we won't at first - closes_over_outside_vars (rec-lambda recurse (env body) (cond - (symbol? body) (env-lookup-helper (idx env 1) body 0 (lambda () false) (lambda (x) [body])) - (array? body) (foldl (lambda (a x) (or a (recurse env x))) false body) - true false)) - - parameters_evaled_proxy (lambda (inner_f) (lambda (de comb_to_mark_map params indent) (let ( - [comb_to_mark_map evaled_params] (foldl (lambda ([comb_to_mark_map ac] p) - (let ([comb_to_mark_map p] (partial_eval_helper p de comb_to_mark_map (+ 1 indent))) - [comb_to_mark_map (concat ac [p])])) - [comb_to_mark_map []] + parameters_evaled_proxy (lambda (pasthr_ie inner_f) (lambda (de comb_to_mark_map params imm_eval indent) (let ( + [comb_to_mark_map evaled_params l] (foldl (lambda ([comb_to_mark_map ac i] p) + (let ([comb_to_mark_map p] (partial_eval_helper p de comb_to_mark_map (if (= i pasthr_ie) imm_eval false) (+ 1 indent))) + [comb_to_mark_map (concat ac [p]) (+ i 1)])) + [comb_to_mark_map [] 0] params) - ) (inner_f de comb_to_mark_map evaled_params indent)))) + ) (inner_f de comb_to_mark_map evaled_params imm_eval indent)))) root_marked_env ['env [ ; Ok, so for combinators, it should partial eval the body. @@ -183,75 +211,84 @@ ; any 'later values from above the combinator. If so, the combinator should ; evaluate to a ['later [vau de? params (strip partially_evaled_body)]], otherwise it can evaluate to a 'comb. ; Note that this 'later may be re-evaluated later if the parent function is called. - ['vau ['prim_comb (lambda (de comb_to_mark_map params indent) (let ( + ['vau ['prim_comb (lambda (de comb_to_mark_map params imm_eval indent) (let ( de? (if (= 3 (len params)) (idx params 0)) vau_de? (if (= nil de?) [] [de?]) vau_params (if (= nil de?) (idx params 0) (idx params 1)) body (if (= nil de?) (idx params 1) (idx params 2)) inner_env ['env (concat (map (lambda (p) [p ['later p]]) vau_params) (if (= nil de?) [] [ [de? ['later de?]] ]) [de]) nil] - [comb_to_mark_map pe_body] (partial_eval_helper body inner_env comb_to_mark_map (+ 1 indent)) + _ (println (indent_str indent) "in vau, evaluating body with 'later params - " body) + [comb_to_mark_map pe_body] (partial_eval_helper body inner_env comb_to_mark_map false (+ 1 indent)) + _ (println (indent_str indent) "in vau, result of evaluating body was " pe_body " stripping") spe_body (strip pe_body) - ;for_later (or (= nil (.env_real de)) (closes_over_outside_vars de spe_body)) - ;_ (println (indent_str indent) "for_later is " for_later " for " params " because of either env being null " (= nil (.env_real de)) " or " spe_body " closing over ourside " (closes_over_outside_vars de spe_body)) + _ (println (indent_str indent) "in vau, result of stripping evaled body was " spe_body) for_later (= nil (.env_real de)) - _ (println (indent_str indent) "for_later is " for_later " for " params " because of env being null " de) - ) (if for_later [comb_to_mark_map ['later (concat [vau] vau_de? [vau_params spe_body])]] - ;;;rolled_back;;;[comb_to_mark_map ['comb 0 de? de vau_params spe_body nil]] + _ (println (indent_str indent) "imm_eval is " imm_eval " and for_later is " for_later " for " params " because of env being null " de) + ) (if for_later (if (not imm_eval) [comb_to_mark_map ['later (concat [vau] vau_de? [vau_params spe_body])]] + [comb_to_mark_map ['comb 0 de? de vau_params spe_body nil]]) (let (real_func (eval (concat [vau] vau_de? [vau_params spe_body]) (.env_real de)) marked_func ['comb 0 de? de vau_params spe_body real_func] _ (println (indent_str indent) "Marked func is " marked_func) ) [(put comb_to_mark_map real_func marked_func) marked_func]))) ) vau]] - ['wrap ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled] indent) + + ['wrap ['prim_comb (parameters_evaled_proxy 0 (lambda (de comb_to_mark_map [evaled] imm_eval indent) (if (comb? evaled) (let ([wrap_level de? se params body actual_function] (.comb evaled) - wrapped_actual_fun (wrap actual_function) + wrapped_actual_fun (if (= nil actual_function) nil (wrap actual_function)) wrapped_marked_fun ['comb (+ 1 wrap_level) de? se params body wrapped_actual_fun] ) [(put comb_to_mark_map wrapped_actual_fun wrapped_marked_fun) wrapped_marked_fun]) [comb_to_mark_map ['later [wrap (strip evaled)]]])) ) wrap]] - ['unwrap ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled] indent) + ['unwrap ['prim_comb (parameters_evaled_proxy 0 (lambda (de comb_to_mark_map [evaled] imm_eval indent) (if (comb? evaled) (let ([wrap_level de? se params body actual_function] (.comb evaled) - unwrapped_actual_fun (unwrap actual_function) + unwrapped_actual_fun (if (= nil actual_function) nil (unwrap actual_function)) unwrapped_marked_fun ['comb (- wrap_level 1) de? se params body unwrapped_actual_fun] ) [(put comb_to_mark_map unwrapped_actual_fun unwrapped_marked_fun) unwrapped_marked_fun]) [comb_to_mark_map ['later [unwrap (strip evaled)]]])) ) unwrap]] - ; eval should have it's parameters partially -evaled, then partially-eval e again. - ; failure can 'later at either point - ['eval ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map params indent) (let ( - [comb_to_mark_map eval_env] (if (= 2 (len params)) [comb_to_mark_map (idx params 1)] + ['eval ['prim_comb (lambda (de comb_to_mark_map params imm_eval indent) (let ( + [comb_to_mark_map eval_env] (if (= 2 (len params)) (partial_eval_helper (idx params 1) de comb_to_mark_map false (+ 1 indent)) [comb_to_mark_map de]) - _ (println (indent_str indent) "is this a marked env? " (marked_env? eval_env)) - ) (if (not (marked_env? eval_env)) [comb_to_mark_map ['later (cons eval (map strip params))]] + ) (if (not (marked_env? eval_env)) [comb_to_mark_map ['later (cons eval params)]] (let ( _ (println (indent_str indent) "ok, env was " eval_env) - body (idx params 0) - _ (println (indent_str indent) "after first eval of param (from parameters_evaled_proxy)" body) + [comb_to_mark_map body1] (partial_eval_helper (idx params 0) de comb_to_mark_map imm_eval (+ 1 indent)) + _ (println (indent_str indent) "after first eval of param " body1) - eval_strip (rec-lambda recurse (x) - (do (println (indent_str indent) "calling eval_strip with " x) + ;;;; + ;; TODO: add a terrible hack (I was thinking about some sort of value to embed a non-real combiner into the stripped that will be turned back in partial eval + ;; but we'd have to be careful to also remove it on this side, and what about if it gets wrapped in another combiner? Maybe just a bad idea + ;;;; + terrible_hack_strip (rec-lambda recurse (x) (cond (val? x) (.val x) - (later? x) [eval (.later x) (.env_real eval_env)] + (later? x) (.later x) (marked_array? x) (map recurse (idx x 1)) (comb? x) (let (c (idx x 6)) - ; not currently possible, I rolled back partial-vau - (if (= nil c) (error (str "partial eval failed: stripping a combinator without a real combinator (due to nil enviornment, no doubt)" x)) + (if (= nil c) (error (str "partial eval failed: inne stripping a combinator without a real combinator (due to nil enviornment, no doubt)" x)) c)) (prim_comb? x) (idx x 2) - (marked_env? x) (error "Env escaped to eval_strip!") - true (error (str "some other eval_strip? " x)) - )) + (marked_env? x) (error "Env escaped to strip!") + true (error (str "some other strip? " x)) + ) ) - body_stripped (eval_strip body) - _ (println (indent_str indent) "after first eval stripped, " body_stripped) - [comb_to_mark_map eval_2_body] (partial_eval_helper body_stripped eval_env comb_to_mark_map (+ 1 indent)) - _ (println (indent_str indent) "after second eval, " eval_2_body) - _ (println (indent_str indent) "after second eval stripped (not used), " (eval_strip eval_2_body)) - ) [comb_to_mark_map eval_2_body] - ))))) eval]] - ['cond ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map evaled_params indent) + c_body2 (cond (val? body1) (partial_eval_helper (.val body1) eval_env comb_to_mark_map imm_eval (+ 1 indent)) + (later? body1) [comb_to_mark_map ['later [eval (.later body1) (if (= nil (.env_real eval_env)) (slice params 1 -1) (.env_real eval_env))]]] + (marked_array? body1) (partial_eval_helper (map terrible_hack_strip (idx body1 1)) eval_env comb_to_mark_map imm_eval (+ 1 indent)) + (comb? body1) [comb_to_mark_map body1] + (prim_comb? body1) [comb_to_mark_map body1] + (marked_env? body1) (error "Env escaped to eval_strip!") + true (error (str "some other eval_strip? " body1)) + ) + _ (println (indent_str indent) "and body2 is " (idx c_body2 1)) + ) c_body2) + ))) eval]] + + ;TODO: This could go a lot farther, not stopping after the first 'later, etc + ; Also, GAH on odd params - but only one by one - a later odd param can't be imm_eval cuz it will + ; be frozen if an earlier cond is 'later.... + ['cond ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map evaled_params imm_eval indent) (if (!= 0 (% (len evaled_params) 2)) (error (str "partial eval cond with odd evaled_params " evaled_params)) ((rec-lambda recurse (i) (cond (later? (idx evaled_params i)) [comb_to_mark_map ['later (cons cond (slice (map strip evaled_params) i -1))]] @@ -264,7 +301,8 @@ (needs_params_val_lambda symbol?) (needs_params_val_lambda int?) (needs_params_val_lambda string?) - ['combiner? ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_param] indent) + ; not even a gah, but kinda! + ['combiner? ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_param] imm_eval indent) (cond (val? evaled_param) [comb_to_mark_map ['val (combiner? (.val evaled_param))]] (comb? evaled_param) [comb_to_mark_map ['val true]] (prim_comb? evaled_param) [comb_to_mark_map ['val true]] @@ -272,7 +310,8 @@ true [comb_to_mark_map ['val false]] ) )) combiner?]] - ['env? ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_param] indent) + ; not even a gah, but kinda! + ['env? ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_param] imm_eval indent) (cond (val? evaled_param) [comb_to_mark_map ['val (env? (.val evaled_param))]] (marked_env? evaled_param) [comb_to_mark_map ['val true]] (later? evaled_param) [comb_to_mark_map ['later [env? (strip evaled_param)]]] @@ -283,31 +322,31 @@ (needs_params_val_lambda bool?) (needs_params_val_lambda str-to-symbol) (needs_params_val_lambda get-text) - ['array? ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_param] indent) + ['array? ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_param] imm_eval indent) (cond (val? evaled_param) [comb_to_mark_map ['val (array? (.val evaled_param))]] (marked_array? evaled_param) [comb_to_mark_map ['val true]] (later? evaled_param) [comb_to_mark_map ['later [array? (strip evaled_param)]]] true [comb_to_mark_map ['val false]] ) )) array?]] - ['array ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map evaled_params indent) + ['array ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map evaled_params imm_eval indent) (if (is_all_vals evaled_params) [comb_to_mark_map ['val (map strip evaled_params)]] [comb_to_mark_map ['marked_array evaled_params]] ) )) array]] - ['len ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_param] indent) + ['len ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_param] imm_eval indent) (cond (val? evaled_param) [comb_to_mark_map ['val (len (.val evaled_param))]] (marked_array? evaled_param) [comb_to_mark_map ['val (len (.marked_array evaled_param))]] true [comb_to_mark_map ['later [len (strip evaled_param)]]] ) )) len]] - ['idx ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_array evaled_idx] indent) + ['idx ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_array evaled_idx] imm_eval indent) (cond (and (val? evaled_idx) (val? evaled_array)) [comb_to_mark_map ['val (idx (.val evaled_array) (.val evaled_idx))]] (and (val? evaled_idx) (marked_array? evaled_array)) [comb_to_mark_map (idx (.marked_array evaled_array) (.val evaled_idx))] true [comb_to_mark_map ['later [idx (strip evaled_array) (strip evaled_idx)]]] ) )) idx]] - ['slice ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map [evaled_array evaled_begin evaled_end] indent) + ['slice ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map [evaled_array evaled_begin evaled_end] imm_eval indent) (cond (and (val? evaled_begin) (val? evaled_end) (val? evaled_array)) [comb_to_mark_map ['val (slice (.val evaled_array) (.val evaled_begin) (.val evaled_end))]] (and (val? evaled_begin) (val? evaled_end) (marked_array? evaled_array)) [comb_to_mark_map ['marked_array (slice (.marked_array evaled_array) (.val evaled_begin) @@ -317,7 +356,7 @@ (strip evaled_end)]]] ) )) slice]] - ['concat ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map evaled_params indent) + ['concat ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map evaled_params imm_eval indent) (cond (foldl (lambda (a x) (and a (val? x))) true evaled_params) [comb_to_mark_map ['val (lapply concat (map strip evaled_params))]] (foldl (lambda (a x) (and a (or (val? x) (marked_array? x)))) true evaled_params) [comb_to_mark_map ['marked_array (lapply concat (map (lambda (x) (if (val? x) (map (lambda (y) ['val y]) (.val x)) @@ -342,7 +381,7 @@ (needs_params_val_lambda >) (needs_params_val_lambda >=) - ['and ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map evaled_params indent) + ['and ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map evaled_params imm_eval indent) ((rec-lambda recurse (i) (cond (= i (- (len evaled_params) 1)) [comb_to_mark_map (idx evaled_params i)] (later? (idx evaled_params i)) [comb_to_mark_map ['later (cons and (slice (map strip evaled_params) i -1))]] @@ -351,7 +390,7 @@ true (recurse (+ 1 i))) ) 0) )) and]] - ['or ['prim_comb (parameters_evaled_proxy (lambda (de comb_to_mark_map evaled_params indent) + ['or ['prim_comb (parameters_evaled_proxy nil (lambda (de comb_to_mark_map evaled_params imm_eval indent) ((rec-lambda recurse (i) (cond (= i (- (len evaled_params) 1)) [comb_to_mark_map (idx evaled_params i)] (later? (idx evaled_params i)) [comb_to_mark_map ['later (cons or (slice (map strip evaled_params) i -1))]] @@ -386,7 +425,7 @@ (prim_comb? (idx x 1)) (put a (idx (idx x 1) 2) (idx x 1)) true a ) ) empty_dict (idx root_marked_env 1)) - partial_eval (lambda (x) (partial_eval_helper x root_marked_env comb_to_mark_map 0)) + partial_eval (lambda (x) (partial_eval_helper x root_marked_env comb_to_mark_map false 0)) ) (provide partial_eval strip) ))