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

12
compiler/gen_llvm/src/llvm/build_str.rs
View file

@ -175,7 +175,7 @@ pub fn str_starts_with<'a, 'ctx, 'env>(
)
}
/// Str.startsWithCodePoint : Str, U32 -> Bool
/// Str.startsWithCodePt : Str, U32 -> Bool
pub fn str_starts_with_code_point<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>,
scope: &Scope<'a, 'ctx>,
@ -188,7 +188,7 @@ pub fn str_starts_with_code_point<'a, 'ctx, 'env>(
call_bitcode_fn(
env,
&[str_i128.into(), prefix],
bitcode::STR_STARTS_WITH_CODE_POINT,
bitcode::STR_STARTS_WITH_CODE_PT,
)
}
@ -235,8 +235,8 @@ pub fn str_from_int<'a, 'ctx, 'env>(
call_bitcode_fn(env, &[int], bitcode::STR_FROM_INT)
}
/// Str.toBytes : Str -> List U8
pub fn str_to_bytes<'a, 'ctx, 'env>(
/// Str.toUtf8 : Str -> List U8
pub fn str_to_utf8<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>,
original_wrapper: StructValue<'ctx>,
) -> BasicValueEnum<'ctx> {
@ -244,10 +244,10 @@ pub fn str_to_bytes<'a, 'ctx, 'env>(
env.builder,
original_wrapper.into(),
env.context.i128_type().into(),
"to_bytes",
"to_utf8",
);
call_bitcode_fn_returns_list(env, &[string], bitcode::STR_TO_BYTES)
call_bitcode_fn_returns_list(env, &[string], bitcode::STR_TO_UTF8)
}
/// Str.fromUtf8 : List U8, { count : Nat, start : Nat } -> { a : Bool, b : Str, c : Nat, d : I8 }