diff options
Diffstat (limited to 'lux-jvm/source/luxc/lang/directive/jvm.lux')
| -rw-r--r-- | lux-jvm/source/luxc/lang/directive/jvm.lux | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux index a7314b0dc..2c6577ae1 100644 --- a/lux-jvm/source/luxc/lang/directive/jvm.lux +++ b/lux-jvm/source/luxc/lang/directive/jvm.lux @@ -18,9 +18,9 @@ ["%" format (#+ format)]] [collection [array (#+ Array)] - ["." list ("#\." fold functor monoid)] + ["." list ("#\." mix functor monoid)] ["." dictionary (#+ Dictionary)] - ["." row (#+ Row) ("#\." functor fold)]]] + ["." row (#+ Row) ("#\." functor mix)]]] [math [number ["." nat]]] @@ -442,18 +442,18 @@ (#/.TABLESWITCH min max default labels) (let [[mapping default] (..relabel [mapping default]) - [mapping labels] (list\fold (function (_ input [mapping output]) - (let [[mapping input] (..relabel [mapping input])] - [mapping (list& input output)])) - [mapping (list)] labels)] + [mapping labels] (list\mix (function (_ input [mapping output]) + (let [[mapping input] (..relabel [mapping input])] + [mapping (list& input output)])) + [mapping (list)] labels)] [mapping (#/.TABLESWITCH min max default (list.reversed labels))]) (#/.LOOKUPSWITCH default keys+labels) (let [[mapping default] (..relabel [mapping default]) - [mapping keys+labels] (list\fold (function (_ [expected input] [mapping output]) - (let [[mapping input] (..relabel [mapping input])] - [mapping (list& [expected input] output)])) - [mapping (list)] keys+labels)] + [mapping keys+labels] (list\mix (function (_ [expected input] [mapping output]) + (let [[mapping input] (..relabel [mapping input])] + [mapping (list& [expected input] output)])) + [mapping (list)] keys+labels)] [mapping (#/.LOOKUPSWITCH default (list.reversed keys+labels))]) )) @@ -515,11 +515,11 @@ (def: (relabel_bytecode [mapping bytecode]) (Re_labeler (/.Bytecode Inst)) - (row\fold (function (_ input [mapping output]) - (let [[mapping input'] (..relabel_instruction [mapping input])] - [mapping (row.suffix input' output)])) - [mapping (row.row)] - bytecode)) + (row\mix (function (_ input [mapping output]) + (let [[mapping input'] (..relabel_instruction [mapping input])] + [mapping (row.suffix input' output)])) + [mapping (row.row)] + bytecode)) (def: fresh Mapping @@ -1033,7 +1033,7 @@ [_scope bodyA] (|> arguments' (#.Item [self selfT]) list.reversed - (list\fold scopeA.with_local (analyse archive bodyC)) + (list\mix scopeA.with_local (analyse archive bodyC)) (typeA.with_type returnT) analysis.with_scope)] (in [privacy strict_floating_point? annotations method_tvars exceptions @@ -1063,7 +1063,7 @@ [_scope bodyA] (|> arguments' (#.Item [self selfT]) list.reversed - (list\fold scopeA.with_local (analyse archive bodyC)) + (list\mix scopeA.with_local (analyse archive bodyC)) (typeA.with_type returnT) analysis.with_scope)] (in [[super_name super_tvars] method_name strict_floating_point? annotations @@ -1091,7 +1091,7 @@ [_scope bodyA] (|> arguments' (#.Item [self selfT]) list.reversed - (list\fold scopeA.with_local (analyse archive bodyC)) + (list\mix scopeA.with_local (analyse archive bodyC)) (typeA.with_type returnT) analysis.with_scope)] (in [name privacy final? strict_floating_point? annotations method_tvars @@ -1116,7 +1116,7 @@ returnT (//A.boxed_reflection_return mapping returnJ) [_scope bodyA] (|> arguments' list.reversed - (list\fold scopeA.with_local (analyse archive bodyC)) + (list\mix scopeA.with_local (analyse archive bodyC)) (typeA.with_type returnT) analysis.with_scope)] (in [name privacy strict_floating_point? annotations method_tvars |