diff options
Diffstat (limited to 'stdlib/source/specification/compositor')
-rw-r--r-- | stdlib/source/specification/compositor/generation/case.lux | 18 | ||||
-rw-r--r-- | stdlib/source/specification/compositor/generation/common.lux | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux index c3dbd1835..81042846f 100644 --- a/stdlib/source/specification/compositor/generation/case.lux +++ b/stdlib/source/specification/compositor/generation/case.lux @@ -70,9 +70,9 @@ [subS subP] case .let [unitS (synthesis.text synthesis.unit) caseS (synthesis.tuple - (list.concat (list (list.repeat idx unitS) + (list.concat (list (list.repeated idx unitS) (list subS) - (list.repeat (|> size dec (n.- idx)) unitS)))) + (list.repeated (|> size dec (n.- idx)) unitS)))) caseP ($_ synthesis.path/seq (if (tail? size idx) (synthesis.member/right idx) @@ -204,27 +204,27 @@ _tail_ _item_ _head_ (synthesis.path/bind 5) synthesis.path/pop _tail_ _end_ - ## THEN + ... THEN (synthesis.path/then (synthesis.bit #1))) ($_ synthesis.path/seq (synthesis.path/bind 2) - ## THEN + ... THEN (synthesis.path/then (synthesis.bit #0)))))) (def: special_pattern analysis.Pattern - (let [## [_ (#Tuple (#Item arg args'))] + (let [... [_ (#Tuple (#Item arg args'))] head (<| analysis.pattern/tuple (list (analysis.pattern/bind 2)) analysis.pattern/variant [9 #0] analysis.pattern/variant [0 #1] analysis.pattern/tuple (list (analysis.pattern/bind 3) (analysis.pattern/bind 4))) - ## (#Item body #End) + ... (#Item body #End) tail (<| analysis.pattern/variant [0 #1] analysis.pattern/tuple (list (analysis.pattern/bind 5)) analysis.pattern/variant [0 #0] (analysis.pattern/unit))] - ## (#Item <head> <tail>) + ... (#Item <head> <tail>) (<| analysis.pattern/variant [0 #1] (analysis.pattern/tuple (list head tail))))) @@ -239,10 +239,10 @@ (analysis.bit #1)) ($_ synthesis.path/seq (synthesis.path/bind 2) - ## THEN + ... THEN (synthesis.path/then (synthesis.bit #0))))) -## TODO: Get rid of this ASAP +... TODO: Get rid of this ASAP (def: (special_spec run) (-> Runner Test) ($_ _.and diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux index 1e3d6bb9e..93dd3bba5 100644 --- a/stdlib/source/specification/compositor/generation/common.lux +++ b/stdlib/source/specification/compositor/generation/common.lux @@ -30,7 +30,7 @@ (def: safe (-> Text Text) - (text.replace_all " " "_")) + (text.replaced " " "_")) (def: (bit run) (-> Runner Test) @@ -187,8 +187,8 @@ concatenatedS (#synthesis.Extension "lux text concat" (list sample_lowerS sample_upperS)) pre_rep_once (format sample_lower sample_upper) post_rep_once (format sample_lower sample_alpha) - pre_rep_all (|> (list.repeat sample_size sample_lower) (text.join_with sample_upper)) - post_rep_all (|> (list.repeat sample_size sample_lower) (text.join_with sample_alpha))]] + pre_rep_all (|> sample_lower (list.repeated sample_size) (text.join_with sample_upper)) + post_rep_all (|> sample_lower (list.repeated sample_size) (text.join_with sample_alpha))]] ($_ _.and (_.test "Can compare texts for equality." (and (|> (#synthesis.Extension "lux text =" (list sample_lowerS sample_lowerS)) |