Merge remote-tracking branch 'origin/main' into improve-platform-modules

Author: rtfeldman

crates/compiler/builtins/roc/Decode.roc

@@ -60,7 +60,7 @@ DecodeError : [TooShort]
 ## ```roc
 ## expect
 ##     input = "\"hello\", " |> Str.to_utf8
-##     actual = Decode.from_bytes_partial(input, Json.json)
+##     actual = Decode.from_bytes_partial(input, Json.utf8)
 ##     expected = Ok("hello")
 ##
 ##     actual.result == expected
@@ -133,7 +133,7 @@ decode_with = |bytes, @Decoder(decode), fmt| decode(bytes, fmt)
 ## ```roc
 ## expect
 ##     input = "\"hello\", " |> Str.to_utf8
-##     actual = Decode.from_bytes_partial(input Json.json)
+##     actual = Decode.from_bytes_partial(input Json.utf8)
 ##     expected = Ok("hello")
 ##
 ##     actual.result == expected
@@ -147,7 +147,7 @@ from_bytes_partial = |bytes, fmt| decode_with(bytes, decoder, fmt)
 ## ```roc
 ## expect
 ##     input = "\"hello\", " |> Str.to_utf8
-##     actual = Decode.from_bytes(input, Json.json)
+##     actual = Decode.from_bytes(input, Json.utf8)
 ##     expected = Ok("hello")
 ##
 ##     actual == expected

crates/compiler/builtins/roc/Encode.roc

@@ -78,7 +78,7 @@ EncoderFormatting implements
 ##     # Appends the byte 42
 ##     custom_encoder = Encode.custom(\bytes, _fmt -> List.append(bytes, 42))
 ##
-##     actual = Encode.append_with([], custom_encoder, Core.json)
+##     actual = Encode.append_with([], custom_encoder, Json.utf8)
 ##     expected = [42] # Expected result is a list with a single byte, 42
 ##
 ##     actual == expected
@@ -93,7 +93,7 @@ append_with = |lst, @Encoder(do_encoding), fmt| do_encoding(lst, fmt)
 ##
 ## ```roc
 ## expect
-##     actual = Encode.append([], { foo: 43 }, Core.json)
+##     actual = Encode.append([], { foo: 43 }, Json.utf8)
 ##     expected = Str.to_utf8("""{"foo":43}""")
 ##
 ##     actual == expected
@@ -107,7 +107,7 @@ append = |lst, val, fmt| append_with(lst, to_encoder(val), fmt)
 ## expect
 ##     foo_rec = { foo: 42 }
 ##
-##     actual = Encode.to_bytes(foo_rec, Core.json)
+##     actual = Encode.to_bytes(foo_rec, Json.utf8)
 ##     expected = Str.to_utf8("""{"foo":42}""")
 ##
 ##     actual == expected

src/base/Ident.zig

@@ -20,6 +20,8 @@ const Ident = @This();
 pub const FROM_INT_DIGITS_METHOD_NAME = "from_int_digits";
 /// Method name for parsing decimals from digit lists - used by numeric literal type checking
 pub const FROM_DEC_DIGITS_METHOD_NAME = "from_dec_digits";
+/// Method name for addition - used by + operator desugaring
+pub const PLUS_METHOD_NAME = "plus";
 
 /// The original text of the identifier.
 raw_text: []const u8,

src/build/builtin_compiler/main.zig

@@ -155,6 +155,9 @@ fn replaceStrIsEmptyWithLowLevel(env: *ModuleEnv) !std.ArrayList(CIR.Def.Idx) {
     if (env.common.findIdent("Builtin.List.is_empty")) |list_is_empty_ident| {
         try low_level_map.put(list_is_empty_ident, .list_is_empty);
     }
+    if (env.common.findIdent("Builtin.List.concat")) |list_concat_ident| {
+        try low_level_map.put(list_concat_ident, .list_concat);
+    }
     if (env.common.findIdent("list_get_unsafe")) |list_get_unsafe_ident| {
         try low_level_map.put(list_get_unsafe_ident, .list_get_unsafe);
     }

src/build/roc/Builtin.roc

@@ -7,13 +7,14 @@ Builtin := [].{
 	}
 
 	List := [ProvidedByCompiler].{
-		len : List(_elem) -> U64
-		is_empty : List(_elem) -> Bool
+		len : List(_item) -> U64
+		is_empty : List(_item) -> Bool
+		concat : List(item), List(item) -> List(item)
 
-		first : List(elem) -> Try(elem, [ListWasEmpty])
+		first : List(item) -> Try(item, [ListWasEmpty])
 		first = |list| List.get(list, 0)
 
-		get : List(elem), U64 -> Try(elem, [ListWasEmpty])
+		get : List(item), U64 -> Try(item, [ListWasEmpty])
 		get = |list, index| if index < List.len(list) {
 			Try.Ok(list_get_unsafe(list, index))
 		} else {
@@ -25,9 +26,6 @@ Builtin := [].{
 
 		keep_if : List(a), (a -> Bool) -> List(a)
 		keep_if = |_, _| []
-
-		concat : List(a), List(a) -> List(a)
-		concat = |_, _| []
 	}
 
 	Bool := [True, False].{
@@ -83,10 +81,10 @@ Builtin := [].{
 
 	Dict := [EmptyDict].{}
 
-	Set(elem) := [].{
-		is_empty : Set(elem) -> Bool
+	Set(item) := [].{
+		is_empty : Set(item) -> Bool
 
-		is_eq : Set(elem), Set(elem) -> Bool
+		is_eq : Set(item), Set(item) -> Bool
 		is_eq = |_a, _b| Bool.False
 	}
 
@@ -342,4 +340,4 @@ Builtin := [].{
 
 # Private top-level function for unsafe list access
 # This is a low-level operation that gets replaced by the compiler
-list_get_unsafe : List(elem), U64 -> elem
+list_get_unsafe : List(item), U64 -> item