language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 00:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Import Decode by default in all modules

Browse source
This commit is contained in:
Ayaz Hafiz 2022-09-21 10:49:29 -05:00
parent f10c47ec20
commit 06bef34829
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
4 changed files with 81 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/compiler/load_internal/src/file.rs
View file

@ -124,6 +124,14 @@ const MODULE_ENCODE_TYPES: &[(&str, Symbol)] = &[
("EncoderFormatting", Symbol::ENCODE_ENCODERFORMATTING), ("EncoderFormatting", Symbol::ENCODE_ENCODERFORMATTING),
]; ];
const MODULE_DECODE_TYPES: &[(&str, Symbol)] = &[
("DecodeError", Symbol::DECODE_DECODE_ERROR),
("DecodeResult", Symbol::DECODE_DECODE_RESULT),
("Decoder", Symbol::DECODE_DECODER_OPAQUE),
("Decoding", Symbol::DECODE_DECODING),
("DecoderFormatting", Symbol::DECODE_DECODERFORMATTING),
];
macro_rules! log { macro_rules! log {
($($arg:tt)*) => (dbg_do!(ROC_PRINT_LOAD_LOG, println!($($arg)*))) ($($arg:tt)*) => (dbg_do!(ROC_PRINT_LOAD_LOG, println!($($arg)*)))
} }
@ -2249,6 +2257,7 @@ fn update<'a>(
.imported_modules .imported_modules
.insert(ModuleId::LIST, Region::zero()); .insert(ModuleId::LIST, Region::zero());
// ENCODE
header header
.package_qualified_imported_modules .package_qualified_imported_modules
.insert(PackageQualified::Unqualified(ModuleId::ENCODE)); .insert(PackageQualified::Unqualified(ModuleId::ENCODE));
@ -2262,6 +2271,21 @@ fn update<'a>(
.exposed_imports .exposed_imports
.insert(Ident::from(*type_name), (*symbol, Region::zero())); .insert(Ident::from(*type_name), (*symbol, Region::zero()));
} }
// DECODE
header
.package_qualified_imported_modules
.insert(PackageQualified::Unqualified(ModuleId::DECODE));
header
.imported_modules
.insert(ModuleId::DECODE, Region::zero());
for (type_name, symbol) in MODULE_DECODE_TYPES {
header
.exposed_imports
.insert(Ident::from(*type_name), (*symbol, Region::zero()));
}
} }
state state

38
crates/compiler/solve/tests/solve_expr.rs
View file

