aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/spec
diff options
context:
space:
mode:
authorEduardo Julian2019-09-07 20:02:14 -0400
committerEduardo Julian2019-09-07 20:02:14 -0400
commit5f494b497e79bcea1d3c64d663ca5435bbf8ca2d (patch)
tree2a7ac78ae896042039e1311a14948026cbe66585 /stdlib/source/spec
parent747abe180b2669b6af5779dcf39ab5a8b6ed11ed (diff)
Renamed "Statement" to "Directive".
Diffstat (limited to 'stdlib/source/spec')
-rw-r--r--stdlib/source/spec/compositor.lux14
-rw-r--r--stdlib/source/spec/compositor/common.lux30
2 files changed, 22 insertions, 22 deletions
diff --git a/stdlib/source/spec/compositor.lux b/stdlib/source/spec/compositor.lux
index 903097950..08a294282 100644
--- a/stdlib/source/spec/compositor.lux
+++ b/stdlib/source/spec/compositor.lux
@@ -11,7 +11,7 @@
[tool
[compiler
["." analysis]
- ["." statement]
+ ["." directive]
[phase
[macro (#+ Expander)]
[generation (#+ Bundle)]]
@@ -42,11 +42,11 @@
))
(def: #export (spec platform bundle expander program)
- (All [anchor expression statement]
- (-> (IO (Platform IO anchor expression statement))
- (Bundle anchor expression statement)
+ (All [anchor expression directive]
+ (-> (IO (Platform IO anchor expression directive))
+ (Bundle anchor expression directive)
Expander
- (-> expression statement)
+ (-> expression directive)
Test))
(do r.monad
[_ (wrap [])
@@ -58,9 +58,9 @@
expander
program))]]
(case ?state,runner,definer
- (#try.Success [[statement-bundle statement-state] runner definer])
+ (#try.Success [[directive-bundle directive-state] runner definer])
(..test runner definer
- (get@ [#statement.analysis #statement.state] statement-state)
+ (get@ [#directive.analysis #directive.state] directive-state)
expander)
(#try.Failure error)
diff --git a/stdlib/source/spec/compositor/common.lux b/stdlib/source/spec/compositor/common.lux
index 7b1c940fb..05fbe7fc2 100644
--- a/stdlib/source/spec/compositor/common.lux
+++ b/stdlib/source/spec/compositor/common.lux
@@ -9,7 +9,7 @@
[compiler
["." reference]
["." synthesis (#+ Synthesis)]
- ["." statement]
+ ["." directive]
["." phase
["." macro (#+ Expander)]
["." generation (#+ Operation Bundle)]
@@ -22,9 +22,9 @@
(type: #export Definer (-> Name Synthesis (Try Any)))
(type: #export (Instancer what)
- (All [anchor expression statement]
- (-> (Platform IO anchor expression statement)
- (generation.State+ anchor expression statement)
+ (All [anchor expression directive]
+ (-> (Platform IO anchor expression directive)
+ (generation.State+ anchor expression directive)
what)))
(def: (runner (^slots [#platform.runtime #platform.phase #platform.host]) state)
@@ -48,27 +48,27 @@
(do phase.monad
[_ runtime
expressionG (phase expressionS)
- [host-name host-value host-statement] (generation.define! lux-name expressionG)
+ [host-name host-value host-directive] (generation.define! lux-name expressionG)
_ (generation.learn lux-name host-name)]
(phase (synthesis.constant lux-name))))]
(:: host evaluate! "definer" definitionG))))
(def: #export (executors platform bundle expander program)
- (All [anchor expression statement]
- (-> (Platform IO anchor expression statement)
- (Bundle anchor expression statement)
+ (All [anchor expression directive]
+ (-> (Platform IO anchor expression directive)
+ (Bundle anchor expression directive)
Expander
- (-> expression statement)
- (IO (Try [(statement.State+ anchor expression statement)
+ (-> expression directive)
+ (IO (Try [(directive.State+ anchor expression directive)
Runner
Definer]))))
(do io.monad
[?state (platform.initialize expander platform bundle program)]
(wrap (do try.monad
- [[statement-bundle statement-state] ?state
- #let [generation-state (get@ [#statement.generation
- #statement.state]
- statement-state)]]
- (wrap [[statement-bundle statement-state]
+ [[directive-bundle directive-state] ?state
+ #let [generation-state (get@ [#directive.generation
+ #directive.state]
+ directive-state)]]
+ (wrap [[directive-bundle directive-state]
(..runner platform generation-state)
(..definer platform generation-state)])))))