From a4847190df926d35f7ece97da50a2a8b1462a24f Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 28 Jul 2022 02:44:45 -0400 Subject: Now statically resolving values from globals in pattern-matching. --- stdlib/source/test/lux/control/parser.lux | 28 +++++++++++----------- stdlib/source/test/lux/data/binary.lux | 8 +++---- .../lux/data/collection/dictionary/ordered.lux | 8 +++---- stdlib/source/test/lux/data/format/json.lux | 4 ++-- stdlib/source/test/lux/data/format/xml.lux | 2 +- stdlib/source/test/lux/data/text.lux | 6 ++--- stdlib/source/test/lux/data/text/regex.lux | 2 +- stdlib/source/test/lux/ffi.jvm.lux | 16 +++++++++---- stdlib/source/test/lux/ffi.old.lux | 16 +++++++++---- stdlib/source/test/lux/meta.lux | 4 ++-- .../lux/meta/compiler/language/lux/analysis.lux | 4 ++-- .../meta/compiler/language/lux/phase/analysis.lux | 20 ++++++++-------- .../language/lux/phase/analysis/complex.lux | 12 +++++----- .../language/lux/phase/analysis/reference.lux | 20 ++++++++-------- .../lux/meta/compiler/language/lux/synthesis.lux | 4 ++-- .../test/lux/meta/compiler/meta/cache/purge.lux | 16 ++++++------- stdlib/source/test/lux/meta/symbol.lux | 2 +- stdlib/source/test/lux/meta/target/jvm.lux | 26 ++++++++++---------- stdlib/source/test/lux/meta/type.lux | 23 +++++++++++------- stdlib/source/test/lux/meta/type/check.lux | 4 ++-- 20 files changed, 121 insertions(+), 104 deletions(-) (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux index 31b5ac78a..487f9984b 100644 --- a/stdlib/source/test/lux/control/parser.lux +++ b/stdlib/source/test/lux/control/parser.lux @@ -35,34 +35,34 @@ (text#= expected actual) _ - #0)) + false)) (def (enforced? parser input) (All (_ s) (-> (Parser s Any) s Bit)) (case (/.result parser input) {try.#Success [_ []]} - #1 + true _ - #0)) + false)) (def (found? parser input) (All (_ s) (-> (Parser s Bit) s Bit)) (case (/.result parser input) - {try.#Success [_ #1]} - #1 + {try.#Success [_ .true]} + true _ - #0)) + false)) (def (fails? input) (All (_ a) (-> (Try a) Bit)) (case input {try.#Failure _} - #1 + true _ - #0)) + false)) (def match (syntax (_ [pattern .any @@ -73,7 +73,7 @@ (, then) (,' _) - #0)))))) + false)))))) (def combinators_0 Test @@ -93,7 +93,7 @@ (|> (list (code.int (.int expected0))) (/.result (/.maybe .nat)) (match {.#None} - #1)))) + true)))) (_.coverage [/.some] (and (|> (list#each code.nat expected+) (/.result (/.some .nat)) @@ -102,7 +102,7 @@ (|> (list#each (|>> .int code.int) expected+) (/.result (/.some .nat)) (match {.#End} - #1)))) + true)))) (_.coverage [/.many] (and (|> (list#each code.nat expected+) (/.result (/.many .nat)) @@ -163,7 +163,7 @@ fails?) (|> (list (code.bit not0)) (/.result (/.not .nat)) - (match [] #1)))) + (match [] true)))) ))) (def combinators_1 @@ -365,10 +365,10 @@ (should_fail failure)))) (_.coverage [/.assertion] (and (|> (list (code.bit #1) (code.int +123)) - (/.result (/.assertion assertion #1)) + (/.result (/.assertion assertion true)) (match [] true)) (|> (list (code.bit #1) (code.int +123)) - (/.result (/.assertion assertion #0)) + (/.result (/.assertion assertion false)) fails?))) ..combinators_0 ..combinators_1 diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux index c43caf3a4..c6514691e 100644 --- a/stdlib/source/test/lux/data/binary.lux +++ b/stdlib/source/test/lux/data/binary.lux @@ -362,7 +362,7 @@ post \\parser.end?] (in (and (not pre) post)))) - (!expect {try.#Success #1})))) + (!expect {try.#Success .true})))) (do [! random.monad] [to_read (at ! each (n.% (++ ..segment_size)) random.nat) data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] @@ -377,7 +377,7 @@ (in (and (n.= 0 start) (n.= to_read offset) (n.= ..segment_size nothing_left))))) - (!expect {try.#Success #1})))) + (!expect {try.#Success .true})))) (do [! random.monad] [to_read (at ! each (n.% (++ ..segment_size)) random.nat) data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] @@ -391,7 +391,7 @@ (in (and (n.= ..segment_size (n.+ to_read remaining)) (n.= 0 nothing_left))))) - (!expect {try.#Success #1})))) + (!expect {try.#Success .true})))) ..size ..binary ..utf8 @@ -589,7 +589,7 @@ (at (list.equivalence n.equivalence) = binary_vals slice_vals) _ - #0)))) + false)))) (_.coverage [/.slice_out_of_bounds] (and (throws? /.slice_out_of_bounds (/.slice size size sample)) (let [verdict (throws? /.slice_out_of_bounds (/.slice offset size sample))] diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 24f9415b8..5cb3bc1c1 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -76,23 +76,23 @@ (_.coverage [/.min] (case [(/.min sample) (list.head sorted_values)] [{.#None} {.#None}] - #1 + true [{.#Some reference} {.#Some sample}] (n.= reference sample) _ - #0)) + false)) (_.coverage [/.max] (case [(/.max sample) (list.last sorted_values)] [{.#None} {.#None}] - #1 + true [{.#Some reference} {.#Some sample}] (n.= reference sample) _ - #0)) + false)) (_.coverage [/.entries] (list#= (/.entries sample) sorted_pairs)) diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index e057efcfe..3fffb74a1 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -89,9 +89,9 @@ (at = expected actual))))) (_.coverage [] (and (|> (\\parser.result ( expected) { expected}) - (!expect {try.#Success #1})) + (!expect {try.#Success .true})) (|> (\\parser.result ( expected) { dummy}) - (!expect {try.#Success #0})))) + (!expect {try.#Success .false})))) (_.coverage [] (and (|> (\\parser.result ( expected) { expected}) (!expect {try.#Success _})) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index 72a4a5665..c1d456cf1 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -90,7 +90,7 @@ _ \\parser.any] (in (symbol#= expected actual))) (list {/.#Node expected (dictionary.empty symbol.hash) (list)})) - (!expect {try.#Success #1})))) + (!expect {try.#Success .true})))) (do [! random.monad] [expected ..random_tag] (_.coverage [\\parser.node] diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 8aead4f9b..66655823f 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -551,7 +551,7 @@ _ \\parser.any] (in (and (/#= input pre) (/#= right post))))) - (!expect {try.#Success #1})))) + (!expect {try.#Success .true})))) (do [! random.monad] [left (random.unicode 1) right (random.unicode 1) @@ -889,7 +889,7 @@ (/#= sample (/.together (list _l _r)))) _ - #0))) + false))) (_.coverage [/.clip /.clip_since] (|> [(/.clip 0 sizeL sample) (/.clip sizeL (nat.- sizeL (/.size sample)) sample) @@ -903,7 +903,7 @@ (/#= sample _f)) _ - #0))) + false))) )) (do [! random.monad] [sizeP bounded_size diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux index c057aeaf0..661222696 100644 --- a/stdlib/source/test/lux/data/text/regex.lux +++ b/stdlib/source/test/lux/data/text/regex.lux @@ -32,7 +32,7 @@ (text#= parsed input) _ - #0))) + false))) (def (text_should_pass test regex input) (-> Text (Parser Text) Text Bit) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index b03264c22..7c047318d 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -173,7 +173,7 @@ (case (/.as java/lang/Object sample) {.#Some _} true {.#None} false) (case (/.as java/lang/Object (/.null)) {.#Some _} false {.#None} true))) (_.coverage [/.synchronized] - (/.synchronized sample #1)) + (/.synchronized sample true)) (_.coverage [/.class_for] (text#= "java.lang.Class" (/.of_string (java/lang/Class::getName (/.class_for java/lang/Class))))) (_.coverage [/.null /.null?] @@ -183,13 +183,19 @@ (and (|> (/.??? (/.null)) (is (Maybe java/lang/Object)) (pipe.case - {.#None} #1 - {.#Some _} #0)) + {.#None} + true + + {.#Some _} + false)) (|> (/.??? sample) (is (Maybe java/lang/Object)) (pipe.case - {.#Some _} #1 - {.#None} #0)))) + {.#Some _} + true + + {.#None} + false)))) (_.coverage [/.!!!] (and (|> (/.??? (/.null)) /.!!! diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux index e16dbd84d..117207e57 100644 --- a/stdlib/source/test/lux/ffi.old.lux +++ b/stdlib/source/test/lux/ffi.old.lux @@ -184,12 +184,18 @@ (_.coverage [/.???] (and (|> (is (Maybe java/lang/Object) (/.??? (/.null))) (pipe.case - {.#None} #1 - _ #0)) + {.#None} + true + + _ + false)) (|> (is (Maybe java/lang/Object) (/.??? sample)) (pipe.case - {.#Some _} #1 - _ #0)))) + {.#Some _} + true + + _ + false)))) (_.coverage [/.!!!] (and (/.null? (/.!!! (/.??? (/.null)))) (not (/.null? (/.!!! (/.??? sample)))))) @@ -208,7 +214,7 @@ (case (/.as java/lang/Object sample) {.#Some _} true {.#None} false) (case (/.as java/lang/Object (/.null)) {.#Some _} false {.#None} true))) (_.coverage [/.synchronized] - (/.synchronized sample #1)) + (/.synchronized sample true)) (_.coverage [/.class_for /.import] (|> (/.class_for java/lang/Class) java/lang/Class::getName diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index 7bcecdd8a..3cd03f84c 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -297,10 +297,10 @@ (_.coverage [/.module_exists?] (and (|> (/.module_exists? expected_current_module) (/.result expected_lux) - (!expect {try.#Success #1})) + (!expect {try.#Success .true})) (|> (/.module_exists? dummy_module) (/.result expected_lux) - (!expect {try.#Success #0})))) + (!expect {try.#Success .false})))) (_.coverage [/.modules] (|> /.modules (/.result expected_lux) diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux index 09c976004..6a18983f0 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux @@ -140,13 +140,13 @@ [dummy random.bit] (_.coverage [\\parser.end?] (and (|> (\\parser.result \\parser.end? (list)) - (!expect {try.#Success #1})) + (!expect {try.#Success .true})) (|> (\\parser.result (do <>.monad [verdict \\parser.end? _ \\parser.bit] (in verdict)) (list (/.bit dummy))) - (!expect {try.#Success #0}))))) + (!expect {try.#Success .false}))))) (do [! random.monad] [dummy random.bit] (_.coverage [\\parser.end] diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux index 91614f4b2..579356065 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis.lux @@ -125,11 +125,11 @@ can_analyse_unary! (`` (and (|> (do phase.monad - [it (|> (code.variant (list (code.nat 0) (code.bit #0) (` []))) + [it (|> (code.variant (list (code.nat 0) (code.bit false) (` []))) (/.phase ..expander archive.empty) (//type.expecting :variant:))] (in (case it - (//.variant [0 #0 (//.unit)]) + (//.variant [0 .false (//.unit)]) true _ @@ -167,11 +167,11 @@ can_analyse_nullary! (|> (do phase.monad [.let [:either: (Or .Any :record:)] - it (|> (code.variant (list (code.nat 0) (code.bit #0))) + it (|> (code.variant (list (code.nat 0) (code.bit false))) (/.phase ..expander archive.empty) (//type.expecting :either:))] (in (case it - (//.variant [0 #0 (//.unit)]) + (//.variant [0 .false (//.unit)]) true _ @@ -243,7 +243,7 @@ (in (and (type#= :variant: :it:) (case it - (//.variant [0 #0 (//.unit)]) + (//.variant [0 .false (//.unit)]) true _ @@ -293,7 +293,7 @@ (in (and (type#= :either: :it:) (case it - (//.variant [0 #0 (//.unit)]) + (//.variant [0 .false (//.unit)]) true _ @@ -739,9 +739,9 @@ (in (and (type#= .Frac :it:) (case it {//.#Case (//.bit bit/?) - [[//.#when (//pattern.bit #0) + [[//.#when (//pattern.bit .false) //.#then (//.frac false/?)] - (list [//.#when (//pattern.bit #1) + (list [//.#when (//pattern.bit .true) //.#then (//.frac true/?)])]} (and (same? bit/0 bit/?) (same? frac/0 false/?) @@ -809,9 +809,9 @@ (in (and (type#= .Frac :it:) (case it {//.#Case (//.tuple (list (//.bit bit/?) (//.nat nat/?))) - [[//.#when (//pattern.tuple (list (//pattern.bit #0) (//pattern.bind 0))) + [[//.#when (//pattern.tuple (list (//pattern.bit .false) (//pattern.bind 0))) //.#then (//.frac false/?)] - (list [//.#when (//pattern.tuple (list (//pattern.bit #1) (//pattern.bind 0))) + (list [//.#when (//pattern.tuple (list (//pattern.bit .true) (//pattern.bind 0))) //.#then (//.frac true/?)])]} (and (same? bit/0 bit/?) (same? nat/0 nat/?) diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux index 46232997f..9e9004371 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/complex.lux @@ -180,12 +180,12 @@ (//phase#each product.right) (//phase.result state) (try.else false)) - (and (sum? (type_literal (Maybe tagT)) 0 #0 (` [])) - (sum? (type_literal (Maybe tagT)) 0 #1 tagC)) - (and (sum? (type_literal (All (_ a) (Maybe a))) 0 #0 (` [])) - (not (sum? (type_literal (All (_ a) (Maybe a))) 0 #1 tagC))) - (and (sum? (type_literal (Ex (_ a) (Maybe a))) 0 #0 (` [])) - (sum? (type_literal (Ex (_ a) (Maybe a))) 0 #1 tagC))))) + (and (sum? (type_literal (Maybe tagT)) 0 false (` [])) + (sum? (type_literal (Maybe tagT)) 0 true tagC)) + (and (sum? (type_literal (All (_ a) (Maybe a))) 0 false (` [])) + (not (sum? (type_literal (All (_ a) (Maybe a))) 0 true tagC))) + (and (sum? (type_literal (Ex (_ a) (Maybe a))) 0 false (` [])) + (sum? (type_literal (Ex (_ a) (Maybe a))) 0 true tagC))))) (_.for [/.cannot_analyse_variant] (let [failure? (is (All (_ a) (-> (Exception a) (//analysis.Operation Any) Bit)) (function (_ exception analysis) diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux index 7a209e6cf..6cc8db551 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/phase/analysis/reference.lux @@ -83,7 +83,7 @@ can_find_local_definition! (|> (do //phase.monad - [_ (//module.define expected_name {.#Definition [#0 expected_type []]})] + [_ (//module.define expected_name {.#Definition [false expected_type []]})] (/.reference "" ["" expected_name])) //type.inferring (//module.with 0 expected_module) @@ -102,7 +102,7 @@ can_find_foreign_definition! (|> (do //phase.monad [_ (//module.with 0 import - (//module.define expected_name {.#Definition [#1 expected_type []]})) + (//module.define expected_name {.#Definition [true expected_type []]})) _ (//module.import import)] (/.reference "" [import expected_name])) //type.inferring @@ -122,7 +122,7 @@ can_find_alias! (|> (do //phase.monad [_ (//module.with 0 import - (//module.define expected_name {.#Definition [#1 expected_type []]})) + (//module.define expected_name {.#Definition [true expected_type []]})) _ (//module.import import) _ (//module.define expected_name {.#Alias [import expected_name]})] (/.reference "" [expected_module expected_name])) @@ -142,7 +142,7 @@ can_find_type! (|> (do //phase.monad - [_ (//module.define expected_name {.#Type [#0 expected_type + [_ (//module.define expected_name {.#Type [false expected_type (if record? {.#Right [expected_label (list)]} {.#Left [expected_label (list)]})]})] @@ -182,8 +182,8 @@ (//phase.result state) (exception.otherwise (text.contains? (the exception.#label /.foreign_module_has_not_been_imported))) )))] - (and (scenario expected_type {.#Definition [#1 expected_type []]}) - (scenario .Type {.#Type [#1 expected_type + (and (scenario expected_type {.#Definition [true expected_type []]}) + (scenario .Type {.#Type [true expected_type (if record? {.#Right [expected_label (list)]} {.#Left [expected_label (list)]})]})))) @@ -201,8 +201,8 @@ (//phase.result state) (exception.otherwise (text.contains? (the exception.#label /.definition_has_not_been_exported))) )))] - (and (scenario expected_type {.#Definition [#0 expected_type []]}) - (scenario .Type {.#Type [#0 expected_type + (and (scenario expected_type {.#Definition [false expected_type []]}) + (scenario .Type {.#Type [false expected_type (if record? {.#Right [expected_label (list)]} {.#Left [expected_label (list)]})]})))) @@ -219,6 +219,6 @@ (//phase#each product.right) (//phase.result state) (exception.otherwise (text.contains? (the exception.#label /.labels_are_not_definitions))))))] - (and (scenario expected_type {.#Tag [#1 expected_type (list) 0]}) - (scenario expected_type {.#Slot [#1 expected_type (list) 0]})))) + (and (scenario expected_type {.#Tag [true expected_type (list) 0]}) + (scenario expected_type {.#Slot [true expected_type (list) 0]})))) )))) diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux b/stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux index 2bfe91fca..4308c95bb 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/synthesis.lux @@ -195,9 +195,9 @@ [dummy (at ! each (|>> synthesis.i64) random.i64)] (_.coverage [\\parser.end?] (and (|> (\\parser.result \\parser.end? (list)) - (!expect {try.#Success #1})) + (!expect {try.#Success .true})) (|> (\\parser.result (<>.before \\parser.any \\parser.end?) (list dummy)) - (!expect {try.#Success #0}))))) + (!expect {try.#Success .false}))))) (_.for [\\parser.cannot_parse] (all _.and ..simple diff --git a/stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux b/stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux index 02d6402fb..c5bc1dfb5 100644 --- a/stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux +++ b/stdlib/source/test/lux/meta/compiler/meta/cache/purge.lux @@ -83,10 +83,10 @@ archive.#output (sequence.sequence) archive.#registry registry.empty]]))] (and (let [cache (is (List /.Cache) - (list [#1 name/0 id/0 module/0 registry.empty]))] + (list [true name/0 id/0 module/0 registry.empty]))] (dictionary.empty? (/.purge cache order))) (let [cache (is (List /.Cache) - (list [#0 name/0 id/0 module/0 registry.empty]))] + (list [false name/0 id/0 module/0 registry.empty]))] (dictionary.key? (/.purge cache order) name/0)))) (let [order (is (dependency.Order Nat) (list [name/0 id/0 @@ -98,19 +98,19 @@ archive.#output (sequence.sequence) archive.#registry registry.empty]]))] (and (let [cache (is (List /.Cache) - (list [#1 name/0 id/0 module/0 registry.empty] - [#1 name/1 id/1 module/1 registry.empty])) + (list [true name/0 id/0 module/0 registry.empty] + [true name/1 id/1 module/1 registry.empty])) purge (/.purge cache order)] (dictionary.empty? purge)) (let [cache (is (List /.Cache) - (list [#1 name/0 id/0 module/0 registry.empty] - [#0 name/1 id/1 module/1 registry.empty])) + (list [true name/0 id/0 module/0 registry.empty] + [false name/1 id/1 module/1 registry.empty])) purge (/.purge cache order)] (and (not (dictionary.key? (/.purge cache order) name/0)) (dictionary.key? (/.purge cache order) name/1))) (let [cache (is (List /.Cache) - (list [#0 name/0 id/0 module/0 registry.empty] - [#1 name/1 id/1 module/1 registry.empty])) + (list [false name/0 id/0 module/0 registry.empty] + [true name/1 id/1 module/1 registry.empty])) purge (/.purge cache order)] (and (dictionary.key? (/.purge cache order) name/0) (dictionary.key? (/.purge cache order) name/1))))))) diff --git a/stdlib/source/test/lux/meta/symbol.lux b/stdlib/source/test/lux/meta/symbol.lux index 8644c6057..6972cd346 100644 --- a/stdlib/source/test/lux/meta/symbol.lux +++ b/stdlib/source/test/lux/meta/symbol.lux @@ -53,7 +53,7 @@ (_.property "Encoding a symbol without a module component results in text equal to the short of the symbol." (if (text.empty? module1) (same? short1 (at /.codec encoded symbol1)) - #1)))) + true)))) (_.coverage [/.separator] (let [it (at /.codec encoded symbol1)] diff --git a/stdlib/source/test/lux/meta/target/jvm.lux b/stdlib/source/test/lux/meta/target/jvm.lux index d526d3917..28fff6e38 100644 --- a/stdlib/source/test/lux/meta/target/jvm.lux +++ b/stdlib/source/test/lux/meta/target/jvm.lux @@ -133,7 +133,7 @@ (list) (list (/method.method ..method_modifier method_name - #0 (/type.method [(list) (list) ..$Object (list)]) + false (/type.method [(list) (list) ..$Object (list)]) (list) {.#Some (do /.monad [_ bytecode] @@ -877,11 +877,11 @@ {.#None} (/name.internal "java.lang.Object") (list) - (list (/field.field /field.static class_field #0 /type.long (sequence.sequence)) - (/field.field /field.public object_field #0 /type.long (sequence.sequence))) + (list (/field.field /field.static class_field false /type.long (sequence.sequence)) + (/field.field /field.public object_field false /type.long (sequence.sequence))) (list (/method.method /method.private constructor - #0 constructor::type + false constructor::type (list) {.#Some (do /.monad [_ /.aload_0 @@ -896,7 +896,7 @@ /method.public /method.static) static_method - #0 (/type.method [(list) (list) ..$Long (list)]) + false (/type.method [(list) (list) ..$Long (list)]) (list) {.#Some (do /.monad [_ (/.new $Self) @@ -1359,14 +1359,14 @@ (list) (list (/method.method ..method_modifier primitive_method_name - #0 primitive_method_type + false primitive_method_type (list) {.#Some (do /.monad [_ ((the #literal primitive) expected)] return)}) (/method.method ..method_modifier object_method_name - #0 (/type.method [(list) (list) (the #boxed primitive) (list)]) + false (/type.method [(list) (list) (the #boxed primitive) (list)]) (list) {.#Some (do /.monad [_ (/.invokestatic $Self primitive_method_name primitive_method_type) @@ -1645,7 +1645,7 @@ (function (_ name value) (/method.method /method.public name - #0 method::type + false method::type (list) {.#Some (do /.monad [_ (..$Long::literal value)] @@ -1658,7 +1658,7 @@ (list) (list) (list (/method.method (all /modifier#composite /method.public /method.abstract) - interface_method #0 method::type (list) {.#None})) + interface_method false method::type (list) {.#None})) (sequence.sequence)) try.trusted (binary.result /class.format)) @@ -1670,7 +1670,7 @@ (list) (list (/method.method /method.public "" - #0 constructor::type + false constructor::type (list) {.#Some (do /.monad [_ /.aload_0 @@ -1679,7 +1679,7 @@ (method inherited_method part0) (method overriden_method fake_part2) (/method.method (all /modifier#composite /method.public /method.abstract) - abstract_method #0 method::type (list) {.#None})) + abstract_method false method::type (list) {.#None})) (sequence.sequence)) try.trusted (binary.result /class.format)) @@ -1696,7 +1696,7 @@ (list) (list (/method.method /method.public "" - #0 constructor::type + false constructor::type (list) {.#Some (do /.monad [_ /.aload_0 @@ -1710,7 +1710,7 @@ /method.public /method.static) static_method - #0 (/type.method [(list) (list) ..$Long (list)]) + false (/type.method [(list) (list) ..$Long (list)]) (list) {.#Some (do /.monad [_ (/.new $Concrete) diff --git a/stdlib/source/test/lux/meta/type.lux b/stdlib/source/test/lux/meta/type.lux index f7e11f9f2..79432b2bc 100644 --- a/stdlib/source/test/lux/meta/type.lux +++ b/stdlib/source/test/lux/meta/type.lux @@ -402,10 +402,10 @@ (random.only (function (_ type) (case type (^.or {.#Sum _} {.#Product _}) - #0 + false _ - #1))) + true))) (list.repeated size) (monad.all !)) .let [(open "/#[0]") /.equivalence @@ -423,13 +423,18 @@ )) ))) (_.coverage [/.applied] - (and (<| (maybe.else #0) + (and (<| (maybe.else false) (do maybe.monad [partial (/.applied (list Bit) Ann) full (/.applied (list Int) partial)] (in (at /.equivalence = full {.#Product Bit Int})))) (|> (/.applied (list Bit) Text) - (pipe.case {.#None} #1 _ #0)))) + (pipe.case + {.#None} + true + + _ + false)))) (do [! random.monad] [size (|> random.nat (at ! each (n.% 3))) members (monad.all ! (list.repeated size (..random 0))) @@ -437,10 +442,10 @@ (random.only (function (_ type) (case type (^.or {.#Function _} {.#Apply _}) - #0 + false _ - #1)))) + true)))) .let [(open "/#[0]") /.equivalence (open "list#[0]") (list.equivalence /.equivalence)]] (all _.and @@ -458,10 +463,10 @@ (random.only (function (_ type) (case type (^.or {.#UnivQ _} {.#ExQ _}) - #0 + false _ - #1)))) + true)))) .let [(open "/#[0]") /.equivalence]] (`` (all _.and (,, (with_template [ ] @@ -487,7 +492,7 @@ (not (text#= array.primitive name)) _ - #1)))) + true)))) .let [(open "/#[0]") /.equivalence]] (all _.and (_.coverage [/.array /.flat_array] diff --git a/stdlib/source/test/lux/meta/type/check.lux b/stdlib/source/test/lux/meta/type/check.lux index a8d6bfb34..e1974368d 100644 --- a/stdlib/source/test/lux/meta/type/check.lux +++ b/stdlib/source/test/lux/meta/type/check.lux @@ -78,7 +78,7 @@ (list.every? valid_type? params) {.#Ex id} - #1 + true (^.with_template [] [{ left right} @@ -90,7 +90,7 @@ (valid_type? type') _ - #0)) + false)) (def injection (Injection (All (_ a) (/.Check a))) -- cgit v1.2.3