ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-23 06:05:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparison against nil for cstring

Browse Source
This commit is contained in:
gingerBill
2018-02-28 12:01:26 +00:00
parent 9da05dd4cb
commit 40542e6e26
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/strings.odin
+5
View File
@@ -1,4 +1,5 @@
import "core:mem.odin"
import "core:raw.odin"
new_string :: proc(s: string) -> string {
c := make([]byte, len(s)+1);
@@ -19,6 +20,10 @@ to_odin_string :: proc(str: cstring) -> string {
return string(str);
}
string_from_ptr :: proc(ptr: ^byte, len: int) -> string {
return transmute(string)raw.String{ptr, len};
}
contains_rune :: proc(s: string, r: rune) -> int {
for c, offset in s {
if c == r do return offset;
src/ir.cpp
+8 -2
View File
@@ -2421,7 +2421,10 @@ irValue *ir_emit_union_tag_value(irProcedure *proc, irValue *u) {
irValue *ir_emit_comp_against_nil(irProcedure *proc, TokenKind op_kind, irValue *x) {
Type *t = ir_type(x);
if (is_type_any(t)) {
if (is_type_cstring(t)) {
irValue *ptr = ir_emit_conv(proc, x, t_u8_ptr);
return ir_emit_comp(proc, op_kind, ptr, v_raw_nil);
} else if (is_type_any(t)) {
irValue *data = ir_emit_struct_ev(proc, x, 0);
irValue *ti = ir_emit_struct_ev(proc, x, 1);
if (op_kind == Token_CmpEq) {
@@ -3130,7 +3133,10 @@ irValue *ir_emit_conv(irProcedure *proc, irValue *value, Type *t) {
return ir_emit(proc, ir_instr_conv(proc, irConv_zext, b, t_llvm_bool, t));
}
if (src == t_cstring && is_type_u8_ptr(dst)) {
if (is_type_cstring(src) && is_type_u8_ptr(dst)) {
return ir_emit_bitcast(proc, value, dst);
}
if (is_type_u8_ptr(src) && is_type_cstring(dst)) {
return ir_emit_bitcast(proc, value, dst);
}