diff options
Diffstat (limited to 'lux-r/source')
| -rw-r--r-- | lux-r/source/program.lux | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux index 42d095a41..68f8ef9c8 100644 --- a/lux-r/source/program.lux +++ b/lux-r/source/program.lux @@ -232,7 +232,7 @@ ... [] (eval self [context org/renjin/eval/Context environment org/renjin/sexp/Environment]) ... org/renjin/sexp/SEXP ... (exec - ... ("lux io log" (exception.report + ... (debug.log! (exception.report ... (list ["@@" "eval"] ... ["context" (debug.inspect context)] ... ["environment" (debug.inspect environment)]))) @@ -252,14 +252,14 @@ [] (get self [_ int]) org/renjin/sexp/SEXP (exec - ... ("lux io log" (..%%code <call>)) + ... (debug.log! (..%%code <call>)) _jvm_this)) (org/renjin/sexp/ListVector [] (get self [_ java/lang/String]) org/renjin/sexp/SEXP (exec - ... ("lux io log" (..%%code <call>)) + ... (debug.log! (..%%code <call>)) _jvm_this)) (,, (with_template [<call> <output>] @@ -269,7 +269,7 @@ [] <call> <output> ... (exec - ... ... ("lux io log" (..%%code <call>)) + ... ... (debug.log! (..%%code <call>)) ... (panic! (..%%code <call>))) (panic! (..%%code <call>)))] @@ -417,7 +417,7 @@ (def (read host_object) (Reader java/lang/Object) (exec - ... ("lux io log" (exception.construct ..unknown_kind_of_object [host_object])) + ... (debug.log! (exception.construct ..unknown_kind_of_object [host_object])) (`` (<| (case (ffi.as org/renjin/sexp/ListVector host_object) {.#Some host_object} (<| (case (..read_variant read host_object) @@ -459,7 +459,7 @@ (def (call_macro interpreter inputs lux macro) (-> org/renjin/script/RenjinScriptEngine (List Code) Lux org/renjin/sexp/Closure (Try (Try [Lux (List Code)]))) - (let [_ ("lux io log" "@call_macro 0") + (let [_ (debug.log! "@call_macro 0") r_inputs (is org/renjin/sexp/PairList (case (ffi.try (|> (org/renjin/sexp/PairList$Builder::new) (org/renjin/sexp/PairList$Builder::add (..host_value inputs)) @@ -471,18 +471,18 @@ {try.#Failure error} (exec - ("lux io log" error) + (debug.log! error) (panic! error)))) - _ ("lux io log" "@call_macro 1") + _ (debug.log! "@call_macro 1") r_macro (org/renjin/sexp/FunctionCall::new macro r_inputs) - _ ("lux io log" "@call_macro 2") + _ (debug.log! "@call_macro 2") r_environment (org/renjin/sexp/Closure::getEnclosingEnvironment macro) - _ ("lux io log" "@call_macro 3") + _ (debug.log! "@call_macro 3") r_context (org/renjin/script/RenjinScriptEngine::getRuntimeContext interpreter) - _ ("lux io log" "@call_macro 4")] + _ (debug.log! "@call_macro 4")] (do try.monad [raw_output (org/renjin/sexp/FunctionCall::eval r_context r_environment r_macro) - #let [_ ("lux io log" "@call_macro 5")]] + #let [_ (debug.log! "@call_macro 5")]] (as (Try (Try [Lux (List Code)])) (..read (as java/lang/Object raw_output)))))) @@ -509,13 +509,13 @@ (is (Host _.Expression _.Expression) (structure (def (evaluate! context code) - (exec ("lux io log" "@evaluate!") + (exec (debug.log! "@evaluate!") (run! code))) (def (execute! input) (exec - ("lux io log" "@execute!") - ... ("lux io log" (_.code input)) + (debug.log! "@execute!") + ... (debug.log! (_.code input)) (javax/script/ScriptEngine::eval (_.code input) interpreter))) (def (define! context input) @@ -523,13 +523,13 @@ $global (_.var global)] (do try.monad [#let [definition (_.set! $global input)] - #let [_ ("lux io log" "@define! 0") - ... _ ("lux io log" (_.code definition)) + #let [_ (debug.log! "@define! 0") + ... _ (debug.log! (_.code definition)) ] _ (javax/script/ScriptEngine::eval (_.code definition) interpreter) - #let [_ ("lux io log" "@define! 1")] + #let [_ (debug.log! "@define! 1")] value (run! $global) - #let [_ ("lux io log" "@define! 2")]] + #let [_ (debug.log! "@define! 2")]] (wrap [global value definition])))) (def (ingest context content) @@ -575,9 +575,7 @@ (as Try) try.trusted (as Try) - (exec - ("lux io log" "TODO: Extender") - {try.#Failure "TODO: Extender"}))) + {try.#Failure "TODO: Extender"})) @.r (def (extender handler) |