@ -6392,21 +6392,21 @@ mod solve_expr {
r#" r#"
app "test" provides [myU8] to "./platform" app "test" provides [myU8] to "./platform"
DecodeError : [TooShort, Leftover (List U8)] MDecodeError : [TooShort, Leftover (List U8)]
Decoder val fmt := List U8, fmt -> { result: Result val DecodeError, rest: List U8 } | fmt has DecoderFormatting MDecoder val fmt := List U8, fmt -> { result: Result val MDecodeError, rest: List U8 } | fmt has MDecoderFormatting
Decoding has MDecoding has
decoder : Decoder val fmt | val has Decoding, fmt has DecoderFormatting decoder : MDecoder val fmt | val has MDecoding, fmt has MDecoderFormatting
DecoderFormatting has MDecoderFormatting has
u8 : Decoder U8 fmt | fmt has DecoderFormatting u8 : MDecoder U8 fmt | fmt has MDecoderFormatting
decodeWith : List U8, Decoder val fmt, fmt -> { result: Result val DecodeError, rest: List U8 } | fmt has DecoderFormatting decodeWith : List U8, MDecoder val fmt, fmt -> { result: Result val MDecodeError, rest: List U8 } | fmt has MDecoderFormatting
decodeWith = \lst, (@Decoder doDecode), fmt -> doDecode lst fmt decodeWith = \lst, (@MDecoder doDecode), fmt -> doDecode lst fmt
fromBytes : List U8, fmt -> Result val DecodeError fromBytes : List U8, fmt -> Result val MDecodeError
| fmt has DecoderFormatting, val has Decoding | fmt has MDecoderFormatting, val has MDecoding
fromBytes = \lst, fmt -> fromBytes = \lst, fmt ->
when decodeWith lst decoder fmt is when decodeWith lst decoder fmt is
{ result, rest } -> { result, rest } ->
@ -6415,17 +6415,17 @@ mod solve_expr {
Err e -> Err e Err e -> Err e
Linear := {} has [DecoderFormatting {u8}] Linear := {} has [MDecoderFormatting {u8}]
u8 = @Decoder \lst, @Linear {} -> u8 = @MDecoder \lst, @Linear {} ->
#^^{-1} #^^{-1}
when List.first lst is when List.first lst is
Ok n -> { result: Ok n, rest: List.dropFirst lst } Ok n -> { result: Ok n, rest: List.dropFirst lst }
Err _ -> { result: Err TooShort, rest: [] } Err _ -> { result: Err TooShort, rest: [] }
MyU8 := U8 has [Decoding {decoder}] MyU8 := U8 has [MDecoding {decoder}]
decoder = @Decoder \lst, fmt -> decoder = @MDecoder \lst, fmt ->
#^^^^^^^{-1} #^^^^^^^{-1}
when decodeWith lst u8 fmt is when decodeWith lst u8 fmt is
{ result, rest } -> { result, rest } ->
@ -6436,11 +6436,11 @@ mod solve_expr {
#^^^^{-1} #^^^^{-1}
"# "#
), ),
@r#" @r###"
Linear#u8(11) : Decoder U8 Linear Linear#u8(11) : MDecoder U8 Linear
MyU8#decoder(12) : Decoder MyU8 fmt | fmt has DecoderFormatting MyU8#decoder(12) : MDecoder MyU8 fmt | fmt has MDecoderFormatting
myU8 : Result MyU8 DecodeError myU8 : Result MyU8 MDecodeError
"# "###
) )
} }

60
crates/compiler/test_gen/src/gen_abilities.rs
View file

