diff options
Diffstat (limited to 'stdlib/source/specification/compositor')
4 files changed, 27 insertions, 25 deletions
diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux index 7cbd5884b..4db867513 100644 --- a/stdlib/source/specification/compositor/analysis/type.lux +++ b/stdlib/source/specification/compositor/analysis/type.lux @@ -23,8 +23,8 @@ (def: (check-success+ expander state extension params output-type) (-> Expander State+ Text (List Code) Type Bit) (|> (analysis/scope.with-scope "" - (analysis/type.with-type output-type - (analysis.phase expander (` ((~ (code.text extension)) (~+ params)))))) + (analysis/type.with-type output-type + (analysis.phase expander (` ((~ (code.text extension)) (~+ params)))))) (phase.run state) (case> (#try.Success _) true @@ -38,9 +38,9 @@ (~~ (template [<random> <type> <code>] [(do r.monad [value <random>] - (wrap [(` <type>) - <type> - (<code> value)]))] + (in [(` <type>) + <type> + (<code> value)]))] [r.bit (0 #0 "#Bit" (0 #0)) code.bit] [r.nat (0 #0 "#I64" (0 #1 (0 #0 "#Nat" (0 #0)) (0 #0))) code.nat] diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux index ed3b53f30..33268ecde 100644 --- a/stdlib/source/specification/compositor/common.lux +++ b/stdlib/source/specification/compositor/common.lux @@ -71,11 +71,11 @@ Definer])))) (do io.monad [?state (platform.initialize target expander analysis-bundle platform generation-bundle directive-bundle program extender)] - (wrap (do try.monad - [[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)]))))) + (in (do try.monad + [[directive-bundle directive-state] ?state + #let [generation-state (get@ [#directive.generation + #directive.state] + directive-state)]] + (in [[directive-bundle directive-state] + (..runner platform generation-state) + (..definer platform generation-state)]))))) diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux index 81e6f5988..d18d6b461 100644 --- a/stdlib/source/specification/compositor/generation/case.lux +++ b/stdlib/source/specification/compositor/generation/case.lux @@ -52,13 +52,13 @@ (`` ($_ r.either (do r.monad [value r.i64] - (wrap [(synthesis.i64 value) - synthesis.path/pop])) + (in [(synthesis.i64 value) + synthesis.path/pop])) (~~ (template [<gen> <synth> <path>] [(do r.monad [value <gen>] - (wrap [(<synth> value) - (<path> value)]))] + (in [(<synth> value) + (<path> value)]))] [r.bit synthesis.bit synthesis.path/bit] [r.i64 synthesis.i64 synthesis.path/i64] @@ -78,7 +78,7 @@ (synthesis.member/right idx) (synthesis.member/left idx)) subP)]] - (wrap [caseS caseP])) + (in [caseS caseP])) (do {! r.monad} [size ..size idx (|> r.nat (\ ! map (n.% size))) @@ -93,7 +93,7 @@ (synthesis.side/right idx) (synthesis.side/left idx)) subP)]] - (wrap [caseS caseP])) + (in [caseS caseP])) )))) (def: (let-spec run) diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux index 6d0f8d541..61f6d6656 100644 --- a/stdlib/source/specification/compositor/generation/function.lux +++ b/stdlib/source/specification/compositor/generation/function.lux @@ -24,7 +24,9 @@ [// [common (#+ Runner)]]]) -(def: max-arity Arity 10) +(def: max-arity + Arity + 10) (def: arity (Random Arity) @@ -39,11 +41,11 @@ (do r.monad [arity ..arity local (..local arity)] - (wrap [arity local - (synthesis.function/abstraction - {#synthesis.environment (list) - #synthesis.arity arity - #synthesis.body (synthesis.variable/local local)})]))) + (in [arity local + (synthesis.function/abstraction + {#synthesis.environment (list) + #synthesis.arity arity + #synthesis.body (synthesis.variable/local local)})]))) (def: #export (spec run) (-> Runner Test) |