From 853d28f803e75d125915a81dcdcd140513efe3d2 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 26 Jun 2022 19:37:45 -0400
Subject: Re-named directives to declarations.

---
 stdlib/source/specification/compositor.lux        | 14 ++++-----
 stdlib/source/specification/compositor/common.lux | 38 +++++++++++------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'stdlib/source/specification')

diff --git a/stdlib/source/specification/compositor.lux b/stdlib/source/specification/compositor.lux
index f8d5dcc97..e6494e011 100644
--- a/stdlib/source/specification/compositor.lux
+++ b/stdlib/source/specification/compositor.lux
@@ -11,7 +11,7 @@
   [tool
    [compiler
     ["[0]" analysis]
-    ["[0]" directive]
+    ["[0]" declaration]
     [phase
      [macro (.only Expander)]
      [generation (.only Bundle)]]
@@ -42,11 +42,11 @@
        ))
 
 (def .public (spec platform bundle expander program)
-  (All (_ anchor expression directive)
-    (-> (IO (Platform IO anchor expression directive))
-        (Bundle anchor expression directive)
+  (All (_ anchor expression declaration)
+    (-> (IO (Platform IO anchor expression declaration))
+        (Bundle anchor expression declaration)
         Expander
-        (-> expression directive)
+        (-> expression declaration)
         Test))
   (do r.monad
     [_ (in [])
@@ -58,9 +58,9 @@
                                                         expander
                                                         program))]]
     (case ?state,runner,definer
-      {try.#Success [[directive_bundle directive_state] runner definer]}
+      {try.#Success [[declaration_bundle declaration_state] runner definer]}
       (..test runner definer
-              (the [directive.#analysis directive.#state] directive_state)
+              (the [declaration.#analysis declaration.#state] declaration_state)
               expander)
 
       {try.#Failure error}
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index e6913e8df..c9da8e718 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -10,7 +10,7 @@
     ["[0]" reference]
     ["[0]" analysis]
     ["[0]" synthesis (.only Synthesis)]
-    ["[0]" directive]
+    ["[0]" declaration]
     ["[0]" phase
      ["[0]" macro (.only Expander)]
      ["[0]" generation (.only Operation)]
@@ -26,9 +26,9 @@
   (-> Symbol Synthesis (Try Any)))
 
 (type .public (Instancer what)
-  (All (_ anchor expression directive)
-    (-> (Platform IO anchor expression directive)
-        (generation.State+ anchor expression directive)
+  (All (_ anchor expression declaration)
+    (-> (Platform IO anchor expression declaration)
+        (generation.State+ anchor expression declaration)
         what)))
 
 (def (runner (open "[0]") state)
@@ -51,30 +51,30 @@
                        (do phase.monad
                          [_ runtime
                           expressionG (phase expressionS)
-                          [host_name host_value host_directive] (generation.define! lux_name expressionG)
+                          [host_name host_value host_declaration] (generation.define! lux_name expressionG)
                           _ (generation.learn lux_name host_name)]
                          (phase (synthesis.constant lux_name))))]
       (at host evaluate! "definer" definitionG))))
 
 (def .public (executors target expander platform
-                         analysis_bundle generation_bundle directive_bundle
-                         program extender)
-  (All (_ anchor expression directive)
-    (-> Text Expander (Platform IO anchor expression directive)
+                        analysis_bundle generation_bundle declaration_bundle
+                        program extender)
+  (All (_ anchor expression declaration)
+    (-> Text Expander (Platform IO anchor expression declaration)
         analysis.Bundle
-        (generation.Bundle anchor expression directive)
-        (directive.Bundle anchor expression directive)
-        (-> expression directive) Extender
-        (IO (Try [(directive.State+ anchor expression directive)
+        (generation.Bundle anchor expression declaration)
+        (declaration.Bundle anchor expression declaration)
+        (-> expression declaration) Extender
+        (IO (Try [(declaration.State+ anchor expression declaration)
                   Runner
                   Definer]))))
   (do io.monad
-    [?state (platform.initialize target expander analysis_bundle platform generation_bundle directive_bundle program extender)]
+    [?state (platform.initialize target expander analysis_bundle platform generation_bundle declaration_bundle program extender)]
     (in (do try.monad
-          [[directive_bundle directive_state] ?state
-           .let [generation_state (the [directive.#generation
-                                        directive.#state]
-                                       directive_state)]]
-          (in [[directive_bundle directive_state]
+          [[declaration_bundle declaration_state] ?state
+           .let [generation_state (the [declaration.#generation
+                                        declaration.#state]
+                                       declaration_state)]]
+          (in [[declaration_bundle declaration_state]
                (..runner platform generation_state)
                (..definer platform generation_state)])))))
-- 
cgit v1.2.3