From 0c32c7f03ad1f8f0db54b623dc407713bbf8cacd Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 6 Jul 2022 12:05:43 -0400 Subject: Moved compiler machinery under lux/meta. --- stdlib/source/program/aedifex.lux | 2 +- stdlib/source/program/aedifex/command/build.lux | 3 +-- .../source/program/aedifex/command/deploy/release.lux | 2 +- .../source/program/aedifex/command/deploy/snapshot.lux | 2 +- stdlib/source/program/aedifex/command/install.lux | 2 +- stdlib/source/program/aedifex/command/version.lux | 3 +-- stdlib/source/program/aedifex/format.lux | 3 +-- stdlib/source/program/aedifex/input.lux | 3 +-- stdlib/source/program/aedifex/parser.lux | 3 +-- stdlib/source/program/aedifex/profile.lux | 11 +++++------ stdlib/source/program/aedifex/repository/remote.lux | 3 +-- stdlib/source/program/compositor.lux | 17 ++++++++--------- 12 files changed, 23 insertions(+), 31 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index 319ed87ad..6e6d9abfb 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -26,7 +26,7 @@ ["[0]" set] ["[0]" dictionary (.only Dictionary)] ["[0]" list (.use "[1]#[0]" functor)]]] - [tool + [meta [compiler [language [lux diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index b20dd16a6..9eae7660d 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -26,8 +26,7 @@ [meta ["[0]" configuration] [macro - ["^" pattern]]] - [tool + ["^" pattern]] [compiler [meta [cli diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index f41850d02..e30c115d2 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -25,7 +25,7 @@ [format ["[0]" tar] ["[0]" xml]]] - [tool + [meta [compiler [meta ["[0]" export] diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux index 5f1649bf7..eec503275 100644 --- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux +++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux @@ -18,7 +18,7 @@ [format ["[0]" tar] ["[0]" xml]]] - [tool + [meta [compiler [meta ["[0]" export]]]] diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 556155636..2bd647a44 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -20,7 +20,7 @@ [format ["[0]" tar] ["[0]" xml]]] - [tool + [meta [compiler [meta ["[0]" export]]]] diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux index 83d13af8a..a65ca499c 100644 --- a/stdlib/source/program/aedifex/command/version.lux +++ b/stdlib/source/program/aedifex/command/version.lux @@ -6,8 +6,7 @@ [concurrency ["[0]" async (.only Async)]]] ["[0]" meta - ["[1]/[0]" version]] - [tool + ["[1]/[0]" version] [compiler ["[0]" version]]] [world diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index da65aa330..06dfa2988 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -10,8 +10,7 @@ [meta [macro ["[0]" code] - ["[0]" template]]] - [tool + ["[0]" template]] [compiler [meta [cli diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index fc477f0a1..a29cb49a7 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -17,8 +17,7 @@ [meta ["[0]" location] ["[0]" code (.only) - ["<[1]>" \\parser]]] - [tool + ["<[1]>" \\parser]] [compiler [language [lux diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index cad4c3f40..95197c4d9 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -15,8 +15,7 @@ ["[0]" property]]]] [meta ["[0]" code (.only) - ["<[1]>" \\parser (.only Parser)]]] - [tool + ["<[1]>" \\parser (.only Parser)]] [compiler [meta [cli diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 060bc0f18..579c21b41 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -19,18 +19,17 @@ ["[0]" symbol] [macro ["^" pattern] - ["[0]" template]]] - [world - [net (.only URL)] - [file (.only Path)]] - [tool + ["[0]" template]] [compiler [meta ["[0]" cli ["[0]" compiler (.only Compiler)]] [archive [module - [descriptor (.only Module)]]]]]]]] + [descriptor (.only Module)]]]]]] + [world + [net (.only URL)] + [file (.only Path)]]]] [// ["[0]" runtime (.only Runtime) (.use "[1]#[0]" equivalence)] ["[0]" dependency (.only Dependency) (.use "[1]#[0]" equivalence)] diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 9d5a0f134..2cbeae80e 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -14,8 +14,7 @@ [collection ["[0]" list]]] ["[0]" meta - ["[1]/[0]" version]] - [tool + ["[1]/[0]" version] [compiler ["[0]" version]]] [world diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index c6d1f3540..ac17513ed 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -19,14 +19,7 @@ ["[0]" dictionary (.only Dictionary)]]] [meta [type (.only sharing)] - ["@" target]] - [time - ["[0]" instant]] - ["[0]" world - ["[0]" file] - ["[0]" console] - ["[1]/[0]" environment]] - [tool + ["@" target] ["[0]" compiler ["[0]" phase] [default @@ -56,7 +49,13 @@ [io ["ioW" archive]]]] ... ["[0]" interpreter] - ]]]) + ] + [time + ["[0]" instant]] + ["[0]" world + ["[0]" file] + ["[0]" console] + ["[1]/[0]" environment]]]]) (def (or_crash! failure_description action) (All (_ a) -- cgit v1.2.3