language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 23:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix Str.isEmpty

Browse source
This commit is contained in:
Richard Feldman 2020-09-12 22:05:08 -04:00
parent d1b1fd3a6a
commit d778e82d65
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/gen/src/llvm/build.rs
View file

@ -4,7 +4,7 @@ use crate::llvm::build_list::{
list_join, list_keep_if, list_len, list_map, list_prepend, list_repeat, list_reverse, list_set, list_join, list_keep_if, list_len, list_map, list_prepend, list_repeat, list_reverse, list_set,
list_single, list_walk_right, list_single, list_walk_right,
}; };
use crate::llvm::build_str::{str_concat, str_is_not_empty, str_len, CHAR_LAYOUT}; use crate::llvm::build_str::{str_concat, str_len, CHAR_LAYOUT};
use crate::llvm::compare::{build_eq, build_neq}; use crate::llvm::compare::{build_eq, build_neq};
use crate::llvm::convert::{ use crate::llvm::convert::{
basic_type_from_layout, block_of_memory, collection, get_fn_type, get_ptr_type, ptr_int, basic_type_from_layout, block_of_memory, collection, get_fn_type, get_ptr_type, ptr_int,
@ -24,8 +24,8 @@ use inkwell::passes::{PassManager, PassManagerBuilder};
use inkwell::types::{BasicTypeEnum, FunctionType, IntType, StructType}; use inkwell::types::{BasicTypeEnum, FunctionType, IntType, StructType};
use inkwell::values::BasicValueEnum::{self, *}; use inkwell::values::BasicValueEnum::{self, *};
use inkwell::values::{BasicValue, FloatValue, FunctionValue, IntValue, PointerValue, StructValue}; use inkwell::values::{BasicValue, FloatValue, FunctionValue, IntValue, PointerValue, StructValue};
use inkwell::AddressSpace;
use inkwell::OptimizationLevel; use inkwell::OptimizationLevel;
use inkwell::{AddressSpace, IntPredicate};
use roc_collections::all::{ImMap, MutSet}; use roc_collections::all::{ImMap, MutSet};
use roc_module::low_level::LowLevel; use roc_module::low_level::LowLevel;
use roc_module::symbol::{Interns, Symbol}; use roc_module::symbol::{Interns, Symbol};
@ -1564,8 +1564,13 @@ fn run_low_level<'a, 'ctx, 'env>(
let wrapper_ptr = ptr_from_symbol(scope, args[0]); let wrapper_ptr = ptr_from_symbol(scope, args[0]);
let len = str_len(env, parent, wrapper_ptr.clone()); let len = str_len(env, parent, wrapper_ptr.clone());
let is_zero = env.builder.build_int_compare(
BasicValueEnum::IntValue(str_is_not_empty(env, len)) IntPredicate::EQ,
len,
env.ptr_int().const_zero(),
"str_len_is_zero",
);
BasicValueEnum::IntValue(is_zero)
} }
ListLen => { ListLen => {
// List.len : List * -> Int // List.len : List * -> Int
@ -1707,7 +1712,6 @@ fn run_low_level<'a, 'ctx, 'env>(
} }
NumCompare => { NumCompare => {
use inkwell::FloatPredicate; use inkwell::FloatPredicate;
use inkwell::IntPredicate;
debug_assert_eq!(args.len(), 2); debug_assert_eq!(args.len(), 2);

14
compiler/gen/src/llvm/build_str.rs
View file

@ -224,15 +224,21 @@ pub fn str_len<'a, 'ctx, 'env>(
) -> IntValue<'ctx> { ) -> IntValue<'ctx> {
let builder = env.builder; let builder = env.builder;
let if_small = |final_byte| BasicValueEnum::IntValue(str_len_from_final_byte(env, final_byte)); let if_small = |final_byte| {
let len = str_len_from_final_byte(env, final_byte);
BasicValueEnum::IntValue(len)
};
let if_big = |_| { let if_big = |_| {
BasicValueEnum::IntValue(big_str_len( let len = big_str_len(
builder, builder,
builder builder
.build_load(wrapper_ptr, "big_str") .build_load(wrapper_ptr, "big_str")
.into_struct_value(), .into_struct_value(),
)) );
BasicValueEnum::IntValue(len)
}; };
if_small_str( if_small_str(
@ -438,7 +444,7 @@ fn big_str_len<'ctx>(builder: &Builder<'ctx>, wrapper_struct: StructValue<'ctx>)
.into_int_value() .into_int_value()
} }
pub fn str_is_not_empty<'ctx>(env: &Env<'_, 'ctx, '_>, len: IntValue<'ctx>) -> IntValue<'ctx> { fn str_is_not_empty<'ctx>(env: &Env<'_, 'ctx, '_>, len: IntValue<'ctx>) -> IntValue<'ctx> {
env.builder.build_int_compare( env.builder.build_int_compare(
IntPredicate::UGT, IntPredicate::UGT,
len, len,