From 486488ae17007406a6c90f182b85f7be14b6b373 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 8 Jun 2021 19:16:37 -0400 Subject: Improved formatting of compilation results (only for new compilers). --- stdlib/source/lux/tool/compiler/default/platform.lux | 13 ++++++++----- .../compiler/language/lux/phase/extension/directive/lux.lux | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/stdlib/source/lux/tool/compiler/default/platform.lux b/stdlib/source/lux/tool/compiler/default/platform.lux index 97ab64d3d..a89ddd43e 100644 --- a/stdlib/source/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/lux/tool/compiler/default/platform.lux @@ -227,17 +227,20 @@ _ (..cache_module static platform 0 payload)] (wrap [state archive]))))) - (def: module_compilation_log + (def: compilation_log_separator + (format text.new_line text.tab)) + + (def: (module_compilation_log module) (All [] - (-> Text)) + (-> Module Text)) (|>> (get@ [#extension.state #///directive.generation #///directive.state #extension.state #///generation.log]) (row\fold (function (_ right left) - (format left text.new_line right)) - ""))) + (format left ..compilation_log_separator right)) + module))) (def: with_reset_log (All [] @@ -536,7 +539,7 @@ (#.Right [descriptor document output]) (do ! - [#let [_ (debug.log! (..module_compilation_log state)) + [#let [_ (debug.log! (..module_compilation_log module state)) descriptor (set@ #descriptor.references (set.from_list text.hash all_dependencies) descriptor)] _ (..cache_module static platform module_id [descriptor document output])] (case (archive.add module [descriptor document output] archive) diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux index a33fbc5e1..4e33cbebc 100644 --- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux +++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux @@ -209,11 +209,11 @@ [(///analysis.bundle eval host_analysis)])) state)]))) -(def: (announce_definition! name type) +(def: (announce_definition! short type) (All [anchor expression directive] - (-> Name Type (Operation anchor expression directive Any))) + (-> Text Type (Operation anchor expression directive Any))) (/////directive.lift_generation - (/////generation.log! (format "Definition " (%.name name) " : " (%.type type))))) + (/////generation.log! (format short " : " (%.type type))))) (def: (lux::def expander host_analysis) (-> Expander /////analysis.Bundle Handler) @@ -229,7 +229,7 @@ _ (/////directive.lift_analysis (module.define short_name (#.Right [exported? type (:coerce Code annotations) value]))) _ (..refresh expander host_analysis) - _ (..announce_definition! full_name type)] + _ (..announce_definition! short_name type)] (wrap /////directive.no_requirements)) _ @@ -252,7 +252,7 @@ [_ (module.define short_name (#.Right [exported? type annotations value]))] (module.declare_tags tags exported? (:coerce Type value)))) _ (..refresh expander host_analysis) - _ (..announce_definition! full_name type)] + _ (..announce_definition! short_name type)] (wrap /////directive.no_requirements)))])) (def: imports -- cgit v1.2.3