language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixes merge conflict

Browse source
This commit is contained in:
Joshua Hoeflich 2021-08-08 21:38:15 -05:00
commit c00d400d85
54 changed files with 946 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/gen_llvm/src/llvm/build.rs
View file

@ -14,8 +14,8 @@ use crate::llvm::build_list::{
};
use crate::llvm::build_str::{
empty_str, str_concat, str_count_graphemes, str_ends_with, str_from_float, str_from_int,
str_from_utf8, str_from_utf8_range, str_join_with, str_number_of_bytes, str_split, str_starts_with,
str_starts_with_code_point, str_to_bytes,
str_from_utf8, str_from_utf8_range, str_join_with, str_number_of_bytes, str_split,
str_starts_with, str_starts_with_code_point, str_to_utf8,
};
use crate::llvm::compare::{generic_eq, generic_neq};
use crate::llvm::convert::{
@ -4412,8 +4412,8 @@ fn run_low_level<'a, 'ctx, 'env>(
str_starts_with(env, scope, args[0], args[1])
}
StrStartsWithCodePoint => {
// Str.startsWithCodePoint : Str, U32 -> Bool
StrStartsWithCodePt => {
// Str.startsWithCodePt : Str, U32 -> Bool
debug_assert_eq!(args.len(), 2);
str_starts_with_code_point(env, scope, args[0], args[1])
@ -4445,7 +4445,6 @@ fn run_low_level<'a, 'ctx, 'env>(
str_from_utf8(env, parent, original_wrapper)
}
StrFromUtf8Range => {
// Str.fromUtf8 : List U8 -> Result Str Utf8Problem
debug_assert_eq!(args.len(), 2);
let list_wrapper = load_symbol(scope, &args[0]).into_struct_value();
@ -4453,7 +4452,7 @@ fn run_low_level<'a, 'ctx, 'env>(
str_from_utf8_range(env, parent, list_wrapper, count_and_start)
}
StrToBytes => {
StrToUtf8 => {
// Str.fromInt : Str -> List U8
debug_assert_eq!(args.len(), 1);
@ -4461,7 +4460,7 @@ fn run_low_level<'a, 'ctx, 'env>(
// we just implement it here to subvert the type system
let string = load_symbol(scope, &args[0]);
str_to_bytes(env, string.into_struct_value())
str_to_utf8(env, string.into_struct_value())
}
StrSplit => {
// Str.split : Str, Str -> List Str