@ -272,21 +272,21 @@ fn decode() {
r#" r#"
app "test" provides [myU8] to "./platform" app "test" provides [myU8] to "./platform"
DecodeError : [TooShort, Leftover (List U8)] MDecodeError : [TooShort, Leftover (List U8)]
Decoder val fmt := List U8, fmt -> { result: Result val DecodeError, rest: List U8 } | fmt has DecoderFormatting MDecoder val fmt := List U8, fmt -> { result: Result val MDecodeError, rest: List U8 } | fmt has MDecoderFormatting
Decoding has MDecoding has
decoder : Decoder val fmt | val has Decoding, fmt has DecoderFormatting decoder : MDecoder val fmt | val has MDecoding, fmt has MDecoderFormatting
DecoderFormatting has MDecoderFormatting has
u8 : Decoder U8 fmt | fmt has DecoderFormatting u8 : MDecoder U8 fmt | fmt has MDecoderFormatting
decodeWith : List U8, Decoder val fmt, fmt -> { result: Result val DecodeError, rest: List U8 } | fmt has DecoderFormatting decodeWith : List U8, MDecoder val fmt, fmt -> { result: Result val MDecodeError, rest: List U8 } | fmt has MDecoderFormatting
decodeWith = \lst, (@Decoder doDecode), fmt -> doDecode lst fmt decodeWith = \lst, (@MDecoder doDecode), fmt -> doDecode lst fmt
fromBytes : List U8, fmt -> Result val DecodeError fromBytes : List U8, fmt -> Result val MDecodeError
| fmt has DecoderFormatting, val has Decoding | fmt has MDecoderFormatting, val has MDecoding
fromBytes = \lst, fmt -> fromBytes = \lst, fmt ->
when decodeWith lst decoder fmt is when decodeWith lst decoder fmt is
{ result, rest } -> { result, rest } ->
@ -296,17 +296,17 @@ fn decode() {
else Err (Leftover rest) else Err (Leftover rest)
Linear := {} has [DecoderFormatting {u8}] Linear := {} has [MDecoderFormatting {u8}]
u8 = @Decoder \lst, @Linear {} -> u8 = @MDecoder \lst, @Linear {} ->
when List.first lst is when List.first lst is
Ok n -> { result: Ok n, rest: List.dropFirst lst } Ok n -> { result: Ok n, rest: List.dropFirst lst }
Err _ -> { result: Err TooShort, rest: [] } Err _ -> { result: Err TooShort, rest: [] }
MyU8 := U8 has [Decoding {decoder}] MyU8 := U8 has [MDecoding {decoder}]
# impl Decoding for MyU8 # impl MDecoding for MyU8
decoder = @Decoder \lst, fmt -> decoder = @MDecoder \lst, fmt ->
{ result, rest } = decodeWith lst u8 fmt { result, rest } = decodeWith lst u8 fmt
{ result: Result.map result (\n -> @MyU8 n), rest } { result: Result.map result (\n -> @MyU8 n), rest }
@ -743,7 +743,7 @@ fn decode_use_stdlib() {
indoc!( indoc!(
r#" r#"
app "test" app "test"
imports [Decode.{ Decoding }, Json] imports [Json]
provides [main] to "./platform" provides [main] to "./platform"
MyNum := U8 has [Decoding {decoder: myDecoder}] MyNum := U8 has [Decoding {decoder: myDecoder}]
@ -774,7 +774,7 @@ fn decode_use_stdlib_json_list() {
indoc!( indoc!(
r#" r#"
app "test" app "test"
imports [Decode.{ Decoding }, Json] imports [Json]
provides [main] to "./platform" provides [main] to "./platform"
MyNumList := List U8 has [Decoding {decoder: myDecoder}] MyNumList := List U8 has [Decoding {decoder: myDecoder}]
@ -817,7 +817,7 @@ mod decode_immediate {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "\"foo\"" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "\"foo\"" |> Decode.fromBytes Json.fromUtf8 is
@ -838,7 +838,7 @@ mod decode_immediate {
assert_evals_to!( assert_evals_to!(
&format!(indoc!( &format!(indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Num.toStr {}{} |> Str.toUtf8 |> Decode.fromBytes Json.fromUtf8 is when Num.toStr {}{} |> Str.toUtf8 |> Decode.fromBytes Json.fromUtf8 is
@ -876,7 +876,7 @@ mod decode_immediate {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Num.toStr 17.23dec |> Str.toUtf8 |> Decode.fromBytes Json.fromUtf8 is when Num.toStr 17.23dec |> Str.toUtf8 |> Decode.fromBytes Json.fromUtf8 is
@ -896,7 +896,7 @@ fn decode_list_of_strings() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "[\"a\",\"b\",\"c\"]" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "[\"a\",\"b\",\"c\"]" |> Decode.fromBytes Json.fromUtf8 is
@ -915,7 +915,7 @@ fn encode_then_decode_list_of_strings() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Encode.toBytes ["a", "b", "c"] Json.fromUtf8 |> Decode.fromBytes Json.fromUtf8 is when Encode.toBytes ["a", "b", "c"] Json.fromUtf8 |> Decode.fromBytes Json.fromUtf8 is
@ -935,7 +935,7 @@ fn encode_then_decode_list_of_lists_of_strings() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Encode.toBytes [["a", "b"], ["c", "d", "e"], ["f"]] Json.fromUtf8 |> Decode.fromBytes Json.fromUtf8 is when Encode.toBytes [["a", "b"], ["c", "d", "e"], ["f"]] Json.fromUtf8 |> Decode.fromBytes Json.fromUtf8 is
@ -957,7 +957,7 @@ fn decode_record_two_fields() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 is
@ -979,7 +979,7 @@ fn decode_record_two_fields_string_and_int() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "{\"first\":\"ab\",\"second\":10}" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "{\"first\":\"ab\",\"second\":10}" |> Decode.fromBytes Json.fromUtf8 is
@ -1001,7 +1001,7 @@ fn decode_record_two_fields_string_and_string_infer() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 is
@ -1023,7 +1023,7 @@ fn decode_record_two_fields_string_and_string_infer_local_var() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8
@ -1046,7 +1046,7 @@ fn decode_record_two_fields_string_and_string_infer_local_var_destructured() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8
@ -1067,7 +1067,7 @@ fn decode_empty_record() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "{}" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "{}" |> Decode.fromBytes Json.fromUtf8 is
@ -1090,7 +1090,7 @@ fn decode_record_of_record() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
when Str.toUtf8 "{\"outer\":{\"inner\":\"a\"},\"other\":{\"one\":\"b\",\"two\":10}}" |> Decode.fromBytes Json.fromUtf8 is when Str.toUtf8 "{\"outer\":{\"inner\":\"a\"},\"other\":{\"one\":\"b\",\"two\":10}}" |> Decode.fromBytes Json.fromUtf8 is

16
crates/reporting/tests/test_reporting.rs
View file

@ -10186,7 +10186,7 @@ All branches in an `if` must have the same type!
derive_decoding_for_function, derive_decoding_for_function,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode] provides [A] to "./platform" app "test" imports [] provides [A] to "./platform"
A a := a -> a has [Decode.Decoding] A a := a -> a has [Decode.Decoding]
"# "#
@ -10209,7 +10209,7 @@ All branches in an `if` must have the same type!
derive_decoding_for_non_decoding_opaque, derive_decoding_for_non_decoding_opaque,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode] provides [A] to "./platform" app "test" imports [] provides [A] to "./platform"
A := B has [Decode.Decoding] A := B has [Decode.Decoding]
@ -10235,7 +10235,7 @@ All branches in an `if` must have the same type!
derive_decoding_for_other_has_decoding, derive_decoding_for_other_has_decoding,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode] provides [A] to "./platform" app "test" imports [] provides [A] to "./platform"
A := B has [Decode.Decoding] A := B has [Decode.Decoding]
@ -10249,7 +10249,7 @@ All branches in an `if` must have the same type!
derive_decoding_for_recursive_deriving, derive_decoding_for_recursive_deriving,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode] provides [MyNat] to "./platform" app "test" imports [] provides [MyNat] to "./platform"
MyNat := [S MyNat, Z] has [Decode.Decoding] MyNat := [S MyNat, Z] has [Decode.Decoding]
"# "#
@ -10261,7 +10261,7 @@ All branches in an `if` must have the same type!
function_cannot_derive_encoding, function_cannot_derive_encoding,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode.{Decoder, DecoderFormatting, decoder}] provides [main] to "./platform" app "test" imports [Decode.{decoder}] provides [main] to "./platform"
main = main =
myDecoder : Decoder (a -> a) fmt | fmt has DecoderFormatting myDecoder : Decoder (a -> a) fmt | fmt has DecoderFormatting
@ -10291,7 +10291,7 @@ All branches in an `if` must have the same type!
nested_opaque_cannot_derive_encoding, nested_opaque_cannot_derive_encoding,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode.{Decoder, DecoderFormatting, decoder}] provides [main] to "./platform" app "test" imports [Decode.{decoder}] provides [main] to "./platform"
A := {} A := {}
@ -10475,7 +10475,7 @@ All branches in an `if` must have the same type!
infer_decoded_record_error_with_function_field, infer_decoded_record_error_with_function_field,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode, Json] provides [main] to "./platform" app "test" imports [Json] provides [main] to "./platform"
main = main =
decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8 decoded = Str.toUtf8 "{\"first\":\"ab\",\"second\":\"cd\"}" |> Decode.fromBytes Json.fromUtf8
@ -10505,7 +10505,7 @@ All branches in an `if` must have the same type!
record_with_optional_field_types_cannot_derive_decoding, record_with_optional_field_types_cannot_derive_decoding,
indoc!( indoc!(
r#" r#"
app "test" imports [Decode.{Decoder, DecoderFormatting, decoder}] provides [main] to "./platform" app "test" imports [Decode.{decoder}] provides [main] to "./platform"
main = main =
myDecoder : Decoder {x : Str, y ? Str} fmt | fmt has DecoderFormatting myDecoder : Decoder {x : Str, y ? Str} fmt | fmt has DecoderFormatting