From 36303d6cb2ce3ab9e36d045b9516c997bd461862 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 24 Aug 2021 05:23:45 -0400 Subject: Outsourced the syntax for labelled type definitions to macros. --- stdlib/source/program/aedifex/profile.lux | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 f4a1f9a0d..264bc9015 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -228,14 +228,14 @@ #lua runtime.default_lua #ruby runtime.default_ruby}) - (def: (compose override baseline) + (def: (composite override baseline) (template.let [(!runtime ) [(if (runtime\= (value@ override)) (value@ baseline) (value@ override))]] - {#parents (list\compose (value@ #parents baseline) (value@ #parents override)) - #identity (maybe\compose (value@ #identity override) (value@ #identity baseline)) - #info (maybe\compose (value@ #info override) (value@ #info baseline)) + {#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)) #compiler (if (dependency\= ..default_compiler (value@ #compiler override)) @@ -245,8 +245,8 @@ #target (if (text\= ..default_target (value@ #target baseline)) (value@ #target override) (value@ #target baseline)) - #program (maybe\compose (value@ #program override) (value@ #program baseline)) - #test (maybe\compose (value@ #test override) (value@ #test 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)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) -- cgit v1.2.3