mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add Child property of slice type

Browse Source 
also rename child field to Child for pointer and array
This commit is contained in:
Andrew Kelley 2017-09-13 14:30:57 -04:00
parent 5931a6b1a5
commit d9eabde319
6 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Findllvm.cmake
View File

@ -104,9 +104,11 @@ else()
set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
if(LLVM_LIBRARY) if(LLVM_LIBRARY AND NOT LLVM_LIBRARIES)
set(LLVM_LIBRARIES ${LLVM_LIBRARY}) set(LLVM_LIBRARIES ${LLVM_LIBRARY})
endif() endif()
link_directories("${CMAKE_PREFIX_PATH}/lib")
endif() endif()

15
src/ir.cpp
View File

@ -11432,6 +11432,17 @@ static TypeTableEntry *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstru
if (type_is_invalid(child_type)) { if (type_is_invalid(child_type)) {
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;
} else if (is_container(child_type)) { } else if (is_container(child_type)) {
if (is_slice(child_type) && buf_eql_str(field_name, "Child")) {
bool ptr_is_const = true;
bool ptr_is_volatile = false;
TypeStructField *ptr_field = &child_type->data.structure.fields[slice_ptr_index];
assert(ptr_field->type_entry->id == TypeTableEntryIdPointer);
TypeTableEntry *child_type = ptr_field->type_entry->data.pointer.child_type;
return ir_analyze_const_ptr(ira, &field_ptr_instruction->base,
create_const_type(ira->codegen, child_type),
ira->codegen->builtin_types.entry_type,
ConstPtrMutComptimeConst, ptr_is_const, ptr_is_volatile);
}
if (child_type->id == TypeTableEntryIdEnum) { if (child_type->id == TypeTableEntryIdEnum) {
ensure_complete_type(ira->codegen, child_type); ensure_complete_type(ira->codegen, child_type);
if (child_type->data.enumeration.is_invalid) if (child_type->data.enumeration.is_invalid)
@ -11522,7 +11533,7 @@ static TypeTableEntry *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstru
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;
} }
} else if (child_type->id == TypeTableEntryIdPointer) { } else if (child_type->id == TypeTableEntryIdPointer) {
if (buf_eql_str(field_name, "child")) { if (buf_eql_str(field_name, "Child")) {
bool ptr_is_const = true; bool ptr_is_const = true;
bool ptr_is_volatile = false; bool ptr_is_volatile = false;
return ir_analyze_const_ptr(ira, &field_ptr_instruction->base, return ir_analyze_const_ptr(ira, &field_ptr_instruction->base,
@ -11544,7 +11555,7 @@ static TypeTableEntry *ir_analyze_instruction_field_ptr(IrAnalyze *ira, IrInstru
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;
} }
} else if (child_type->id == TypeTableEntryIdArray) { } else if (child_type->id == TypeTableEntryIdArray) {
if (buf_eql_str(field_name, "child")) { if (buf_eql_str(field_name, "Child")) {
bool ptr_is_const = true; bool ptr_is_const = true;
bool ptr_is_volatile = false; bool ptr_is_volatile = false;
return ir_analyze_const_ptr(ira, &field_ptr_instruction->base, return ir_analyze_const_ptr(ira, &field_ptr_instruction->base,

2
std/fmt/index.zig
View File

@ -208,7 +208,7 @@ pub fn formatValue(value: var, context: var, output: fn(@typeOf(context), []cons
return output(context, @errorName(value)); return output(context, @errorName(value));
}, },
builtin.TypeId.Pointer => { builtin.TypeId.Pointer => {
if (@typeId(T.child) == builtin.TypeId.Array and T.child.child == u8) { if (@typeId(T.Child) == builtin.TypeId.Array and T.Child.Child == u8) {
return output(context, (*value)[0..]); return output(context, (*value)[0..]);
} else { } else {
@compileError("Unable to format type '" ++ @typeName(T) ++ "'"); @compileError("Unable to format type '" ++ @typeName(T) ++ "'");

2
test/cases/array.zig
View File

@ -89,7 +89,7 @@ test "array literal with specified size" {
test "array child property" { test "array child property" {
var x: [5]i32 = undefined; var x: [5]i32 = undefined;
assert(@typeOf(x).child == i32); assert(@typeOf(x).Child == i32);
} }
test "array len property" { test "array len property" {

2
test/cases/misc.zig
View File

@ -536,7 +536,7 @@ export fn writeToVRam() {
} }
test "pointer child field" { test "pointer child field" {
assert((&u32).child == u32); assert((&u32).Child == u32);
} }
const OpaqueA = @OpaqueType(); const OpaqueA = @OpaqueType();

6
test/cases/slice.zig
View File

@ -9,3 +9,9 @@ test "compile time slice of pointer to hard coded address" {
assert(@ptrToInt(y.ptr) == 0x1100); assert(@ptrToInt(y.ptr) == 0x1100);
assert(y.len == 0x400); assert(y.len == 0x400);
} }
test "slice child property" {
var array: [5]i32 = undefined;
var slice = array[0..];
assert(@typeOf(slice).Child == i32);
}