diff options
Diffstat (limited to 'stdlib/source/poly')
| -rw-r--r-- | stdlib/source/poly/lux/abstract/equivalence.lux | 16 | ||||
| -rw-r--r-- | stdlib/source/poly/lux/data/format/json.lux | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux index 7db8d5c13..90a74a93e 100644 --- a/stdlib/source/poly/lux/abstract/equivalence.lux +++ b/stdlib/source/poly/lux/abstract/equivalence.lux @@ -14,7 +14,7 @@ ["%" format {"+" format}]] [collection ["[0]" list ("[1]#[0]" monad)] - ["[0]" row] + ["[0]" sequence] ["[0]" array] ["[0]" queue] ["[0]" set] @@ -72,13 +72,13 @@ (in (` (: (~ (@Equivalence inputT)) (<eq> (~ argC))))))] - [.Maybe (~! maybe.equivalence)] - [.List (~! list.equivalence)] - [row.Row (~! row.equivalence)] - [array.Array (~! array.equivalence)] - [queue.Queue (~! queue.equivalence)] - [set.Set (~! set.equivalence)] - [tree.Tree (~! tree.equivalence)] + [.Maybe (~! maybe.equivalence)] + [.List (~! list.equivalence)] + [sequence.Sequence (~! sequence.equivalence)] + [array.Array (~! array.equivalence)] + [queue.Queue (~! queue.equivalence)] + [set.Set (~! set.equivalence)] + [tree.Tree (~! tree.equivalence)] )) (do ! [[_ _ valC] (<type>.applied ($_ <>.and diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux index 964d7918b..b947e4ea9 100644 --- a/stdlib/source/poly/lux/data/format/json.lux +++ b/stdlib/source/poly/lux/data/format/json.lux @@ -16,7 +16,7 @@ ["%" format {"+" format}]] [collection ["[0]" list ("[1]#[0]" monad)] - ["[0]" row {"+" row}] + ["[0]" sequence {"+" sequence}] ["[0]" dictionary]]] [macro [syntax {"+" syntax:}] @@ -59,8 +59,8 @@ (def: (encoded input) (let [high (|> input (i64.and high_mask) (i64.right_shifted 32)) low (i64.and low_mask input)] - {/.#Array (row (|> high .int int.frac {/.#Number}) - (|> low .int int.frac {/.#Number}))})) + {/.#Array (sequence (|> high .int int.frac {/.#Number}) + (|> low .int int.frac {/.#Number}))})) (def: decoded (</>.result (</>.array (do <>.monad @@ -162,7 +162,7 @@ (<type>.exactly .List) encoded))] (in (` (: (~ (@JSON#encoded inputT)) - (|>> ((~! list#each) (~ =sub=)) ((~! row.of_list)) {/.#Array}))))) + (|>> ((~! list#each) (~ =sub=)) ((~! sequence.of_list)) {/.#Array}))))) (do ! [.let [g!_ (code.local_symbol "_______") g!input (code.local_symbol "_______input")] |