From 93eb82e1bf6d2f2a6b3b0adb85f4ab93cbb766a9 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 14 Mar 2022 03:33:01 -0400 Subject: De-sigil-ification: @ --- stdlib/source/program/aedifex/profile.lux | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'stdlib/source/program/aedifex/profile.lux') diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 43887caa4..048aabf27 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -247,26 +247,26 @@ (def: (composite override baseline) (template.let [(!runtime ) - [(if (runtime#= (value@ override)) - (value@ baseline) - (value@ override))]] - [#parents (list#composite (value@ #parents baseline) (value@ #parents override)) - #identity (maybe#composite (value@ #identity override) (value@ #identity baseline)) - #info (maybe#composite (value@ #info override) (value@ #info baseline)) - #repositories (set.union (value@ #repositories baseline) (value@ #repositories override)) - #dependencies (set.union (value@ #dependencies baseline) (value@ #dependencies override)) - #lux (if (dependency#= ..default_compiler (value@ #lux override)) - (value@ #lux baseline) - (value@ #lux override)) - #compilers (list#composite (value@ #compilers baseline) (value@ #compilers override)) - #sources (set.union (value@ #sources baseline) (value@ #sources override)) - #target (if (text#= ..default_target (value@ #target baseline)) - (value@ #target override) - (value@ #target baseline)) - #program (maybe#composite (value@ #program override) (value@ #program baseline)) - #test (maybe#composite (value@ #test override) (value@ #test baseline)) - #deploy_repositories (dictionary.merged (value@ #deploy_repositories override) (value@ #deploy_repositories baseline)) - #configuration (plist#composite (value@ #configuration override) (value@ #configuration baseline)) + [(if (runtime#= (the override)) + (the baseline) + (the override))]] + [#parents (list#composite (the #parents baseline) (the #parents override)) + #identity (maybe#composite (the #identity override) (the #identity baseline)) + #info (maybe#composite (the #info override) (the #info baseline)) + #repositories (set.union (the #repositories baseline) (the #repositories override)) + #dependencies (set.union (the #dependencies baseline) (the #dependencies override)) + #lux (if (dependency#= ..default_compiler (the #lux override)) + (the #lux baseline) + (the #lux override)) + #compilers (list#composite (the #compilers baseline) (the #compilers override)) + #sources (set.union (the #sources baseline) (the #sources override)) + #target (if (text#= ..default_target (the #target baseline)) + (the #target override) + (the #target baseline)) + #program (maybe#composite (the #program override) (the #program baseline)) + #test (maybe#composite (the #test override) (the #test baseline)) + #deploy_repositories (dictionary.merged (the #deploy_repositories override) (the #deploy_repositories baseline)) + #configuration (plist#composite (the #configuration override) (the #configuration baseline)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) #python (!runtime #python runtime.default_python) -- cgit v1.2.3